Merge branch 'revert-1519' into 'master'

Revert !1519 ("refactor no*Extension flags")

See merge request xorg/xserver!2022

Xext/dpms.c

@@ -46,8 +46,6 @@ Equipment Corporation.
 #include "windowstr.h"
 #include "protocol-versions.h"
 
-Bool noDPMSExtension = FALSE;
-
 CARD16 DPMSPowerLevel = 0;
 Bool DPMSDisabledSwitch = FALSE;
 CARD32 DPMSStandbyTime = -1;

Xext/panoramiX.c

@@ -63,9 +63,6 @@ extern VisualPtr glxMatchVisual(ScreenPtr pScreen,
                                 VisualPtr pVisual, ScreenPtr pMatchScreen);
 #endif
 
-/* Xinerama is disabled by default unless enabled via +xinerama */
-Bool noPanoramiXExtension = TRUE;
-
 /*
  *	PanoramiX data declarations
  */

Xext/saver.c

@@ -67,8 +67,6 @@ in this Software without prior written authorization from the X Consortium.
 // see: https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1355
 #undef CreateWindow
 
-Bool noScreenSaverExtension = FALSE;
-
 static int ScreenSaverEventBase = 0;
 
 static Bool ScreenSaverHandle(ScreenPtr pScreen, int xstate, Bool force);

Xext/security.c

@@ -49,8 +49,6 @@ in this Software without prior written authorization from The Open Group.
 #include "extinit.h"
 #include "protocol-versions.h"
 
-Bool noSecurityExtension = FALSE;
-
 /* Extension stuff */
 static int SecurityErrorBase;   /* first Security error number */
 static int SecurityEventBase;   /* first Security event number */

Xext/shape.c

@@ -48,8 +48,6 @@ in this Software without prior written authorization from The Open Group.
 #include "extinit_priv.h"
 #include "protocol-versions.h"
 
-Bool noShapeExtension = FALSE;
-
 typedef RegionPtr (*CreateDftPtr) (WindowPtr    /* pWin */
     );
 

Xext/shm.c

@@ -101,8 +101,6 @@ typedef struct _ShmScrPrivateRec {
     DestroyPixmapProcPtr destroyPixmap;
 } ShmScrPrivateRec;
 
-Bool noMITShmExtension = FALSE;
-
 static PixmapPtr fbShmCreatePixmap(XSHM_CREATE_PIXMAP_ARGS);
 static int ShmDetachSegment(void *value, XID shmseg);
 static void ShmResetProc(ExtensionEntry *extEntry);

Xext/xf86bigfont.c

@@ -69,8 +69,6 @@
 
 #include "xf86bigfontsrv.h"
 
-Bool noXFree86BigfontExtension = FALSE;
-
 static void XF86BigfontResetProc(ExtensionEntry *extEntry );
 
 #ifdef MITSHM

Xext/xres.c

@@ -34,8 +34,6 @@
 #include "compint.h"
 #endif
 
-Bool noResExtension = FALSE;
-
 /** @brief Holds fragments of responses for ConstructClientIds.
  *
  *  note: there is no consideration for data alignment */

Xext/xtest.c

@@ -61,8 +61,6 @@
 #include "inpututils.h"
 #include "extinit_priv.h"
 
-Bool noTestExtensions = FALSE;
-
 /* XTest events are sent during request processing and may be interrupted by
  * a SIGIO. We need a separate event list to avoid events overwriting each
  * other's memory.

composite/compinit.c

@@ -49,8 +49,6 @@
 #include "compint.h"
 #include "compositeext.h"
 
-Bool noCompositeExtension = FALSE;
-
 DevPrivateKeyRec CompScreenPrivateKeyRec;
 DevPrivateKeyRec CompWindowPrivateKeyRec;
 DevPrivateKeyRec CompSubwindowsPrivateKeyRec;

damageext/damageext.c

@@ -54,8 +54,6 @@ static DevPrivateKeyRec DamageClientPrivateKeyRec;
 
 #define DamageClientPrivateKey (&DamageClientPrivateKeyRec)
 
-Bool noDamageExtension = FALSE;
-
 static void
 DamageNoteCritical(ClientPtr pClient)
 {

dbe/dbe.c

@@ -51,7 +51,6 @@
 #include "xace.h"
 
 /* GLOBALS */
-Bool noDbeExtension = FALSE;
 
 /* These are globals for use by DDX */
 DevPrivateKeyRec dbeScreenPrivKeyRec;

glx/vndext.c

@@ -42,8 +42,6 @@
 
 #include "dix/dix_priv.h"
 
-Bool noGlxExtension = FALSE;
-
 ExtensionEntry *GlxExtensionEntry;
 int GlxErrorBase = 0;
 static CallbackListRec vndInitCallbackList;

hw/xfree86/common/xf86Extensions.c

@@ -51,11 +51,6 @@
 #include "vidmodestr.h"
 #endif
 
-Bool noXFree86VidModeExtension = FALSE;
-Bool noXFree86DGAExtension = FALSE;
-Bool noXFree86DRIExtension = FALSE;
-Bool noDRI2Extension = FALSE;
-
 /*
  * DDX-specific extensions.
  */

hw/xnest/Args.c

@@ -17,7 +17,6 @@ is" without express or implied warranty.
 #include <X11/Xdefs.h>
 #include <X11/Xproto.h>
 
-#include "include/extinit_priv.h"
 #include "os/ddx_priv.h"
 
 #include "screenint.h"

hw/xnest/Init.c

@@ -52,15 +52,11 @@ is" without express or implied warranty.
 
 Bool xnestDoFullGeneration = TRUE;
 
-/* Xnest doesn't support GLX yet, so we don't link it, but still have
-   satisfy DIX's symbol requirements */
 #ifdef GLXEXT
 void
 GlxExtensionInit(void)
 {
 }
-
-Bool noGlxExtension = FALSE;
 #endif
 
 void

hw/xwayland/xwayland-screen.c

@@ -43,7 +43,6 @@
 #include "os/osdep.h"
 #include "os/xserver_poll.h"
 
-#include "extinit_priv.h"
 #include <micmap.h>
 #include <misyncshm.h>
 #include <os.h>

hw/xwayland/xwayland.c

@@ -54,7 +54,6 @@
 #include <os.h>
 #include <propertyst.h>
 #include <version-config.h>
-#include "extinit.h"
 
 #include "os/auth.h"
 
@@ -63,7 +62,7 @@
 
 #ifdef XF86VIDMODE
 #include <X11/extensions/xf86vmproto.h>
-Bool noXFree86VidModeExtension;
+extern _X_EXPORT Bool noXFree86VidModeExtension;
 #endif
 
 void

include/extinit.h

@@ -57,10 +57,60 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 extern _X_EXPORT Bool noCompositeExtension;
 #endif
 
+#ifdef DAMAGE
+extern _X_EXPORT Bool noDamageExtension;
+#endif
+
+#if defined(DBE)
+extern _X_EXPORT Bool noDbeExtension;
+#endif
+
+#if defined(DPMSExtension)
+extern _X_EXPORT Bool noDPMSExtension;
+#endif
+
+#ifdef GLXEXT
+extern _X_EXPORT Bool noGlxExtension;
+#endif
+
 #ifdef XINERAMA
 extern _X_EXPORT Bool noPanoramiXExtension;
 #endif /* XINERAMA */
 
+#ifdef RANDR
+extern _X_EXPORT Bool noRRExtension;
+#endif
+
+extern _X_EXPORT Bool noRenderExtension;
+
+#if defined(RES)
+extern _X_EXPORT Bool noResExtension;
+#endif
+
+#if defined(SCREENSAVER)
+extern _X_EXPORT Bool noScreenSaverExtension;
+#endif
+
+extern _X_EXPORT Bool noShapeExtension;
+
+#ifdef MITSHM
+extern _X_EXPORT Bool noMITShmExtension;
+#endif
+
+#ifdef XCSECURITY
+extern _X_EXPORT Bool noSecurityExtension;
+#endif
+
+#ifdef XF86BIGFONT
+extern _X_EXPORT Bool noXFree86BigfontExtension;
+#endif
+
+extern _X_EXPORT Bool noXFixesExtension;
+
+#if defined(XSELINUX)
+extern _X_EXPORT Bool noSELinuxExtension;
+#endif
+
 #if defined(XV)
 extern _X_EXPORT Bool noXvExtension;
 #endif

include/extinit_priv.h

@@ -8,22 +8,6 @@
 
 #include "extinit.h"
 
-extern Bool noDamageExtension;
-extern Bool noDbeExtension;
-extern Bool noDPMSExtension;
-extern Bool noGlxExtension;
-extern Bool noMITShmExtension;
-extern Bool noRenderExtension;
-extern Bool noResExtension;
-extern Bool noRRExtension;
-extern Bool noScreenSaverExtension;
-extern Bool noSecurityExtension;
-extern Bool noSELinuxExtension;
-extern Bool noShapeExtension;
-extern Bool noTestExtensions;
-extern Bool noXFixesExtension;
-extern Bool noXFree86BigfontExtension;
-
 void CompositeExtensionInit(void);
 void DamageExtensionInit(void);
 void DbeExtensionInit(void);

include/globals.h

@@ -25,6 +25,7 @@ extern _X_EXPORT int monitorResolution;
 extern _X_EXPORT int defaultColorVisualClass;
 
 extern _X_EXPORT int GrabInProgress;
+extern _X_EXPORT Bool noTestExtensions;
 extern _X_EXPORT char *SeatId;
 extern _X_EXPORT char *ConnectionInfo;
 extern _X_EXPORT sig_atomic_t inSignalContext;

os/utils.c

@@ -118,8 +118,66 @@ __stdcall unsigned long GetTickCount(void);
 #include "miinitext.h"
 #include "present.h"
 #include "dixstruct_priv.h"
+
+Bool noTestExtensions;
+
+#ifdef COMPOSITE
+Bool noCompositeExtension = FALSE;
+#endif
+
+#ifdef DAMAGE
+Bool noDamageExtension = FALSE;
+#endif
+#ifdef DBE
+Bool noDbeExtension = FALSE;
+#endif
+#ifdef DPMSExtension
 #include "dpmsproc.h"
-#include "extinit_priv.h"
+Bool noDPMSExtension = FALSE;
+#endif
+#ifdef GLXEXT
+Bool noGlxExtension = FALSE;
+#endif
+#ifdef SCREENSAVER
+Bool noScreenSaverExtension = FALSE;
+#endif
+#ifdef MITSHM
+Bool noMITShmExtension = FALSE;
+#endif
+#ifdef RANDR
+Bool noRRExtension = FALSE;
+#endif
+Bool noRenderExtension = FALSE;
+Bool noShapeExtension = FALSE;
+
+#ifdef XCSECURITY
+Bool noSecurityExtension = FALSE;
+#endif
+#ifdef RES
+Bool noResExtension = FALSE;
+#endif
+#ifdef XF86BIGFONT
+Bool noXFree86BigfontExtension = FALSE;
+#endif
+#ifdef XFreeXDGA
+Bool noXFree86DGAExtension = FALSE;
+#endif
+#ifdef XF86DRI
+Bool noXFree86DRIExtension = FALSE;
+#endif
+#ifdef XF86VIDMODE
+Bool noXFree86VidModeExtension = FALSE;
+#endif
+Bool noXFixesExtension = FALSE;
+#ifdef XINERAMA
+/* Xinerama is disabled by default unless enabled via +xinerama */
+Bool noPanoramiXExtension = TRUE;
+#endif /* XINERAMA */
+#ifdef DRI2
+Bool noDRI2Extension = FALSE;
+#endif
+
+Bool noGEExtension = FALSE;
 
 #define X_INCLUDE_NETDB_H
 #include <X11/Xos_r.h>

randr/randr.c

@@ -36,8 +36,6 @@
 #define SubPixelUnknown 0
 #endif
 
-Bool noRRExtension = FALSE;
-
 #define RR_VALIDATE
 static int RRNScreens;
 

render/render.c

@@ -57,8 +57,6 @@
 #include "panoramiXsrv.h"
 #endif /* XINERAMA */
 
-Bool noRenderExtension = FALSE;
-
 static int ProcRenderQueryVersion(ClientPtr pClient);
 static int ProcRenderQueryPictFormats(ClientPtr pClient);
 static int ProcRenderQueryPictIndexValues(ClientPtr pClient);

xfixes/xfixes.c

@@ -50,8 +50,6 @@
 #include "protocol-versions.h"
 #include "extinit_priv.h"
 
-Bool noXFixesExtension = FALSE;
-
 static unsigned char XFixesReqCode;
 int XFixesEventBase;
 int XFixesErrorBase;