frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'jturney/xwin-extmod-removal-fixes'

This commit is contained in:
Keith Packard 2012-07-12 15:10:51 -07:00
parent a2d0829531 2b74949ad0
commit 746193a7f1
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
glx/glxext.c
View File

@ -339,9 +339,6 @@ GlxExtensionInit(void)
if (!__glXContextRes || !__glXDrawableRes) if (!__glXContextRes || !__glXDrawableRes)
return; return;
if (serverGeneration == 1)
GlxPushProvider(&__glXDRISWRastProvider);
if (!dixRegisterPrivateKey if (!dixRegisterPrivateKey
(&glxClientPrivateKeyRec, PRIVATE_CLIENT, sizeof(__GLXclientState))) (&glxClientPrivateKeyRec, PRIVATE_CLIENT, sizeof(__GLXclientState)))
return; return;

2
glx/glxserver.h
View File

@ -97,7 +97,7 @@ struct __GLXprovider {
const char *name; const char *name;
__GLXprovider *next; __GLXprovider *next;
}; };
__GLXprovider __glXDRISWRastProvider; extern __GLXprovider __glXDRISWRastProvider;
void GlxPushProvider(__GLXprovider * provider); void GlxPushProvider(__GLXprovider * provider);

23
hw/xwin/InitOutput.c
View File

@ -147,15 +147,30 @@ winClipboardShutdown(void)
} }
#endif #endif
void static const ExtensionModule xwinExtensions[] = {
ddxPushProviders(void) #ifdef GLXEXT
{ GlxExtensionInit, "GLX", &noGlxExtension },
#endif
};
/*
* XwinExtensionInit
* Initialises Xwin-specific extensions.
*/
static
void XwinExtensionInit(void)
{ {
int i;
#ifdef XWIN_GLX_WINDOWS #ifdef XWIN_GLX_WINDOWS
if (g_fNativeGl) { if ((g_fNativeGl) && (serverGeneration == 1)) {
/* install the native GL provider */ /* install the native GL provider */
glxWinPushNativeProvider(); glxWinPushNativeProvider();
} }
#endif #endif
for (i = 0; i < ARRAY_SIZE(xwinExtensions); i++)
LoadExtension(&xwinExtensions[i], TRUE);
} }
#if defined(DDXBEFORERESET) #if defined(DDXBEFORERESET)
@ -885,6 +900,8 @@ InitOutput(ScreenInfo * screenInfo, int argc, char *argv[])
{ {
int i; int i;
XwinExtensionInit();
/* Log the command line */ /* Log the command line */
winLogCommandLine(argc, argv); winLogCommandLine(argc, argv);