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

xwayland/glamor: Remove the flag "is_available" 

Now that we have only one GBM backend, either it is available and
usable, or we cannot use GLAMOR.

Therefore we can drop the flag "is_available".

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 14:38:21 +01:00 committed by Marge Bot
parent 5df6a1e969
commit 5fd0c92b0e
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -172,14 +172,7 @@ wl_drm_format_for_depth(int depth)
static drmDevice * static drmDevice *
xwl_screen_get_main_dev(struct xwl_screen *xwl_screen) xwl_screen_get_main_dev(struct xwl_screen *xwl_screen)
{ {
/* return xwl_gbm_get_main_device(xwl_screen);
* If we have gbm then get our main device from it. Otherwise use what
* the compositor told us.
*/
if (xwl_screen->gbm_backend.is_available)
return xwl_gbm_get_main_device(xwl_screen);
else
return xwl_screen->default_feedback.main_dev;
} }
static Bool static Bool

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

@ -313,8 +313,7 @@ void
xwl_glamor_init_backends(struct xwl_screen *xwl_screen) xwl_glamor_init_backends(struct xwl_screen *xwl_screen)
{ {
#ifdef GLAMOR_HAS_GBM #ifdef GLAMOR_HAS_GBM
xwl_glamor_init_gbm(xwl_screen); if (!xwl_glamor_init_gbm(xwl_screen))
if (!xwl_screen->gbm_backend.is_available)
ErrorF("Xwayland glamor: GBM backend is not available\n"); ErrorF("Xwayland glamor: GBM backend is not available\n");
#endif #endif
} }
@ -323,8 +322,7 @@ static Bool
xwl_glamor_select_gbm_backend(struct xwl_screen *xwl_screen) xwl_glamor_select_gbm_backend(struct xwl_screen *xwl_screen)
{ {
#ifdef GLAMOR_HAS_GBM #ifdef GLAMOR_HAS_GBM
if (xwl_screen->gbm_backend.is_available && if (xwl_glamor_has_wl_interfaces(xwl_screen, &xwl_screen->gbm_backend)) {
xwl_glamor_has_wl_interfaces(xwl_screen, &xwl_screen->gbm_backend)) {
xwl_screen->egl_backend = &xwl_screen->gbm_backend; xwl_screen->egl_backend = &xwl_screen->gbm_backend;
LogMessageVerb(X_INFO, 3, "glamor: Using GBM backend\n"); LogMessageVerb(X_INFO, 3, "glamor: Using GBM backend\n");
return TRUE; return TRUE;