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:
parent
0d64e881a3
commit
3b7f313b3d
|
@ -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;
|
||||
|
||||
|
|
|
@ -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},
|
||||
|
|
Loading…
Reference in New Issue
Block a user