render: move private definitions out of picturestr.h

Public module API headers don't need / shouldn't to contain anything that
isn't part of the API (non-exported functions, etc).

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1287>

Xext/panoramiX.c

@@ -52,7 +52,7 @@ Equipment Corporation.
 #include "globals.h"
 #include "servermd.h"
 #include "resource.h"
-#include "picturestr.h"
+#include "picturestr_priv.h"
 #include "xfixesint.h"
 #include "damageextint.h"
 #ifdef COMPOSITE

render/animcur.c

@@ -43,7 +43,7 @@
 #include "cursorstr.h"
 #include "dixfontstr.h"
 #include "opaque.h"
-#include "picturestr.h"
+#include "picturestr_priv.h"
 #include "inputstr.h"
 #include "xace.h"
 

render/picture.c

@@ -39,7 +39,7 @@
 #include "dixstruct.h"
 #include "gcstruct.h"
 #include "servermd.h"
-#include "picturestr.h"
+#include "picturestr_priv.h"
 #include "xace.h"
 #ifdef PANORAMIX
 #include "panoramiXsrv.h"

render/picturestr.h

@@ -56,7 +56,6 @@ typedef struct _PictFormat {
 typedef struct pixman_vector PictVector, *PictVectorPtr;
 typedef struct pixman_transform PictTransform, *PictTransformPtr;
 
-#define PICT_GRADIENT_STOPTABLE_SIZE 1024
 #define SourcePictTypeSolidFill 0
 #define SourcePictTypeLinear 1
 #define SourcePictTypeRadial 2
@@ -347,31 +346,12 @@ extern _X_EXPORT DevPrivateKeyRec PictureScreenPrivateKeyRec;
 extern _X_EXPORT DevPrivateKeyRec PictureWindowPrivateKeyRec;
 #define	PictureWindowPrivateKey (&PictureWindowPrivateKeyRec)
 
-extern RESTYPE PictureType;
-extern RESTYPE PictFormatType;
-extern RESTYPE GlyphSetType;
-
 #define GetPictureScreen(s) ((PictureScreenPtr)dixLookupPrivate(&(s)->devPrivates, PictureScreenPrivateKey))
 #define GetPictureScreenIfSet(s) (dixPrivateKeyRegistered(PictureScreenPrivateKey) ? GetPictureScreen(s) : NULL)
 #define SetPictureScreen(s,p) dixSetPrivate(&(s)->devPrivates, PictureScreenPrivateKey, p)
 #define GetPictureWindow(w) ((PicturePtr)dixLookupPrivate(&(w)->devPrivates, PictureWindowPrivateKey))
 #define SetPictureWindow(w,p) dixSetPrivate(&(w)->devPrivates, PictureWindowPrivateKey, p)
 
-#define VERIFY_PICTURE(pPicture, pid, client, mode) {\
-    int tmprc = dixLookupResourceByType((void *)&(pPicture), pid,\
-	                                PictureType, client, mode);\
-    if (tmprc != Success)\
-	return tmprc;\
-}
-
-#define VERIFY_ALPHA(pPicture, pid, client, mode) {\
-    if (pid == None) \
-	pPicture = 0; \
-    else { \
-	VERIFY_PICTURE(pPicture, pid, client, mode); \
-    } \
-} \
-
 extern _X_EXPORT PictFormatPtr
  PictureWindowFormat(WindowPtr pWindow);
 
@@ -505,13 +485,6 @@ CompositeTriFan(CARD8 op,
                 PictFormatPtr maskFormat,
                 INT16 xSrc, INT16 ySrc, int npoints, xPointFixed * points);
 
-Bool
- AnimCurInit(ScreenPtr pScreen);
-
-int
-AnimCursorCreate(CursorPtr *cursors, CARD32 *deltas, int ncursor,
-                 CursorPtr *ppCursor, ClientPtr client, XID cid);
-
 extern _X_EXPORT void
 AddTraps(PicturePtr pPicture,
          INT16 xOff, INT16 yOff, int ntraps, xTrap * traps);
@@ -542,11 +515,6 @@ CreateConicalGradientPicture(Picture pid,
                              int nStops,
                              xFixed * stops, xRenderColor * colors, int *error);
 
-#ifdef PANORAMIX
-extern void PanoramiXRenderInit(void);
-extern void PanoramiXRenderReset(void);
-#endif
-
 /*
  * matrix.c
  */

render/picturestr_priv.h

@@ -0,0 +1,46 @@
+/* SPDX-License-Identifier: MIT OR X11
+ *
+ * Copyright © 2024 Enrico Weigelt, metux IT consult <info@metux.net>
+ * Copyright © 2000 SuSE, Inc.
+ */
+#ifndef _XSERVER_PICTURESTR_PRIV_H_
+#define _XSERVER_PICTURESTR_PRIV_H_
+
+#include "picturestr.h"
+#include "scrnintstr.h"
+#include "glyphstr.h"
+#include "resource.h"
+#include "privates.h"
+
+#define PICT_GRADIENT_STOPTABLE_SIZE 1024
+
+extern RESTYPE PictureType;
+extern RESTYPE PictFormatType;
+extern RESTYPE GlyphSetType;
+
+#define VERIFY_PICTURE(pPicture, pid, client, mode) {\
+    int tmprc = dixLookupResourceByType((void *)&(pPicture), pid,\
+	                                PictureType, client, mode);\
+    if (tmprc != Success)\
+	return tmprc;\
+}
+
+#define VERIFY_ALPHA(pPicture, pid, client, mode) {\
+    if (pid == None) \
+	pPicture = 0; \
+    else { \
+	VERIFY_PICTURE(pPicture, pid, client, mode); \
+    } \
+} \
+
+Bool AnimCurInit(ScreenPtr pScreen);
+
+int AnimCursorCreate(CursorPtr *cursors, CARD32 *deltas, int ncursor,
+                     CursorPtr *ppCursor, ClientPtr client, XID cid);
+
+#ifdef PANORAMIX
+void PanoramiXRenderInit(void);
+void PanoramiXRenderReset(void);
+#endif /* PANORAMIX */
+
+#endif /* _XSERVER_PICTURESTR_PRIV_H_ */

render/render.c

@@ -41,7 +41,7 @@
 #include "servermd.h"
 #include <X11/extensions/render.h>
 #include <X11/extensions/renderproto.h>
-#include "picturestr.h"
+#include "picturestr_priv.h"
 #include "glyphstr.h"
 #include <X11/Xfuncproto.h>
 #include "cursorstr.h"

xfixes/region.c

@@ -26,7 +26,7 @@
 
 #include "xfixesint.h"
 #include "scrnintstr.h"
-#include <picturestr.h>
+#include "picturestr_priv.h"
 
 #include <regionstr.h>
 #include <gcstruct.h>