Change the GLX module to initialize after COMPOSITE.

This changes the module initalization order so that the GLX module initializes
after COMPOSITE.  The reason for this change is to be able to initialize a
GLX visual config for the COMPOSITE ARGB visual.
This commit is contained in:
Kristian Høgsberg 2007-10-29 18:06:41 -04:00
parent 8ead41388e
commit a5546a99ac
2 changed files with 11 additions and 11 deletions

View File

@ -45,7 +45,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
static MODULESETUPPROTO(glxSetup); static MODULESETUPPROTO(glxSetup);
static const char *initdeps[] = { "DOUBLE-BUFFER", NULL }; static const char *initdeps[] = { "DOUBLE-BUFFER", "COMPOSITE", NULL };
static ExtensionModule GLXExt = static ExtensionModule GLXExt =
{ {

View File

@ -630,16 +630,6 @@ InitExtensions(argc, argv)
if (!noXFree86DRIExtension) XFree86DRIExtensionInit(); if (!noXFree86DRIExtension) XFree86DRIExtensionInit();
#endif #endif
#endif #endif
#ifdef GLXEXT
#ifdef INXDARWINAPP
DarwinGlxPushProvider(__DarwinglXMesaProvider);
if (!noGlxExtension) DarwinGlxExtensionInit();
#else
GlxPushProvider(&__glXMesaProvider);
if (!noGlxExtension) GlxExtensionInit();
#endif // INXDARWINAPP
#endif // GLXEXT
#ifdef XFIXES #ifdef XFIXES
/* must be before Render to layer DisplayCursor correctly */ /* must be before Render to layer DisplayCursor correctly */
if (!noXFixesExtension) XFixesExtensionInit(); if (!noXFixesExtension) XFixesExtensionInit();
@ -665,6 +655,16 @@ InitExtensions(argc, argv)
#ifdef DAMAGE #ifdef DAMAGE
if (!noDamageExtension) DamageExtensionInit(); if (!noDamageExtension) DamageExtensionInit();
#endif #endif
#ifdef GLXEXT
#ifdef INXDARWINAPP
DarwinGlxPushProvider(__DarwinglXMesaProvider);
if (!noGlxExtension) DarwinGlxExtensionInit();
#else
GlxPushProvider(&__glXMesaProvider);
if (!noGlxExtension) GlxExtensionInit();
#endif
#endif
} }
void void