summaryrefslogtreecommitdiff
path: root/mi
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@redhat.com>2007-10-29 18:06:41 -0400
committerKristian Høgsberg <krh@redhat.com>2007-10-29 18:14:18 -0400
commita5546a99ac4da61aee0d49c55bcb38bbce9a96aa (patch)
tree0e35feda96729d1fe6bc7736f83a3a25411bf5d7 /mi
parent8ead41388e36e21eea6fa0408c847f174911eab0 (diff)
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.
Diffstat (limited to 'mi')
-rw-r--r--mi/miinitext.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/mi/miinitext.c b/mi/miinitext.c
index 556bfc84b..b40e8bde3 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -630,16 +630,6 @@ InitExtensions(argc, argv)
if (!noXFree86DRIExtension) XFree86DRIExtensionInit();
#endif
#endif
-
-#ifdef GLXEXT
-#ifdef INXDARWINAPP
- DarwinGlxPushProvider(__DarwinglXMesaProvider);
- if (!noGlxExtension) DarwinGlxExtensionInit();
-#else
- GlxPushProvider(&__glXMesaProvider);
- if (!noGlxExtension) GlxExtensionInit();
-#endif // INXDARWINAPP
-#endif // GLXEXT
#ifdef XFIXES
/* must be before Render to layer DisplayCursor correctly */
if (!noXFixesExtension) XFixesExtensionInit();
@@ -665,6 +655,16 @@ InitExtensions(argc, argv)
#ifdef DAMAGE
if (!noDamageExtension) DamageExtensionInit();
#endif
+
+#ifdef GLXEXT
+#ifdef INXDARWINAPP
+ DarwinGlxPushProvider(__DarwinglXMesaProvider);
+ if (!noGlxExtension) DarwinGlxExtensionInit();
+#else
+ GlxPushProvider(&__glXMesaProvider);
+ if (!noGlxExtension) GlxExtensionInit();
+#endif
+#endif
}
void