[PR #1487] dix: unexport functions from pixmap.h

PR: #1487

Author: metux

dix/main.c

@@ -91,6 +91,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"

dix/pixmap.c

@@ -31,6 +31,7 @@ from The Open Group.
 #include <X11/X.h>
 #include <X11/extensions/render.h>
 
+#include "dix/pixmap_priv.h"
 #include "mi/mi_priv.h"
 
 #include "scrnintstr.h"

dix/pixmap_priv.h

@@ -0,0 +1,25 @@
+/* SPDX-License-Identifier: MIT OR X11
+ *
+ * Copyright © 2024 Enrico Weigelt, metux IT consult <[email protected]>
+ */
+#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 */

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 "randr/randrstr_priv.h"
 #include "os/osdep.h"

hw/xfree86/dri2/dri2.c

@@ -37,6 +37,7 @@
 #include <errno.h>
 
 #include "dix/dix_priv.h"
+#include "dix/pixmap_priv.h"
 #include "os/client_priv.h"
 
 #ifdef WITH_LIBDRM

hw/xfree86/drivers/video/modesetting/drmmode_display.c

@@ -35,6 +35,7 @@
 #include <unistd.h>
 
 #include "dix/dix_priv.h"
+#include "dix/pixmap_priv.h"
 #include "os/fmt.h"
 #include "os/mathx_priv.h"
 #include "present/present_priv.h"

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 */

randr/rrcrtc.c

@@ -25,6 +25,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 "randr/randrstr_priv.h"