From 3b7f313b3d74f9df876152c55d55cbb339bf2d02 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremyhu@apple.com>
Date: Tue, 24 Jul 2012 00:32:30 -0700
Subject: [PATCH] XQuartz: Fix runtime regressions introduced by extension
 loading changes

 * GLX is now loaded
 * PseudoramiX loading is back in miinitext.  It needs to be loaded
   before RandR.

Regression-from: 27a624bee66d2797eacf90317054207dcf248028
Regression-from: 5f5bbbe543f65c48ecbb5cce80116a86ca3fbe86

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
---
 hw/xquartz/quartz.c | 12 +++++++++---
 mi/miinitext.c      |  6 ++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/hw/xquartz/quartz.c b/hw/xquartz/quartz.c
index 3de223bf4..d74fc6446 100644
--- a/hw/xquartz/quartz.c
+++ b/hw/xquartz/quartz.c
@@ -144,15 +144,21 @@ QuartzSetupScreen(int index,
     return TRUE;
 }
 
-static const ExtensionModule quartzExtensions[] = {
-    { PseudoramiXExtensionInit, "PseudoramiX", &noPseudoramiXExtension, NULL },
+static ExtensionModule quartzExtensions[] = {
+    /* PseudoramiX needs to be done before RandR, so
+     * it is in miinitext.c until it can be reordered.
+     * { PseudoramiXExtensionInit, "PseudoramiX", &noPseudoramiXExtension },
+     */
+#ifdef GLXEXT
+    {GlxExtensionInit, "GLX", &noGlxExtension},
+#endif
 };
 
 /*
  * QuartzExtensionInit
  * Initialises XQuartz-specific extensions.
  */
-void QuartzExtensionInit(void)
+static void QuartzExtensionInit(void)
 {
     int i;
 
diff --git a/mi/miinitext.c b/mi/miinitext.c
index 86fc31c99..d17544097 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -254,6 +254,12 @@ static ExtensionModule staticExtensions[] = {
 #ifdef PANORAMIX
     {PanoramiXExtensionInit, PANORAMIX_PROTOCOL_NAME, &noPanoramiXExtension},
 #endif
+#ifdef INXQUARTZ
+    /* PseudoramiXExtensionInit must be done before RRExtensionInit, or
+     * XQuartz will render windows offscreen.
+     */
+    {PseudoramiXExtensionInit, "PseudoramiX", &noPseudoramiXExtension},
+#endif
 #ifdef XFIXES
     /* must be before Render to layer DisplayCursor correctly */
     {XFixesExtensionInit, "XFIXES", &noXFixesExtension},