diff options
| author | Matt Dew <marcoz@osource.org> | 2012-10-30 22:12:56 -0600 |
|---|---|---|
| committer | Matt Dew <marcoz@osource.org> | 2012-10-30 22:12:56 -0600 |
| commit | 5a612aa44d2fda44317a242c2d8a5fb2afde76c6 (patch) | |
| tree | 582ebfeccb5ceee9da2c0eb415b5cf0b69c6bc3b /hw/xwin/InitOutput.c | |
| parent | 8f39a6b0b35764c8d5cac4c7bf66d5902c0ae9a5 (diff) | |
| parent | 0456d56092e7617131c77b50a7e7f501e6d9d275 (diff) | |
Merge branch 'server-1.13-branch' of git://people.freedesktop.org/~jturney/xserver into server-1.13-branch
Diffstat (limited to 'hw/xwin/InitOutput.c')
| -rw-r--r-- | hw/xwin/InitOutput.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c index 37cd8b357..1cf0f02eb 100644 --- a/hw/xwin/InitOutput.c +++ b/hw/xwin/InitOutput.c @@ -164,7 +164,7 @@ void XwinExtensionInit(void) int i; #ifdef XWIN_GLX_WINDOWS - if ((g_fNativeGl) && (serverGeneration == 1)) { + if (g_fNativeGl) { /* install the native GL provider */ glxWinPushNativeProvider(); } @@ -901,7 +901,8 @@ InitOutput(ScreenInfo * screenInfo, int argc, char *argv[]) { int i; - XwinExtensionInit(); + if (serverGeneration == 1) + XwinExtensionInit(); /* Log the command line */ winLogCommandLine(argc, argv); |