From 54a2dfc229ed076ed733ac161ec0afbb22931448 Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <ofourdan@redhat.com>
Date: Tue, 12 Mar 2024 16:48:59 +0100
Subject: [PATCH] xwayland: Drop xwl_window_buffers_get_pixmap()

This just calls into xwl_window_swap_pixmap() so we can just use that
instead (Michel).

Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1386>
---
 hw/xwayland/xwayland-window-buffers.c | 6 ------
 hw/xwayland/xwayland-window-buffers.h | 1 -
 hw/xwayland/xwayland-window.c         | 2 +-
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/hw/xwayland/xwayland-window-buffers.c b/hw/xwayland/xwayland-window-buffers.c
index 5e9a1a99c..ced9d9567 100644
--- a/hw/xwayland/xwayland-window-buffers.c
+++ b/hw/xwayland/xwayland-window-buffers.c
@@ -396,9 +396,3 @@ xwl_window_swap_pixmap(struct xwl_window *xwl_window)
 
     return xwl_window_buffer->pixmap;
 }
-
-PixmapPtr
-xwl_window_buffers_get_pixmap(struct xwl_window *xwl_window)
-{
-    return xwl_window_swap_pixmap(xwl_window);
-}
diff --git a/hw/xwayland/xwayland-window-buffers.h b/hw/xwayland/xwayland-window-buffers.h
index ac4c9aa6e..8b463e671 100644
--- a/hw/xwayland/xwayland-window-buffers.h
+++ b/hw/xwayland/xwayland-window-buffers.h
@@ -38,6 +38,5 @@ void xwl_window_buffers_init(struct xwl_window *xwl_window);
 void xwl_window_buffers_dispose(struct xwl_window *xwl_window);
 void xwl_window_realloc_pixmap(struct xwl_window *xwl_window);
 PixmapPtr xwl_window_swap_pixmap(struct xwl_window *xwl_window);
-PixmapPtr xwl_window_buffers_get_pixmap(struct xwl_window *xwl_window);
 
 #endif /* XWAYLAND_WINDOW_BUFFERS_H */
diff --git a/hw/xwayland/xwayland-window.c b/hw/xwayland/xwayland-window.c
index 43293cadf..6774ba096 100644
--- a/hw/xwayland/xwayland-window.c
+++ b/hw/xwayland/xwayland-window.c
@@ -1349,7 +1349,7 @@ xwl_window_attach_buffer(struct xwl_window *xwl_window)
     PixmapPtr pixmap;
     int i;
 
-    pixmap = xwl_window_buffers_get_pixmap(xwl_window);
+    pixmap = xwl_window_swap_pixmap(xwl_window);
     buffer = xwl_pixmap_get_wl_buffer(pixmap);
 
     if (!buffer) {