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

Reorder extension initialisation for non-Xorg 

Reorder static extension initialisation in miinitext for non-Xorg
servers to match Xorg's order.

Tested with Xephyr; checked that the extension list was identical before
and after.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Daniel Stone 2012-07-10 02:02:54 +01:00 committed by Keith Packard
parent 5079db78ae
commit 13552a5c47
1 changed files with 75 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
mi/miinitext.c
View File

@ -329,62 +329,79 @@ InitExtensions(int argc, char *argv[])
if (!noGEExtension)
GEExtensionInit();
#ifdef PANORAMIX
if (!noPanoramiXExtension)
PanoramiXExtensionInit();
#endif
#ifdef INXQUARTZ
if (!noPseudoramiXExtension)
PseudoramiXExtensionInit();
#endif
ShapeExtensionInit();
#ifdef MITSHM
if (!noMITShmExtension)
ShmExtensionInit();
#endif
XInputExtensionInit();
#ifdef XTEST
if (!noTestExtensions)
XTestExtensionInit();
#endif
BigReqExtensionInit();
#if defined(SCREENSAVER)
if (!noScreenSaverExtension)
ScreenSaverExtensionInit();
#endif
#ifdef XV
if (!noXvExtension) {
XvExtensionInit();
XvMCExtensionInit();
}
#endif
SyncExtensionInit();
XkbExtensionInit();
XCMiscExtensionInit();
#ifdef XRECORD
if (!noTestExtensions)
RecordExtensionInit();
#endif
#ifdef DBE
if (!noDbeExtension)
DbeExtensionInit();
#endif
#ifdef XCSECURITY
if (!noSecurityExtension)
SecurityExtensionInit();
#endif
#ifdef XSELINUX
if (!noSELinuxExtension)
SELinuxExtensionInit();
#ifdef PANORAMIX
if (!noPanoramiXExtension)
PanoramiXExtensionInit();
#endif
#if defined(DPMSExtension) && !defined(NO_HW_ONLY_EXTS)
if (!noDPMSExtension)
DPMSExtensionInit();
#ifdef INXQUARTZ
if (!noPseudoramiXExtension)
PseudoramiXExtensionInit();
#endif
#ifdef XFIXES
/* must be before Render to layer DisplayCursor correctly */
if (!noXFixesExtension)
XFixesExtensionInit();
#endif
#ifdef XF86BIGFONT
if (!noXFree86BigfontExtension)
XFree86BigfontExtensionInit();
#endif
if (!noRenderExtension)
RenderExtensionInit();
#ifdef RANDR
if (!noRRExtension)
RRExtensionInit();
#endif
#ifdef COMPOSITE
if (!noCompositeExtension)
CompositeExtensionInit();
#endif
#ifdef DAMAGE
if (!noDamageExtension)
DamageExtensionInit();
#endif
#ifdef XSELINUX
if (!noSELinuxExtension)
SELinuxExtensionInit();
#endif
#if defined(SCREENSAVER)
if (!noScreenSaverExtension)
ScreenSaverExtensionInit();
#endif
#if !defined(NO_HW_ONLY_EXTS)
#if defined(XF86VIDMODE)
if (!noXFree86VidModeExtension)
@ -394,37 +411,42 @@ InitExtensions(int argc, char *argv[])
if (!noXFree86DGAExtension)
XFree86DGAExtensionInit();
#endif
#ifdef XF86DRI
if (!noXFree86DRIExtension)
XFree86DRIExtensionInit();
#ifdef DPMSExtension
if (!noDPMSExtension)
DPMSExtensionInit();
#endif
#endif
#ifdef XFIXES
/* must be before Render to layer DisplayCursor correctly */
if (!noXFixesExtension)
XFixesExtensionInit();
#endif
if (!noRenderExtension)
RenderExtensionInit();
#ifdef RANDR
if (!noRRExtension)
RRExtensionInit();
#ifdef XV
if (!noXvExtension) {
XvExtensionInit();
XvMCExtensionInit();
}
#endif
#ifdef RES
if (!noResExtension)
ResExtensionInit();
#endif
#ifdef XRECORD
if (!noTestExtensions)
RecordExtensionInit();
#endif
#ifdef DBE
if (!noDbeExtension)
DbeExtensionInit();
#endif
#if !defined(NO_HW_ONLY_EXTS) && defined(XF86DRI)
if (!noXFree86DRIExtension)
XFree86DRIExtensionInit();
#endif
#ifdef DMXEXT
DMXExtensionInit(); /* server-specific extension, cannot be disabled */
#endif
#ifdef COMPOSITE
if (!noCompositeExtension)
CompositeExtensionInit();
#endif
#ifdef DAMAGE
if (!noDamageExtension)
DamageExtensionInit();
#endif
#ifdef GLXEXT
if (serverGeneration == 1)