From 96668e2327a0f20c174ae2276161b18f78ff1f07 Mon Sep 17 00:00:00 2001
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
Date: Thu, 2 May 2024 17:05:38 +0200
Subject: [PATCH] (submit/miext-extinit) glx: unexport noGlxExtension field

This field isn't used by any drivers, and also better belongs into
the corresponding extension instead of OS adaption layer.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
---
 glx/vndext.c           | 2 ++
 hw/xnest/Init.c        | 4 ++++
 include/extinit.h      | 4 ----
 include/extinit_priv.h | 1 +
 os/utils.c             | 3 ---
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/glx/vndext.c b/glx/vndext.c
index 73fcac4fd..106526913 100644
--- a/glx/vndext.c
+++ b/glx/vndext.c
@@ -42,6 +42,8 @@
 
 #include "dix/dix_priv.h"
 
+Bool noGlxExtension = FALSE;
+
 ExtensionEntry *GlxExtensionEntry;
 int GlxErrorBase = 0;
 static CallbackListRec vndInitCallbackList;
diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c
index f7c37e33a..e6a91cad4 100644
--- a/hw/xnest/Init.c
+++ b/hw/xnest/Init.c
@@ -52,11 +52,15 @@ 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
diff --git a/include/extinit.h b/include/extinit.h
index 8852c4b95..ffdcced5a 100644
--- a/include/extinit.h
+++ b/include/extinit.h
@@ -56,10 +56,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #ifdef COMPOSITE
 extern _X_EXPORT Bool noCompositeExtension;
 #endif
-#ifdef GLXEXT
-extern _X_EXPORT Bool noGlxExtension;
-#endif
-
 #ifdef PANORAMIX
 extern _X_EXPORT Bool noPanoramiXExtension;
 #endif
diff --git a/include/extinit_priv.h b/include/extinit_priv.h
index b4a8fd827..e17535e33 100644
--- a/include/extinit_priv.h
+++ b/include/extinit_priv.h
@@ -12,6 +12,7 @@ extern Bool noDamageExtension;
 extern Bool noDbeExtension;
 extern Bool noDPMSExtension;
 extern Bool noGEExtension;
+extern Bool noGlxExtension;
 
 void CompositeExtensionInit(void);
 void DamageExtensionInit(void);
diff --git a/os/utils.c b/os/utils.c
index e945363dd..f0aed8c55 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -125,9 +125,6 @@ Bool noTestExtensions;
 #ifdef COMPOSITE
 Bool noCompositeExtension = FALSE;
 #endif
-#ifdef GLXEXT
-Bool noGlxExtension = FALSE;
-#endif
 #ifdef SCREENSAVER
 Bool noScreenSaverExtension = FALSE;
 #endif