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

xwayland/glamor: Drop xwl_glamor_gbm_init_wl_registry() 

And merge it back into xwl_glamor_init_wl_registry().

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:02:50 +01:00 committed by Marge Bot
parent 673ed3cd6d
commit 2ccabf5aa8
2 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1000,24 +1000,6 @@ xwl_screen_set_drm_interface(struct xwl_screen *xwl_screen,
return TRUE; return TRUE;
} }
static Bool
xwl_glamor_gbm_init_wl_registry(struct xwl_screen *xwl_screen,
struct wl_registry *wl_registry,
uint32_t id, const char *name,
uint32_t version)
{
if (strcmp(name, wl_drm_interface.name) == 0) {
xwl_screen_set_drm_interface(xwl_screen, id, version);
return TRUE;
} else if (strcmp(name, zwp_linux_dmabuf_v1_interface.name) == 0) {
xwl_screen_set_dmabuf_interface(xwl_screen, id, version);
return TRUE;
}
/* no match */
return FALSE;
}
static Bool static Bool
xwl_glamor_gbm_has_egl_extension(void) xwl_glamor_gbm_has_egl_extension(void)
{ {
@ -1323,7 +1305,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.init_wl_registry = xwl_glamor_gbm_init_wl_registry;
xwl_screen->gbm_backend.has_wl_interfaces = xwl_glamor_gbm_has_wl_interfaces; xwl_screen->gbm_backend.has_wl_interfaces = xwl_glamor_gbm_has_wl_interfaces;
xwl_screen->gbm_backend.init_egl = xwl_glamor_gbm_init_egl; xwl_screen->gbm_backend.init_egl = xwl_glamor_gbm_init_egl;
xwl_screen->gbm_backend.init_screen = xwl_glamor_gbm_init_screen; xwl_screen->gbm_backend.init_screen = xwl_glamor_gbm_init_screen;

13
hw/xwayland/xwayland-glamor.c
View File

@ -39,6 +39,7 @@
#include "glx_extinit.h" #include "glx_extinit.h"
#endif #endif
#include "drm-client-protocol.h"
#include "linux-dmabuf-unstable-v1-client-protocol.h" #include "linux-dmabuf-unstable-v1-client-protocol.h"
#include "xwayland-dmabuf.h" #include "xwayland-dmabuf.h"
@ -110,14 +111,10 @@ xwl_glamor_init_wl_registry(struct xwl_screen *xwl_screen,
uint32_t id, const char *interface, uint32_t id, const char *interface,
uint32_t version) uint32_t version)
{ {
if (xwl_screen->gbm_backend.is_available && if (strcmp(interface, wl_drm_interface.name) == 0)
xwl_screen->gbm_backend.init_wl_registry(xwl_screen, xwl_screen_set_drm_interface(xwl_screen, id, version);
registry, else if (strcmp(interface, zwp_linux_dmabuf_v1_interface.name) == 0)
id, xwl_screen_set_dmabuf_interface(xwl_screen, id, version);
interface,
version)) {
/* no-op */
}
} }
Bool Bool