diff options
Diffstat (limited to 'xorg-server')
| -rw-r--r-- | xorg-server/dix/main.c | 1 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/InitOutput.c | 19 |
2 files changed, 13 insertions, 7 deletions
diff --git a/xorg-server/dix/main.c b/xorg-server/dix/main.c index f603aeee5..eceab0c01 100644 --- a/xorg-server/dix/main.c +++ b/xorg-server/dix/main.c @@ -181,6 +181,7 @@ main(int argc, char *argv[], char *envp[]) chdir(ModuleFilename); } } + OsVendorPreInit(argc, argv); #endif InitRegions(); diff --git a/xorg-server/hw/xwin/InitOutput.c b/xorg-server/hw/xwin/InitOutput.c index 45c8ec28a..f895452be 100644 --- a/xorg-server/hw/xwin/InitOutput.c +++ b/xorg-server/hw/xwin/InitOutput.c @@ -633,11 +633,8 @@ winFixupPaths(void) } void -OsVendorInit(void) +OsVendorPreInit(int argc, char *argv[]) { - /* Re-initialize global variables on server reset */ - winInitializeGlobals(); - winFixupPaths(); #ifdef DDXOSVERRORF @@ -658,6 +655,17 @@ OsVendorInit(void) LogSetParameter(XLOG_VERBOSITY, g_iLogVerbose); LogSetParameter(XLOG_FILE_VERBOSITY, g_iLogVerbose); + /* Log the command line */ + winLogCommandLine(argc, argv); + +} + +void +OsVendorInit(void) +{ + /* Re-initialize global variables on server reset */ + winInitializeGlobals(); + /* Log the version information */ if (serverGeneration == 1) winLogVersionInfo(); @@ -922,9 +930,6 @@ InitOutput(ScreenInfo * screenInfo, int argc, char *argv[]) XwinExtensionInit(); - /* Log the command line */ - winLogCommandLine(argc, argv); - winDebug("InitOutput\n"); /* Validate command-line arguments */ |