From 571cb1334274add24d77b2576001f2703b188b41 Mon Sep 17 00:00:00 2001 From: Olivier Fourdan Date: Tue, 2 Jul 2024 18:49:14 +0200 Subject: [PATCH] xwayland/window-buffers: Move buffer disposal to its own function No functional change, this is just preparation work for the next commit. v2: Reshuffle functions (Michel) Signed-off-by: Olivier Fourdan Part-of: --- hw/xwayland/xwayland-window-buffers.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/hw/xwayland/xwayland-window-buffers.c b/hw/xwayland/xwayland-window-buffers.c index 8c8475c0b..1a7e78537 100644 --- a/hw/xwayland/xwayland-window-buffers.c +++ b/hw/xwayland/xwayland-window-buffers.c @@ -102,14 +102,9 @@ xwl_window_buffer_destroy_pixmap(struct xwl_window_buffer *xwl_window_buffer) xwl_window_buffer->pixmap = NullPixmap; } -static Bool -xwl_window_buffer_maybe_dispose(struct xwl_window_buffer *xwl_window_buffer) +static void +xwl_window_buffer_dispose(struct xwl_window_buffer *xwl_window_buffer) { - assert(xwl_window_buffer->refcnt > 0); - - if (--xwl_window_buffer->refcnt) - return FALSE; - RegionDestroy(xwl_window_buffer->damage_region); if (xwl_window_buffer->pixmap) { @@ -121,6 +116,17 @@ xwl_window_buffer_maybe_dispose(struct xwl_window_buffer *xwl_window_buffer) xorg_list_del(&xwl_window_buffer->link_buffer); free(xwl_window_buffer); +} + +static Bool +xwl_window_buffer_maybe_dispose(struct xwl_window_buffer *xwl_window_buffer) +{ + assert(xwl_window_buffer->refcnt > 0); + + if (--xwl_window_buffer->refcnt) + return FALSE; + + xwl_window_buffer_dispose(xwl_window_buffer); return TRUE; }