diff options
Diffstat (limited to 'xorg-server/hw/xfree86/dixmods/glxmodule.c')
| -rw-r--r-- | xorg-server/hw/xfree86/dixmods/glxmodule.c | 51 |
1 files changed, 25 insertions, 26 deletions
diff --git a/xorg-server/hw/xfree86/dixmods/glxmodule.c b/xorg-server/hw/xfree86/dixmods/glxmodule.c index 62a047e26..e72f3821a 100644 --- a/xorg-server/hw/xfree86/dixmods/glxmodule.c +++ b/xorg-server/hw/xfree86/dixmods/glxmodule.c @@ -47,8 +47,7 @@ static MODULESETUPPROTO(glxSetup); static const char *initdeps[] = { "DOUBLE-BUFFER", "COMPOSITE", NULL }; -static ExtensionModule GLXExt = -{ +static ExtensionModule GLXExt = { GlxExtensionInit, "GLX", &noGlxExtension, @@ -56,18 +55,17 @@ static ExtensionModule GLXExt = initdeps }; -static XF86ModuleVersionInfo VersRec = -{ - "glx", - MODULEVENDORSTRING, - MODINFOSTRING1, - MODINFOSTRING2, - XORG_VERSION_CURRENT, - 1, 0, 0, - ABI_CLASS_EXTENSION, - ABI_EXTENSION_VERSION, - MOD_CLASS_NONE, - {0,0,0,0} +static XF86ModuleVersionInfo VersRec = { + "glx", + MODULEVENDORSTRING, + MODINFOSTRING1, + MODINFOSTRING2, + XORG_VERSION_CURRENT, + 1, 0, 0, + ABI_CLASS_EXTENSION, + ABI_EXTENSION_VERSION, + MOD_CLASS_NONE, + {0, 0, 0, 0} }; _X_EXPORT XF86ModuleData glxModuleData = { &VersRec, glxSetup, NULL }; @@ -79,26 +77,27 @@ glxSetup(pointer module, pointer opts, int *errmaj, int *errmin) __GLXprovider *provider; if (setupDone) { - if (errmaj) *errmaj = LDR_ONCEONLY; - return NULL; - } + if (errmaj) + *errmaj = LDR_ONCEONLY; + return NULL; + } setupDone = TRUE; provider = LoaderSymbol("__glXDRISWRastProvider"); if (provider == NULL) - return NULL; + return NULL; GlxPushProvider(provider); - xf86Msg(xf86Info.aiglxFrom, "AIGLX %s\n", - xf86Info.aiglx ? "enabled" : "disabled"); + xf86Msg(xf86Info.aiglxFrom, "AIGLX %s\n", + xf86Info.aiglx ? "enabled" : "disabled"); if (xf86Info.aiglx) { - provider = LoaderSymbol("__glXDRIProvider"); - if (provider) - GlxPushProvider(provider); - provider = LoaderSymbol("__glXDRI2Provider"); - if (provider) - GlxPushProvider(provider); + provider = LoaderSymbol("__glXDRIProvider"); + if (provider) + GlxPushProvider(provider); + provider = LoaderSymbol("__glXDRI2Provider"); + if (provider) + GlxPushProvider(provider); } LoadExtension(&GLXExt, FALSE); |