From 656d2efd4bdd10f672f74aeda009dc8dab2e37f2 Mon Sep 17 00:00:00 2001 From: Olivier Fourdan Date: Tue, 12 Mar 2024 16:33:06 +0100 Subject: [PATCH] xwayland/glamor: Drop xwl_glamor_needs_n_buffering() This function always return TRUE now that EGLSTream is gone, so we can remove it. Signed-off-by: Olivier Fourdan Part-of: --- hw/xwayland/xwayland-glamor.c | 6 ------ hw/xwayland/xwayland-glamor.h | 1 - hw/xwayland/xwayland-window-buffers.c | 7 ------- 3 files changed, 14 deletions(-) diff --git a/hw/xwayland/xwayland-glamor.c b/hw/xwayland/xwayland-glamor.c index a946c5264..d2b7739e1 100644 --- a/hw/xwayland/xwayland-glamor.c +++ b/hw/xwayland/xwayland-glamor.c @@ -269,12 +269,6 @@ glamor_egl_fd_name_from_pixmap(ScreenPtr screen, return 0; } -Bool -xwl_glamor_needs_n_buffering(struct xwl_screen *xwl_screen) -{ - return TRUE; -} - Bool xwl_glamor_init(struct xwl_screen *xwl_screen) { diff --git a/hw/xwayland/xwayland-glamor.h b/hw/xwayland/xwayland-glamor.h index 6c07ea8ef..297ae1786 100644 --- a/hw/xwayland/xwayland-glamor.h +++ b/hw/xwayland/xwayland-glamor.h @@ -55,7 +55,6 @@ void xwl_glamor_init_wl_registry(struct xwl_screen *xwl_screen, uint32_t id, const char *interface, uint32_t version); void xwl_glamor_egl_make_current(struct xwl_screen *xwl_screen); -Bool xwl_glamor_needs_n_buffering(struct xwl_screen *xwl_screen); Bool xwl_glamor_check_flip(WindowPtr present_window, PixmapPtr pixmap); PixmapPtr xwl_glamor_create_pixmap_for_window (struct xwl_window *xwl_window); diff --git a/hw/xwayland/xwayland-window-buffers.c b/hw/xwayland/xwayland-window-buffers.c index 47f27126d..5e9a1a99c 100644 --- a/hw/xwayland/xwayland-window-buffers.c +++ b/hw/xwayland/xwayland-window-buffers.c @@ -400,12 +400,5 @@ xwl_window_swap_pixmap(struct xwl_window *xwl_window) PixmapPtr xwl_window_buffers_get_pixmap(struct xwl_window *xwl_window) { -#ifdef XWL_HAS_GLAMOR - struct xwl_screen *xwl_screen = xwl_window->xwl_screen; - - if (!xwl_glamor_needs_n_buffering(xwl_screen)) - return xwl_screen->screen->GetWindowPixmap(xwl_window->window); -#endif /* XWL_HAS_GLAMOR */ - return xwl_window_swap_pixmap(xwl_window); }