From 6fd77acd91f342b8441b3c21abb7d85739ebf2f0 Mon Sep 17 00:00:00 2001 From: Olivier Fourdan Date: Tue, 12 Mar 2024 14:45:46 +0100 Subject: [PATCH] xwayland/glamor: Drop the post_damage() hook That was used only with the EGLStream backend, we can remove it. Signed-off-by: Olivier Fourdan Part-of: --- hw/xwayland/xwayland-glamor.c | 13 ------------- hw/xwayland/xwayland-glamor.h | 2 -- hw/xwayland/xwayland-window.c | 9 --------- 3 files changed, 24 deletions(-) diff --git a/hw/xwayland/xwayland-glamor.c b/hw/xwayland/xwayland-glamor.c index 69d0e0a4d..dca556734 100644 --- a/hw/xwayland/xwayland-glamor.c +++ b/hw/xwayland/xwayland-glamor.c @@ -126,19 +126,6 @@ xwl_glamor_has_wl_interfaces(struct xwl_screen *xwl_screen, return TRUE; } -Bool -xwl_glamor_post_damage(struct xwl_window *xwl_window, - PixmapPtr pixmap) -{ - struct xwl_screen *xwl_screen = xwl_window->xwl_screen; - RegionPtr region = xwl_window_get_damage_region(xwl_window); - - if (xwl_screen->egl_backend->post_damage) - return xwl_screen->egl_backend->post_damage(xwl_window, pixmap, region); - - return TRUE; -} - Bool xwl_glamor_allow_commits(struct xwl_window *xwl_window) { diff --git a/hw/xwayland/xwayland-glamor.h b/hw/xwayland/xwayland-glamor.h index 9f7b19c35..70d3a8416 100644 --- a/hw/xwayland/xwayland-glamor.h +++ b/hw/xwayland/xwayland-glamor.h @@ -132,8 +132,6 @@ void xwl_glamor_init_wl_registry(struct xwl_screen *xwl_screen, uint32_t version); Bool xwl_glamor_has_wl_interfaces(struct xwl_screen *xwl_screen, struct xwl_egl_backend *xwl_egl_backend); -Bool xwl_glamor_post_damage(struct xwl_window *xwl_window, - PixmapPtr pixmap); Bool xwl_glamor_allow_commits(struct xwl_window *xwl_window); void xwl_glamor_egl_make_current(struct xwl_screen *xwl_screen); Bool xwl_glamor_needs_buffer_flush(struct xwl_screen *xwl_screen); diff --git a/hw/xwayland/xwayland-window.c b/hw/xwayland/xwayland-window.c index fda98fa18..43293cadf 100644 --- a/hw/xwayland/xwayland-window.c +++ b/hw/xwayland/xwayland-window.c @@ -1357,15 +1357,6 @@ xwl_window_attach_buffer(struct xwl_window *xwl_window) return FALSE; } -#ifdef XWL_HAS_GLAMOR - if (xwl_screen->glamor) { - if (!xwl_glamor_post_damage(xwl_window, pixmap)) { - ErrorF("glamor: Failed to post damage\n"); - return FALSE; - } - } -#endif - wl_surface_attach(xwl_window->surface, buffer, 0, 0); /* Arbitrary limit to try to avoid flooding the Wayland