XQuartz: GLX - enable_stereo defaults option should work now

(cherry picked from commit 3a6898f48756fdb2898292679301ef3dc109b4f6)

2 files changed, 6 insertions, 14 deletions

diff --git a/hw/xquartz/GL/indirect.c b/hw/xquartz/GL/indirect.c
index 3cf43bbea..eccc6d5af 100644
--- a/hw/xquartz/GL/indirect.c
+++ b/hw/xquartz/GL/indirect.c
@@ -1143,10 +1143,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);
 
@@ -1158,6 +1159,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 cb12cb918..f120af034 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -673,19 +673,8 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
     darwinDesiredDepth = [self prefs_get_integer:@PREFS_DEPTH
                           default:darwinDesiredDepth];
 	
-//    enable_stereo = [self prefs_get_boolean:@PREFS_ENABLE_STEREO
-//                     default:false];
-    
-    pbproxy_active = [self prefs_get_boolean:@PREFS_SYNC_PB
-                                     default:pbproxy_active];
-    pbproxy_pasteboard_to_clipboard = [self prefs_get_boolean:@PREFS_SYNC_PB_TO_CLIPBOARD
-                                                      default:pbproxy_pasteboard_to_clipboard];
-    pbproxy_pasteboard_to_primary = [self prefs_get_boolean:@PREFS_SYNC_PB_TO_PRIMARY
-                                                    default:pbproxy_pasteboard_to_primary];
-    pbproxy_clipboard_to_pasteboard = [self prefs_get_boolean:@PREFS_SYNC_CLIPBOARD_TO_PB
-                                                      default:pbproxy_clipboard_to_pasteboard];
-    pbproxy_primary_on_grab = [self prefs_get_boolean:@PREFS_SYNC_PRIMARY_ON_SELECT
-                                              default:pbproxy_primary_on_grab];
+    enable_stereo = [self prefs_get_boolean:@PREFS_ENABLE_STEREO
+                     default:enable_stereo];
 }
 
 /* This will end up at the end of the responder chain. */