diff options
| author | Kristian Høgsberg <krh@redhat.com> | 2007-10-29 18:06:41 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <krh@redhat.com> | 2007-10-29 18:14:18 -0400 |
| commit | a5546a99ac4da61aee0d49c55bcb38bbce9a96aa (patch) | |
| tree | 0e35feda96729d1fe6bc7736f83a3a25411bf5d7 | |
| parent | 8ead41388e36e21eea6fa0408c847f174911eab0 (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.
| -rw-r--r-- | hw/xfree86/dixmods/glxmodule.c | 2 | ||||
| -rw-r--r-- | mi/miinitext.c | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/hw/xfree86/dixmods/glxmodule.c b/hw/xfree86/dixmods/glxmodule.c index 847f0d4a2..0ff867de0 100644 --- a/hw/xfree86/dixmods/glxmodule.c +++ b/hw/xfree86/dixmods/glxmodule.c @@ -45,7 +45,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. static MODULESETUPPROTO(glxSetup); -static const char *initdeps[] = { "DOUBLE-BUFFER", NULL }; +static const char *initdeps[] = { "DOUBLE-BUFFER", "COMPOSITE", NULL }; static ExtensionModule GLXExt = { 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 |