From f1fec6f323b27a0165325d8fcf6af7ae163bde14 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed, 8 Oct 2008 18:45:04 -0700
Subject: [PATCH] XQuartz: Call setVisualConfigs in InitOutput, and only when
 GLXEXT is defined. (cherry picked from commit
 97173d4eda142c73bb975cc05225b791778f85af)

---
 hw/xquartz/darwin.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
index 184fb960f..dd37e9f24 100644
--- a/hw/xquartz/darwin.c
+++ b/hw/xquartz/darwin.c
@@ -228,8 +228,6 @@ static Bool DarwinAddScreen(int index, ScreenPtr pScreen, int argc, char **argv)
 
     miSetPixmapDepths();
 
-    setVisualConfigs();
-
     // machine independent screen init
     // setup _Screen structure in pScreen
     if (monitorResolution)
@@ -594,6 +592,10 @@ void InitOutput( ScreenInfo *pScreenInfo, int argc, char **argv )
     for (i = 0; i < NUMFORMATS; i++)
         pScreenInfo->formats[i] = formats[i];
 
+#ifdef GLXEXT
+    setVisualConfigs();    
+#endif
+
     // Discover screens and do mode specific initialization
     QuartzInitOutput(argc, argv);