diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2012-07-10 02:03:21 +0100 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-07-10 00:31:02 -0700 |
| commit | 8171108602556446f12c1cfbc37c6abf3b0195eb (patch) | |
| tree | 87606fffab64d73b9fb0bbe3d0c21da21bfc0f97 /mi | |
| parent | d52ab85c7ef5058dcbd8a75eb84058908dc22906 (diff) | |
Loader: Remove extension initialisation sorting
Extensions could previously declare initialisation dependencies on other
extensions, which would then get nicely sorted by the loader. We only
had one user for this, GLX, which had one pointless (Composite) and one
possibly useful dependency (DBE). As DBE is now a built-in, it will
always be sorted by GLX, so we no longer have any users for it.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'mi')
| -rw-r--r-- | mi/miinitext.c | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/mi/miinitext.c b/mi/miinitext.c index 30c428c8a..a2bbdaafd 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -358,38 +358,37 @@ InitExtensions(int argc, char *argv[]) #else /* XFree86LOADER */ /* List of built-in (statically linked) extensions */ static ExtensionModule staticExtensions[] = { - {GEExtensionInit, "Generic Event Extension", &noGEExtension, NULL, NULL}, - {ShapeExtensionInit, "SHAPE", NULL, NULL, NULL}, + {GEExtensionInit, "Generic Event Extension", &noGEExtension, NULL}, + {ShapeExtensionInit, "SHAPE", NULL, NULL}, #ifdef MITSHM - {ShmExtensionInit, SHMNAME, &noMITShmExtension, NULL, NULL}, + {ShmExtensionInit, SHMNAME, &noMITShmExtension, NULL}, #endif - {XInputExtensionInit, "XInputExtension", NULL, NULL, NULL}, + {XInputExtensionInit, "XInputExtension", NULL, NULL}, #ifdef XTEST - {XTestExtensionInit, XTestExtensionName, &noTestExtensions, NULL, NULL}, + {XTestExtensionInit, XTestExtensionName, &noTestExtensions, NULL}, #endif - {BigReqExtensionInit, "BIG-REQUESTS", NULL, NULL, NULL}, - {SyncExtensionInit, "SYNC", NULL, NULL, NULL}, - {XkbExtensionInit, XkbName, NULL, NULL, NULL}, - {XCMiscExtensionInit, "XC-MISC", NULL, NULL, NULL}, + {BigReqExtensionInit, "BIG-REQUESTS", NULL, NULL}, + {SyncExtensionInit, "SYNC", NULL, NULL}, + {XkbExtensionInit, XkbName, NULL, NULL}, + {XCMiscExtensionInit, "XC-MISC", NULL, NULL}, #ifdef XCSECURITY - {SecurityExtensionInit, SECURITY_EXTENSION_NAME, &noSecurityExtension, NULL, - NULL}, + {SecurityExtensionInit, SECURITY_EXTENSION_NAME, &noSecurityExtension, NULL}, #endif #ifdef PANORAMIX {PanoramiXExtensionInit, PANORAMIX_PROTOCOL_NAME, &noPanoramiXExtension, - NULL, NULL}, + NULL}, #endif #ifdef XFIXES /* must be before Render to layer DisplayCursor correctly */ - {XFixesExtensionInit, "XFIXES", &noXFixesExtension, NULL, NULL}, + {XFixesExtensionInit, "XFIXES", &noXFixesExtension, NULL}, #endif #ifdef XF86BIGFONT {XFree86BigfontExtensionInit, XF86BIGFONTNAME, &noXFree86BigfontExtension, - NULL, NULL}, + NULL}, #endif - {RenderExtensionInit, "RENDER", &noRenderExtension, NULL, NULL}, + {RenderExtensionInit, "RENDER", &noRenderExtension, NULL}, #ifdef RANDR - {RRExtensionInit, "RANDR", &noRRExtension, NULL, NULL}, + {RRExtensionInit, "RANDR", &noRRExtension, NULL}, #endif #ifdef COMPOSITE {CompositeExtensionInit, "COMPOSITE", &noCompositeExtension, NULL}, @@ -442,10 +441,7 @@ InitExtensions(int argc, char *argv[]) int i; ExtensionModule *ext; - /* Make sure all static extensions have been added, then sort the - * extensions according to their init dependencies. */ AddStaticExtensions(); - LoaderSortExtensions(); for (i = 0; ExtensionModuleList[i].name != NULL; i++) { ext = &ExtensionModuleList[i]; |