From b8ef9bfbf5ba3085f8527d85105d66f8ac0ee68f Mon Sep 17 00:00:00 2001
From: Faith Ekstrand <faith.ekstrand@collabora.com>
Date: Tue, 15 Jul 2025 18:03:49 -0400
Subject: [PATCH] x11: Move loader_x11.c/h to x11_dri3.c/h

That's more descriptive of what they actually are.

Reviewed-by: Eric Engestrom <eric@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36123>
---
 src/egl/drivers/dri2/egl_dri2.c             | 2 +-
 src/egl/drivers/dri2/platform_x11.c         | 2 +-
 src/egl/drivers/dri2/platform_x11_dri3.c    | 2 +-
 src/gallium/auxiliary/vl/vl_winsys_kopper.c | 2 +-
 src/glx/dri3_glx.c                          | 2 +-
 src/glx/glxext.c                            | 2 +-
 src/x11/meson.build                         | 2 +-
 src/x11/{loader_x11.c => x11_dri3.c}        | 4 +++-
 src/x11/{loader_x11.h => x11_dri3.h}        | 2 ++
 9 files changed, 12 insertions(+), 8 deletions(-)
 rename src/x11/{loader_x11.c => x11_dri3.c} (99%)
 rename src/x11/{loader_x11.h => x11_dri3.h} (98%)

diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index 3e9b486eecf..6d0143dd78f 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -58,7 +58,7 @@
 
 #ifdef HAVE_X11_PLATFORM
 #include "X11/Xlibint.h"
-#include "loader_x11.h"
+#include "x11_dri3.h"
 #endif
 
 #include "GL/mesa_glinterop.h"
diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c
index 05103c620a4..ff6d3b6cc98 100644
--- a/src/egl/drivers/dri2/platform_x11.c
+++ b/src/egl/drivers/dri2/platform_x11.c
@@ -51,7 +51,7 @@
 #include "util/log.h"
 #include <sys/stat.h>
 #include <sys/types.h>
-#include "loader_x11.h"
+#include "x11_dri3.h"
 #include "kopper_interface.h"
 #include "loader.h"
 #include "platform_x11.h"
diff --git a/src/egl/drivers/dri2/platform_x11_dri3.c b/src/egl/drivers/dri2/platform_x11_dri3.c
index e69244bd8a9..894ae6d6892 100644
--- a/src/egl/drivers/dri2/platform_x11_dri3.c
+++ b/src/egl/drivers/dri2/platform_x11_dri3.c
@@ -38,7 +38,7 @@
 #include "platform_x11_dri3.h"
 
 #include "loader.h"
-#include "loader_x11.h"
+#include "x11_dri3.h"
 #include "loader_dri3_helper.h"
 
 static struct dri3_egl_surface *
diff --git a/src/gallium/auxiliary/vl/vl_winsys_kopper.c b/src/gallium/auxiliary/vl/vl_winsys_kopper.c
index ca2edb28673..5feb03ef5a6 100644
--- a/src/gallium/auxiliary/vl/vl_winsys_kopper.c
+++ b/src/gallium/auxiliary/vl/vl_winsys_kopper.c
@@ -35,7 +35,7 @@
 #include <X11/Xlib-xcb.h>
 #include "gallium/drivers/zink/zink_kopper.h"
 #include <vulkan/vulkan_xcb.h>
-#include "x11/loader_x11.h"
+#include "x11/x11_dri3.h"
 #endif
 #include "zink_public.h"
 
diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c
index 8d7d545ac78..ee56a9e9fda 100644
--- a/src/glx/dri3_glx.c
+++ b/src/glx/dri3_glx.c
@@ -75,7 +75,7 @@
 #include "dri_common.h"
 #include "dri3_priv.h"
 #include "loader.h"
-#include "loader_x11.h"
+#include "x11_dri3.h"
 #include "loader_dri_helper.h"
 #include "util/u_debug.h"
 #include "dri_util.h"
diff --git a/src/glx/glxext.c b/src/glx/glxext.c
index 86b278980ce..ab0d75150d7 100644
--- a/src/glx/glxext.c
+++ b/src/glx/glxext.c
@@ -32,7 +32,7 @@
 #include "dri_common.h"
 #endif
 
-#include "loader_x11.h"
+#include "x11_dri3.h"
 #ifdef HAVE_LIBDRM
 #include "loader_dri3_helper.h"
 #endif
diff --git a/src/x11/meson.build b/src/x11/meson.build
index d2e919985d3..b63f7c59674 100644
--- a/src/x11/meson.build
+++ b/src/x11/meson.build
@@ -6,7 +6,7 @@ inc_loader_x11 = include_directories('.')
 if with_dri_platform == 'drm'
   libloader_x11 = static_library(
     'loader_x11',
-    'loader_x11.c',
+    'x11_dri3.c',
     gnu_symbol_visibility : 'hidden',
     include_directories : [inc_include, inc_src, inc_gallium],
     dependencies : [
diff --git a/src/x11/loader_x11.c b/src/x11/x11_dri3.c
similarity index 99%
rename from src/x11/loader_x11.c
rename to src/x11/x11_dri3.c
index 9477ec9a404..3587d24d6ad 100644
--- a/src/x11/loader_x11.c
+++ b/src/x11/x11_dri3.c
@@ -21,6 +21,8 @@
  * OF THIS SOFTWARE.
  */
 
+#include "x11_dri3.h"
+
 #include <stdbool.h>
 #include <stdlib.h>
 #include <fcntl.h>
@@ -29,7 +31,7 @@
 #include <xcb/dri3.h>
 #include <xcb/present.h>
 #include <xcb/xfixes.h>
-#include "loader_x11.h"
+
 /** x11_dri3_open
  *
  * Wrapper around xcb_dri3_open
diff --git a/src/x11/loader_x11.h b/src/x11/x11_dri3.h
similarity index 98%
rename from src/x11/loader_x11.h
rename to src/x11/x11_dri3.h
index c1cfa7e2ea6..b953fd2e21f 100644
--- a/src/x11/loader_x11.h
+++ b/src/x11/x11_dri3.h
@@ -26,6 +26,8 @@
 
 #include <xcb/xcb.h>
 #include <inttypes.h>
+#include <stdbool.h>
+
 int x11_dri3_open(xcb_connection_t *conn, xcb_window_t root, uint32_t provider);
 bool x11_dri3_has_multibuffer(xcb_connection_t *c);