From 00f810c31bb1552cf9438e9005b680ae41b6bbfd Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Wed, 31 Jul 2024 11:06:02 -0400
Subject: [PATCH] dri: break out get_pixmap_buffer
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

no functional changes

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30619>
---
 .../frontends/dri/loader_dri3_helper.c        | 78 ++++++++++---------
 .../frontends/dri/loader_dri3_helper.h        |  5 +-
 2 files changed, 47 insertions(+), 36 deletions(-)

diff --git a/src/gallium/frontends/dri/loader_dri3_helper.c b/src/gallium/frontends/dri/loader_dri3_helper.c
index c58abddaad5..cb6271c1c01 100644
--- a/src/gallium/frontends/dri/loader_dri3_helper.c
+++ b/src/gallium/frontends/dri/loader_dri3_helper.c
@@ -1847,6 +1847,47 @@ loader_dri3_create_image_from_buffers(xcb_connection_t *c,
 }
 #endif
 
+__DRIimage *
+loader_dri3_get_pixmap_buffer(xcb_connection_t *conn, xcb_drawable_t pixmap, __DRIscreen *screen,
+                              unsigned fourcc, bool multiplanes_available,
+                              int *width, int *height, void *loader_data)
+{
+   __DRIimage *image;
+#ifdef HAVE_DRI3_MODIFIERS
+   if (multiplanes_available) {
+      xcb_dri3_buffers_from_pixmap_cookie_t bps_cookie;
+      xcb_dri3_buffers_from_pixmap_reply_t *bps_reply;
+
+      bps_cookie = xcb_dri3_buffers_from_pixmap(conn, pixmap);
+      bps_reply = xcb_dri3_buffers_from_pixmap_reply(conn, bps_cookie,
+                                                     NULL);
+      if (!bps_reply)
+         return NULL;
+      image = loader_dri3_create_image_from_buffers(conn, bps_reply, fourcc,
+                                                    screen, loader_data);
+      *width = bps_reply->width;
+      *height = bps_reply->height;
+      free(bps_reply);
+   } else
+#endif
+   {
+      xcb_dri3_buffer_from_pixmap_cookie_t bp_cookie;
+      xcb_dri3_buffer_from_pixmap_reply_t *bp_reply;
+
+      bp_cookie = xcb_dri3_buffer_from_pixmap(conn, pixmap);
+      bp_reply = xcb_dri3_buffer_from_pixmap_reply(conn, bp_cookie, NULL);
+      if (!bp_reply)
+         return NULL;
+
+      image = loader_dri3_create_image(conn, bp_reply, fourcc, screen,
+                                               loader_data);
+      *width = bp_reply->width;
+      *height = bp_reply->height;
+      free(bp_reply);
+   }
+   return image;
+}
+
 /** dri3_get_pixmap_buffer
  *
  * Get the DRM object for a pixmap from the X server and
@@ -1899,41 +1940,8 @@ dri3_get_pixmap_buffer(__DRIdrawable *driDrawable, unsigned int fourcc,
                           (sync_fence = xcb_generate_id(draw->conn)),
                           false,
                           fence_fd);
-#ifdef HAVE_DRI3_MODIFIERS
-   if (draw->multiplanes_available) {
-      xcb_dri3_buffers_from_pixmap_cookie_t bps_cookie;
-      xcb_dri3_buffers_from_pixmap_reply_t *bps_reply;
-
-      bps_cookie = xcb_dri3_buffers_from_pixmap(draw->conn, pixmap);
-      bps_reply = xcb_dri3_buffers_from_pixmap_reply(draw->conn, bps_cookie,
-                                                     NULL);
-      if (!bps_reply)
-         goto no_image;
-      buffer->image =
-         loader_dri3_create_image_from_buffers(draw->conn, bps_reply, fourcc,
-                                               cur_screen,
-                                               buffer);
-      width = bps_reply->width;
-      height = bps_reply->height;
-      free(bps_reply);
-   } else
-#endif
-   {
-      xcb_dri3_buffer_from_pixmap_cookie_t bp_cookie;
-      xcb_dri3_buffer_from_pixmap_reply_t *bp_reply;
-
-      bp_cookie = xcb_dri3_buffer_from_pixmap(draw->conn, pixmap);
-      bp_reply = xcb_dri3_buffer_from_pixmap_reply(draw->conn, bp_cookie, NULL);
-      if (!bp_reply)
-         goto no_image;
-
-      buffer->image = loader_dri3_create_image(draw->conn, bp_reply, fourcc,
-                                               cur_screen,
-                                               buffer);
-      width = bp_reply->width;
-      height = bp_reply->height;
-      free(bp_reply);
-   }
+   buffer->image = loader_dri3_get_pixmap_buffer(draw->conn, pixmap, cur_screen, fourcc,
+                                                 draw->multiplanes_available, &width, &height, buffer);
 
    if (!buffer->image)
       goto no_image;
diff --git a/src/gallium/frontends/dri/loader_dri3_helper.h b/src/gallium/frontends/dri/loader_dri3_helper.h
index c66d9313edf..2d669117741 100644
--- a/src/gallium/frontends/dri/loader_dri3_helper.h
+++ b/src/gallium/frontends/dri/loader_dri3_helper.h
@@ -280,5 +280,8 @@ loader_dri3_swapbuffer_barrier(struct loader_dri3_drawable *draw);
 
 PUBLIC void
 loader_dri3_close_screen(__DRIscreen *dri_screen);
-
+__DRIimage *
+loader_dri3_get_pixmap_buffer(xcb_connection_t *conn, xcb_drawable_t pixmap, __DRIscreen *screen,
+                              unsigned fourcc, bool multiplanes_available,
+                              int *width, int *height, void *loader_data);
 #endif