frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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: 27a624bee6
Regression-from: 5f5bbbe543

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
This commit is contained in:
Jeremy Huddleston 2012-07-24 00:32:30 -07:00
parent 0d64e881a3
commit 3b7f313b3d
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/xquartz/quartz.c
View File

@ -144,15 +144,21 @@ QuartzSetupScreen(int index,
return TRUE; return TRUE;
} }
static const ExtensionModule quartzExtensions[] = { static ExtensionModule quartzExtensions[] = {
{ PseudoramiXExtensionInit, "PseudoramiX", &noPseudoramiXExtension, NULL }, /* 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 * QuartzExtensionInit
* Initialises XQuartz-specific extensions. * Initialises XQuartz-specific extensions.
*/ */
void QuartzExtensionInit(void) static void QuartzExtensionInit(void)
{ {
int i; int i;

6
mi/miinitext.c
View File

@ -254,6 +254,12 @@ static ExtensionModule staticExtensions[] = {
#ifdef PANORAMIX #ifdef PANORAMIX
{PanoramiXExtensionInit, PANORAMIX_PROTOCOL_NAME, &noPanoramiXExtension}, {PanoramiXExtensionInit, PANORAMIX_PROTOCOL_NAME, &noPanoramiXExtension},
#endif #endif
#ifdef INXQUARTZ
/* PseudoramiXExtensionInit must be done before RRExtensionInit, or
* XQuartz will render windows offscreen.
*/
{PseudoramiXExtensionInit, "PseudoramiX", &noPseudoramiXExtension},
#endif
#ifdef XFIXES #ifdef XFIXES
/* must be before Render to layer DisplayCursor correctly */ /* must be before Render to layer DisplayCursor correctly */
{XFixesExtensionInit, "XFIXES", &noXFixesExtension}, {XFixesExtensionInit, "XFIXES", &noXFixesExtension},