From 44527c254916ac81e4b80f8f75ee3df83fdcb4fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Thu, 22 Feb 2024 10:52:12 +0100 Subject: [PATCH] xwayland: Refactor xwl_window_swap_pixmap out of _buffers_get_pixmap There will be another caller in a later commit. v2: * Bump xwl_window_buffer->refcnt in xwl_window_swap_pixmap, to prevent xwl_window_set_pixmap from disposing of it. v3: * Go back to bumping xwl_window_buffer->refcnt in xwl_window_buffers_get_pixmap. xwl_window_set_pixmap should no longer dispose of it now that xwl_glamor_gbm_create_pixmap_for_window is fixed, and xwl_window_swap_pixmap forgot to bump it if xwl_window_buffer_get_available returned NULL. v4: * Unlink xwl_window_buffer from xwl_window->window_buffers_available before calling xwl_window_set_pixmap in xwl_window_swap_pixmap, or that might dispose of it. v5: * xwl_window_swap_pixmap does everything xwl_window_buffer_get_available did before, except for just using the window pixmap if !xwl_glamor_needs_n_buffering. Part-of: --- hw/xwayland/xwayland-window-buffers.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/hw/xwayland/xwayland-window-buffers.c b/hw/xwayland/xwayland-window-buffers.c index 292981f29..caf020aac 100644 --- a/hw/xwayland/xwayland-window-buffers.c +++ b/hw/xwayland/xwayland-window-buffers.c @@ -331,8 +331,8 @@ xwl_window_realloc_pixmap(struct xwl_window *xwl_window) screen->DestroyPixmap(window_pixmap); } -PixmapPtr -xwl_window_buffers_get_pixmap(struct xwl_window *xwl_window) +static PixmapPtr +xwl_window_swap_pixmap(struct xwl_window *xwl_window) { struct xwl_screen *xwl_screen = xwl_window->xwl_screen; struct xwl_window_buffer *xwl_window_buffer; @@ -340,11 +340,6 @@ xwl_window_buffers_get_pixmap(struct xwl_window *xwl_window) window_pixmap = (*xwl_screen->screen->GetWindowPixmap) (xwl_window->window); -#ifdef XWL_HAS_GLAMOR - if (!xwl_glamor_needs_n_buffering(xwl_screen)) - return window_pixmap; -#endif /* XWL_HAS_GLAMOR */ - xwl_window_buffer_add_damage_region(xwl_window); xwl_window_buffer = xwl_window_buffer_get_available(xwl_window); @@ -402,3 +397,16 @@ xwl_window_buffers_get_pixmap(struct xwl_window *xwl_window) return xwl_window_buffer->pixmap; } + +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); +}