From d422b409262bd2c15d64920859a5d6a29a14a8b3 Mon Sep 17 00:00:00 2001 From: Olivier Fourdan Date: Tue, 12 Mar 2024 16:30:13 +0100 Subject: [PATCH] xwayland/glamor: Drop xwl_glamor_needs_buffer_flush() GLAMOR needs that, and the function returns TRUE unless GLAMOR is not used. Drop the function xwl_glamor_needs_buffer_flush() and call glamor_block_handler() when glamor is used. Signed-off-by: Olivier Fourdan Part-of: --- hw/xwayland/xwayland-glamor.c | 9 --------- hw/xwayland/xwayland-glamor.h | 1 - hw/xwayland/xwayland-screen.c | 2 +- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/hw/xwayland/xwayland-glamor.c b/hw/xwayland/xwayland-glamor.c index f8540d8ed..a946c5264 100644 --- a/hw/xwayland/xwayland-glamor.c +++ b/hw/xwayland/xwayland-glamor.c @@ -269,15 +269,6 @@ glamor_egl_fd_name_from_pixmap(ScreenPtr screen, return 0; } -Bool -xwl_glamor_needs_buffer_flush(struct xwl_screen *xwl_screen) -{ - if (!xwl_screen->glamor) - return FALSE; - - return TRUE; -} - Bool xwl_glamor_needs_n_buffering(struct xwl_screen *xwl_screen) { diff --git a/hw/xwayland/xwayland-glamor.h b/hw/xwayland/xwayland-glamor.h index 40ddb430c..6c07ea8ef 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_buffer_flush(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-screen.c b/hw/xwayland/xwayland-screen.c index a268d9378..b1fce53ae 100644 --- a/hw/xwayland/xwayland-screen.c +++ b/hw/xwayland/xwayland-screen.c @@ -416,7 +416,7 @@ xwl_screen_post_damage(struct xwl_screen *xwl_screen) return; #ifdef XWL_HAS_GLAMOR - if (xwl_glamor_needs_buffer_flush(xwl_screen)) + if (xwl_screen->glamor) glamor_block_handler(xwl_screen->screen); #endif