From fadfc2947075c832cd1107d2c0866ad13fa756c4 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Tue, 10 Jul 2012 02:03:32 +0100
Subject: [PATCH] GLX: Remove unused noGlxVisualInit

No-one ever did anything with this variable except assign its default
value to it.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
---
 hw/kdrive/ephyr/ephyr.c     | 15 +--------------
 hw/kdrive/ephyr/ephyrinit.c |  2 --
 os/utils.c                  |  1 -
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c
index fe3dae66e..a5225dc7d 100644
--- a/hw/kdrive/ephyr/ephyr.c
+++ b/hw/kdrive/ephyr/ephyr.c
@@ -42,10 +42,6 @@
 
 extern int KdTsPhyScreen;
 
-#ifdef GLXEXT
-extern Bool noGlxVisualInit;
-#endif
-
 KdKeyboardInfo *ephyrKbd;
 KdPointerInfo *ephyrMouse;
 EphyrKeySyms ephyrKeySyms;
@@ -624,12 +620,9 @@ ephyrInitScreen(ScreenPtr pScreen)
     }
 #endif /*XV*/
 #ifdef XF86DRI
-        if (!ephyrNoDRI && !hostx_has_dri()) {
+    if (!ephyrNoDRI && !hostx_has_dri()) {
         EPHYR_LOG("host x does not support DRI. Disabling DRI forwarding\n");
         ephyrNoDRI = TRUE;
-#ifdef GLXEXT
-        noGlxVisualInit = FALSE;
-#endif
     }
     if (!ephyrNoDRI) {
         ephyrDRIExtensionInit(pScreen);
@@ -637,12 +630,6 @@ ephyrInitScreen(ScreenPtr pScreen)
     }
 #endif
 
-#ifdef GLXEXT
-    if (ephyrNoDRI) {
-        noGlxVisualInit = FALSE;
-    }
-#endif
-
     return TRUE;
 }
 
diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c
index a62b49d4b..5e2eb672f 100644
--- a/hw/kdrive/ephyr/ephyrinit.c
+++ b/hw/kdrive/ephyr/ephyrinit.c
@@ -36,7 +36,6 @@ extern Bool kdHasKbd;
 
 #ifdef GLXEXT
 extern Bool ephyrNoDRI;
-extern Bool noGlxVisualInit;
 #endif
 extern Bool ephyrNoXV;
 
@@ -233,7 +232,6 @@ ddxProcessArgument(int argc, char **argv, int i)
     }
 #ifdef GLXEXT
     else if (!strcmp(argv[i], "-nodri")) {
-        noGlxVisualInit = FALSE;
         ephyrNoDRI = TRUE;
         EPHYR_LOG("no direct rendering enabled\n");
         return 1;
diff --git a/os/utils.c b/os/utils.c
index b00d38b70..b50cbdbdf 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -138,7 +138,6 @@ Bool noDPMSExtension = FALSE;
 #endif
 #ifdef GLXEXT
 Bool noGlxExtension = FALSE;
-Bool noGlxVisualInit = FALSE;
 #endif
 #ifdef SCREENSAVER
 Bool noScreenSaverExtension = FALSE;