xserver: Branch 'xorg-server-1.4-apple'

[Jeremy Huddleston]

 hw/xquartz/GL/indirect.c    |    5 ++++-
 hw/xquartz/X11Application.m |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 3a6898f48756fdb2898292679301ef3dc109b4f6
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Sat Oct 4 15:07:29 2008 -0700

    XQuartz: GLX - enable_stereo defaults option should work now

diff --git a/hw/xquartz/GL/indirect.c b/hw/xquartz/GL/indirect.c
index 2729ab0..609b411 100644
--- a/hw/xquartz/GL/indirect.c
+++ b/hw/xquartz/GL/indirect.c
@@ -1141,10 +1141,11 @@ static void init_screen_visuals(__GLXAquaScreen *screen) {
     free(used);
 }
 
+/* This is called by __glXInitScreens(). */
 static __GLXscreen * __glXAquaScreenProbe(ScreenPtr pScreen) {
   __GLXAquaScreen *screen;
   GLAQUA_DEBUG_MSG("glXAquaScreenProbe\n");
-  if (screen == NULL) return NULL;
+  if (pScreen == NULL) return NULL;
 
   screen = malloc(sizeof *screen);
 
@@ -1156,6 +1157,8 @@ static __GLXscreen * __glXAquaScreenProbe(ScreenPtr pScreen) {
   screen->base.pScreen       = pScreen;
 
   init_screen_visuals(screen);
+    
+  glAquaInitVisualConfigs();
 
   return &screen->base;
 }
diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index ef3f26f..fc2a535 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -673,7 +673,7 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
                           default:darwinDesiredDepth];
 	
     enable_stereo = [self prefs_get_boolean:@PREFS_ENABLE_STEREO
-                     default:false];
+                     default:enable_stereo];
 }
 
 /* This will end up at the end of the responder chain. */