frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xwayland/glamor: Drop the get_main_device() hook 

Call xwl_gbm_get_main_device() directly from xwl_screen_get_main_dev().

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1386>
This commit is contained in:
Olivier Fourdan 2024-03-12 11:36:41 +01:00 committed by Marge Bot
parent e8d974a8d3
commit 439c0ee5e4
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/xwayland/xwayland-dmabuf.c
View File

@ -31,6 +31,7 @@
#include <wayland-util.h> #include <wayland-util.h>
#include "xwayland-dmabuf.h" #include "xwayland-dmabuf.h"
#include "xwayland-glamor-gbm.h"
#include "xwayland-screen.h" #include "xwayland-screen.h"
#include "xwayland-types.h" #include "xwayland-types.h"
#include "xwayland-window-buffers.h" #include "xwayland-window-buffers.h"
@ -176,7 +177,7 @@ xwl_screen_get_main_dev(struct xwl_screen *xwl_screen)
* the compositor told us. * the compositor told us.
*/ */
if (xwl_screen->gbm_backend.is_available) if (xwl_screen->gbm_backend.is_available)
return xwl_screen->gbm_backend.get_main_device(xwl_screen); return xwl_gbm_get_main_device(xwl_screen);
else else
return xwl_screen->default_feedback.main_dev; return xwl_screen->default_feedback.main_dev;
} }

3
hw/xwayland/xwayland-glamor-gbm.c
View File

@ -1272,7 +1272,7 @@ error:
return FALSE; return FALSE;
} }
static drmDevice *xwl_gbm_get_main_device(struct xwl_screen *xwl_screen) drmDevice *xwl_gbm_get_main_device(struct xwl_screen *xwl_screen)
{ {
struct xwl_gbm_private *xwl_gbm = xwl_gbm_get(xwl_screen); struct xwl_gbm_private *xwl_gbm = xwl_gbm_get(xwl_screen);
@ -1301,7 +1301,6 @@ xwl_glamor_init_gbm(struct xwl_screen *xwl_screen)
dixSetPrivate(&xwl_screen->screen->devPrivates, &xwl_gbm_private_key, dixSetPrivate(&xwl_screen->screen->devPrivates, &xwl_gbm_private_key,
xwl_gbm); xwl_gbm);
xwl_screen->gbm_backend.get_main_device = xwl_gbm_get_main_device;
xwl_screen->gbm_backend.is_available = TRUE; xwl_screen->gbm_backend.is_available = TRUE;
xwl_screen->gbm_backend.backend_flags = XWL_EGL_BACKEND_NEEDS_BUFFER_FLUSH | xwl_screen->gbm_backend.backend_flags = XWL_EGL_BACKEND_NEEDS_BUFFER_FLUSH |
XWL_EGL_BACKEND_NEEDS_N_BUFFERING; XWL_EGL_BACKEND_NEEDS_N_BUFFERING;

3
hw/xwayland/xwayland-glamor-gbm.h
View File

@ -32,11 +32,14 @@
#include <sys/types.h> #include <sys/types.h>
#include <xf86drm.h>
#include "xwayland-types.h" #include "xwayland-types.h"
void xwl_glamor_init_gbm(struct xwl_screen *xwl_screen); void xwl_glamor_init_gbm(struct xwl_screen *xwl_screen);
Bool xwl_glamor_has_wl_drm(struct xwl_screen *xwl_screen); Bool xwl_glamor_has_wl_drm(struct xwl_screen *xwl_screen);
Bool xwl_glamor_gbm_init_egl(struct xwl_screen *xwl_screen); Bool xwl_glamor_gbm_init_egl(struct xwl_screen *xwl_screen);
Bool xwl_glamor_gbm_init_screen(struct xwl_screen *xwl_screen); Bool xwl_glamor_gbm_init_screen(struct xwl_screen *xwl_screen);
drmDevice *xwl_gbm_get_main_device(struct xwl_screen *xwl_screen);
#endif /* XWAYLAND_GLAMOR_GBM_H */ #endif /* XWAYLAND_GLAMOR_GBM_H */