From 7dd4bda0d49aedf4391dc0543e4e63f82fe8e59f Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Thu, 20 Nov 2025 12:13:36 +0100
Subject: [PATCH] dix: unexport functions from pixmap.h

Several functions from pixmap.h aren't needed by any external drivers,
so no need to keep them in public SDK. Some still need to be _X_EXPORT'ed
for internal modules (but don't belong to SDK anymore).

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 Xext/dri2/dri2.c                              |  1 +
 Xext/randr/rrcrtc.c                           |  1 +
 dix/main.c                                    |  1 +
 dix/pixmap.c                                  |  1 +
 dix/pixmap_priv.h                             | 25 +++++++++++++++++++
 hw/xfree86/common/xf86platformBus.c           |  1 +
 .../video/modesetting/drmmode_display.c       |  1 +
 include/pixmap.h                              | 13 ----------
 8 files changed, 31 insertions(+), 13 deletions(-)
 create mode 100644 dix/pixmap_priv.h

diff --git a/Xext/dri2/dri2.c b/Xext/dri2/dri2.c
index 4ecb5ac41..29be9955b 100644
--- a/Xext/dri2/dri2.c
+++ b/Xext/dri2/dri2.c
@@ -36,6 +36,7 @@
 #include <errno.h>
 
 #include "dix/dix_priv.h"
+#include "dix/pixmap_priv.h"
 #include "dix/request_priv.h"
 #include "os/client_priv.h"
 
diff --git a/Xext/randr/rrcrtc.c b/Xext/randr/rrcrtc.c
index bbe7c04e8..56270b5a7 100644
--- a/Xext/randr/rrcrtc.c
+++ b/Xext/randr/rrcrtc.c
@@ -26,6 +26,7 @@
 #include <X11/Xatom.h>
 
 #include "dix/dix_priv.h"
+#include "dix/pixmap_priv.h"
 #include "dix/request_priv.h"
 #include "dix/rpcbuf_priv.h"
 #include "os/bug_priv.h"
diff --git a/dix/main.c b/dix/main.c
index 42bb925b2..d9599713b 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -92,6 +92,7 @@ Equipment Corporation.
 #include "dix/dix_priv.h"
 #include "dix/input_priv.h"
 #include "dix/gc_priv.h"
+#include "dix/pixmap_priv.h"
 #include "dix/registry_priv.h"
 #include "dix/screensaver_priv.h"
 #include "dix/selection_priv.h"
diff --git a/dix/pixmap.c b/dix/pixmap.c
index 7fd588cb7..daf12c2eb 100644
--- a/dix/pixmap.c
+++ b/dix/pixmap.c
@@ -32,6 +32,7 @@ from The Open Group.
 #include <X11/X.h>
 #include <X11/extensions/render.h>
 
+#include "dix/pixmap_priv.h"
 #include "include/misc.h"
 #include "include/randrstr.h"
 #include "mi/mi_priv.h"
diff --git a/dix/pixmap_priv.h b/dix/pixmap_priv.h
new file mode 100644
index 000000000..d602d7128
--- /dev/null
+++ b/dix/pixmap_priv.h
@@ -0,0 +1,25 @@
+/* SPDX-License-Identifier: MIT OR X11
+ *
+ * Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
+ */
+#ifndef _XSERVER_DIX_PIXMAP_PRIV_H
+#define _XSERVER_DIX_PIXMAP_PRIV_H
+
+#include "include/pixmap.h"
+#include "include/regionstr.h"
+#include "include/screenint.h"
+
+Bool PixmapScreenInit(ScreenPtr pScreen);
+
+/* for DRI2 module */ _X_EXPORT
+PixmapPtr PixmapShareToSecondary(PixmapPtr pixmap, ScreenPtr secondary);
+
+/* for DRI2 module */ _X_EXPORT
+void PixmapUnshareSecondaryPixmap(PixmapPtr secondary_pixmap);
+
+/* for modesetting module */ _X_EXPORT
+void PixmapDirtyCopyArea(PixmapPtr dst, DrawablePtr src,
+                         int x, int y, int dst_x, int dst_y,
+                         RegionPtr dirty_region);
+
+#endif /* _XSERVER_DIX_PIXMAP_PRIV_H */
diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
index 63fdb764a..e11724928 100644
--- a/hw/xfree86/common/xf86platformBus.c
+++ b/hw/xfree86/common/xf86platformBus.c
@@ -38,6 +38,7 @@
 #include <unistd.h>
 
 #include "config/hotplug_priv.h"
+#include "dix/pixmap_priv.h"
 #include "dix/screenint_priv.h"
 #include "os/osdep.h"
 #include "Xext/randr/randrstr_priv.h"
diff --git a/hw/xfree86/drivers/video/modesetting/drmmode_display.c b/hw/xfree86/drivers/video/modesetting/drmmode_display.c
index e5f694c19..72d5a4f9a 100644
--- a/hw/xfree86/drivers/video/modesetting/drmmode_display.c
+++ b/hw/xfree86/drivers/video/modesetting/drmmode_display.c
@@ -37,6 +37,7 @@
 #include <unistd.h>
 
 #include "dix/dix_priv.h"
+#include "dix/pixmap_priv.h"
 #include "os/fmt.h"
 #include "os/mathx_priv.h"
 #include "Xext/present/present_priv.h"
diff --git a/include/pixmap.h b/include/pixmap.h
index 683376687..0f0969d3b 100644
--- a/include/pixmap.h
+++ b/include/pixmap.h
@@ -103,19 +103,11 @@ extern _X_EXPORT PixmapPtr GetScratchPixmapHeader(ScreenPtr pScreen,
 
 extern _X_EXPORT void FreeScratchPixmapHeader(PixmapPtr /*pPixmap */ );
 
-extern _X_EXPORT Bool PixmapScreenInit(ScreenPtr /*pScreen */ );
-
 extern _X_EXPORT PixmapPtr AllocatePixmap(ScreenPtr /*pScreen */ ,
                                           int /*pixDataSize */ );
 
 extern _X_EXPORT void FreePixmap(PixmapPtr /*pPixmap */ );
 
-extern _X_EXPORT PixmapPtr
-PixmapShareToSecondary(PixmapPtr pixmap, ScreenPtr secondary);
-
-extern _X_EXPORT void
-PixmapUnshareSecondaryPixmap(PixmapPtr secondary_pixmap);
-
 #define HAS_DIRTYTRACKING_ROTATION 1
 #define HAS_DIRTYTRACKING_DRAWABLE_SRC 1
 extern _X_EXPORT Bool
@@ -132,9 +124,4 @@ PixmapStopDirtyTracking(DrawablePtr src, PixmapPtr slave_dst);
 extern _X_EXPORT Bool
 PixmapSyncDirtyHelper(PixmapDirtyUpdatePtr dirty);
 
-extern _X_EXPORT void
-PixmapDirtyCopyArea(PixmapPtr dst, DrawablePtr src,
-                    int x, int y, int dst_x, int dst_y,
-                    RegionPtr dirty_region);
-
 #endif                          /* PIXMAP_H */