diff options
| author | Olivier Fourdan <ofourdan@redhat.com> | 2024-03-12 14:57:52 +0100 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2024-03-18 15:41:18 +0000 |
| commit | bceaca28d3f4d91e5ff8b298468abc48259bbe7e (patch) | |
| tree | 506dcb0bd5a0650a59690ad294f8045045de7de7 /hw/xwayland | |
| parent | 863ee2da4d846b4856577c64b800890e3f955378 (diff) | |
xwayland/glamor: Remove the backend pointers
We have only one backend now.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1386>
Diffstat (limited to 'hw/xwayland')
| -rw-r--r-- | hw/xwayland/xwayland-glamor-gbm.c | 2 | ||||
| -rw-r--r-- | hw/xwayland/xwayland-glamor.c | 8 | ||||
| -rw-r--r-- | hw/xwayland/xwayland-screen.c | 2 | ||||
| -rw-r--r-- | hw/xwayland/xwayland-screen.h | 4 |
4 files changed, 5 insertions, 11 deletions
diff --git a/hw/xwayland/xwayland-glamor-gbm.c b/hw/xwayland/xwayland-glamor-gbm.c index 92cb15c18..7cd4a6806 100644 --- a/hw/xwayland/xwayland-glamor-gbm.c +++ b/hw/xwayland/xwayland-glamor-gbm.c @@ -409,7 +409,7 @@ xwl_glamor_create_pixmap_for_window(struct xwl_window *xwl_window) WindowPtr window = xwl_window->window; unsigned border_width = 2 * window->borderWidth; - if (!xwl_screen->glamor || !xwl_screen->egl_backend) + if (!xwl_screen->glamor) return NullPixmap; return xwl_glamor_gbm_create_pixmap_internal(xwl_screen, diff --git a/hw/xwayland/xwayland-glamor.c b/hw/xwayland/xwayland-glamor.c index 23dc429c8..51a56ccbf 100644 --- a/hw/xwayland/xwayland-glamor.c +++ b/hw/xwayland/xwayland-glamor.c @@ -114,8 +114,7 @@ xwl_glamor_init_wl_registry(struct xwl_screen *xwl_screen, } static Bool -xwl_glamor_has_wl_interfaces(struct xwl_screen *xwl_screen, - struct xwl_egl_backend *xwl_egl_backend) +xwl_glamor_has_wl_interfaces(struct xwl_screen *xwl_screen) { if (!xwl_glamor_has_wl_drm(xwl_screen) && xwl_screen->dmabuf_protocol_version < 4) { @@ -273,7 +272,7 @@ glamor_egl_fd_name_from_pixmap(ScreenPtr screen, Bool xwl_glamor_needs_buffer_flush(struct xwl_screen *xwl_screen) { - if (!xwl_screen->glamor || !xwl_screen->egl_backend) + if (!xwl_screen->glamor) return FALSE; return TRUE; @@ -298,8 +297,7 @@ static Bool xwl_glamor_select_gbm_backend(struct xwl_screen *xwl_screen) { #ifdef GLAMOR_HAS_GBM - if (xwl_glamor_has_wl_interfaces(xwl_screen, &xwl_screen->gbm_backend)) { - xwl_screen->egl_backend = &xwl_screen->gbm_backend; + if (xwl_glamor_has_wl_interfaces(xwl_screen)) { LogMessageVerb(X_INFO, 3, "glamor: Using GBM backend\n"); return TRUE; } diff --git a/hw/xwayland/xwayland-screen.c b/hw/xwayland/xwayland-screen.c index e62923643..2ffc5f9a9 100644 --- a/hw/xwayland/xwayland-screen.c +++ b/hw/xwayland/xwayland-screen.c @@ -995,7 +995,7 @@ xwl_screen_init(ScreenPtr pScreen, int argc, char **argv) if (xwl_screen->glamor) { xwl_glamor_select_backend(xwl_screen); - if (xwl_screen->egl_backend == NULL || !xwl_glamor_init(xwl_screen)) { + if (!xwl_glamor_init(xwl_screen)) { ErrorF("Failed to initialize glamor, falling back to sw\n"); xwl_screen->glamor = XWL_GLAMOR_NONE; } diff --git a/hw/xwayland/xwayland-screen.h b/hw/xwayland/xwayland-screen.h index ad627585b..2f0922a21 100644 --- a/hw/xwayland/xwayland-screen.h +++ b/hw/xwayland/xwayland-screen.h @@ -127,10 +127,6 @@ struct xwl_screen { struct xwl_format *formats; void *egl_display, *egl_context; - struct xwl_egl_backend gbm_backend; - /* pointer to the current backend for creating pixmaps on wayland */ - struct xwl_egl_backend *egl_backend; - struct glamor_context *glamor_ctx; Atom allow_commits_prop; |