Skip to content

Commit 8171108

Browse files
fooishbarkeith-packard
authored andcommitted
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 <[email protected]> Reviewed-by: Peter Hutterer <[email protected]> Signed-off-by: Keith Packard <[email protected]>
1 parent d52ab85 commit 8171108

File tree

7 files changed

+16
-374
lines changed

7 files changed

+16
-374
lines changed

COPYING

+1-1
Original file line numberDiff line numberDiff line change
@@ -1788,7 +1788,7 @@ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
17881788
PERFORMANCE OF THIS SOFTWARE.
17891789

17901790

1791-
Copyright (c) 1989, 1990, 1993, 1994
1791+
Copyright (c) 1987, 1990, 1993
17921792
The Regents of the University of California. All rights reserved.
17931793

17941794
This code is derived from software contributed to Berkeley by

hw/xfree86/common/xf86Extensions.c

-4
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ static ExtensionModule extensionModules[] = {
5959
XFree86VidModeExtensionInit,
6060
XF86VIDMODENAME,
6161
&noXFree86VidModeExtension,
62-
NULL,
6362
NULL
6463
},
6564
#endif
@@ -68,7 +67,6 @@ static ExtensionModule extensionModules[] = {
6867
XFree86DGAExtensionInit,
6968
XF86DGANAME,
7069
&noXFree86DGAExtension,
71-
NULL,
7270
NULL
7371
},
7472
#endif
@@ -77,7 +75,6 @@ static ExtensionModule extensionModules[] = {
7775
XFree86DRIExtensionInit,
7876
"XFree86-DRI",
7977
&noXFree86DRIExtension,
80-
NULL,
8178
NULL
8279
},
8380
#endif
@@ -86,7 +83,6 @@ static ExtensionModule extensionModules[] = {
8683
DRI2ExtensionInit,
8784
DRI2_NAME,
8885
&noDRI2Extension,
89-
NULL,
9086
NULL
9187
}
9288
#endif

hw/xfree86/common/xf86Module.h

-1
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@ typedef struct {
175175
const char *name;
176176
Bool *disablePtr;
177177
InitExtension setupFunc;
178-
const char **initDependencies;
179178
} ExtensionModule;
180179

181180
extern _X_EXPORT ExtensionModule *ExtensionModuleList;

hw/xfree86/dixmods/glxmodule.c

-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ static ExtensionModule GLXExt = {
5050
GlxExtensionInit,
5151
"GLX",
5252
&noGlxExtension,
53-
NULL,
5453
NULL
5554
};
5655

hw/xfree86/loader/loaderProcs.h

-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ ModuleDescPtr LoadModule(const char *, const char *, const char **,
8080
ModuleDescPtr DuplicateModule(ModuleDescPtr mod, ModuleDescPtr parent);
8181
void UnloadDriver(ModuleDescPtr);
8282
void LoaderSetPath(const char *path);
83-
void LoaderSortExtensions(void);
8483

8584
void LoaderUnload(const char *, void *);
8685
unsigned long LoaderGetModuleVersion(ModuleDescPtr mod);

0 commit comments

Comments
 (0)