diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-13 10:11:58 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-13 10:11:58 +0200 |
| commit | f0a7d1d88be0c31bd471f4428c4493a93f2d9321 (patch) | |
| tree | 15b5078011dc751f9c1a1bb21e51dc2e600ee205 /xorg-server/hw/xwin | |
| parent | 165450290d6c26756ede118f52ba2164abce7c9a (diff) | |
| download | vcxsrv-f0a7d1d88be0c31bd471f4428c4493a93f2d9321.tar.gz vcxsrv-f0a7d1d88be0c31bd471f4428c4493a93f2d9321.tar.bz2 vcxsrv-f0a7d1d88be0c31bd471f4428c4493a93f2d9321.zip | |
xserver mesa git update 13 Jul 2012
Diffstat (limited to 'xorg-server/hw/xwin')
| -rw-r--r-- | xorg-server/hw/xwin/InitOutput.c | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/xorg-server/hw/xwin/InitOutput.c b/xorg-server/hw/xwin/InitOutput.c index 4d0df110f..538b2e101 100644 --- a/xorg-server/hw/xwin/InitOutput.c +++ b/xorg-server/hw/xwin/InitOutput.c @@ -147,15 +147,30 @@ winClipboardShutdown(void) } #endif -void -ddxPushProviders(void) +static const ExtensionModule xwinExtensions[] = { +#ifdef GLXEXT + { GlxExtensionInit, "GLX", &noGlxExtension }, +#endif +}; + +/* + * XwinExtensionInit + * Initialises Xwin-specific extensions. + */ +static +void XwinExtensionInit(void) { + int i; + #ifdef XWIN_GLX_WINDOWS - if (g_fNativeGl) { + if ((g_fNativeGl) && (serverGeneration == 1)) { /* install the native GL provider */ glxWinPushNativeProvider(); } #endif + + for (i = 0; i < ARRAY_SIZE(xwinExtensions); i++) + LoadExtension(&xwinExtensions[i], TRUE); } #if defined(DDXBEFORERESET) @@ -885,6 +900,8 @@ InitOutput(ScreenInfo * screenInfo, int argc, char *argv[]) { int i; + XwinExtensionInit(); + /* Log the command line */ winLogCommandLine(argc, argv); |