Don't set the GLX_TRANSPARENT_TYPE attribute to choose an FBConfig

When Clutter tries to pick an ARGB visual it tried to set the
GLX_TRANSPARENT_TYPE attribute of the FBConfig to
GLX_TRANSPARENT_RGB. However the code to do this was broken so that it
was actually trying to set the non-existant attribute number 0x8008
instead. Mesa silently ignored this so it appeared as if it was
working but the Nvidia drivers do not like it.

It appears that the TRANSPARENT_TYPE attribute is not neccessary for
getting an ARGB visual anyway and instead it is intended to support
color-key transparency. Therefore we can just remove it and get all of
the FBConfigs. Then if we need an ARGB visual we can just walk the
list to look for one with depth == 32.

The fbconfig is now stored in a single variable instead of having a
separate variable for the rgb and rgba configs because the old code
only ever retrieved one of them anyway.

diff --git a/clutter/glx/clutter-backend-glx.c b/clutter/glx/clutter-backend-glx.c
index ce1256e..beca4df 100644 (file)
--- a/clutter/glx/clutter-backend-glx.c
+++ b/clutter/glx/clutter-backend-glx.c
@@ -354,20 +354,6 @@ clutter_backend_glx_get_features (ClutterBackend *backend)
   return flags;
 }
 
-enum
-{
-  DRAWABLE_TYPE         = 0,
-  RENDER_TYPE           = 2,
-  DOUBLE_BUFFER         = 4,
-  RED_SIZE              = 6,
-  GREEN_SIZE            = 8,
-  BLUE_SIZE             = 10,
-  ALPHA_SIZE            = 12,
-  DEPTH_SIZE            = 14,
-  STENCIL_SIZE          = 16,
-  TRANSPARENT_TYPE      = 18
-};
-
 /* It seems the GLX spec never defined an invalid GLXFBConfig that
  * we could overload as an indication of error, so we have to return
  * an explicit boolean status. */
@@ -377,10 +363,9 @@ _clutter_backend_glx_get_fbconfig (ClutterBackendGLX *backend_glx,
 {
   ClutterBackendX11 *backend_x11 = CLUTTER_BACKEND_X11 (backend_glx);
   GLXFBConfig *configs = NULL;
-  gboolean retval = FALSE;
   gboolean use_argb = clutter_x11_has_argb_visuals ();
   int n_configs, i;
-  static int attributes[] = {
+  static const int attributes[] = {
     GLX_DRAWABLE_TYPE,    GLX_WINDOW_BIT,
     GLX_RENDER_TYPE,      GLX_RGBA_BIT,
     GLX_DOUBLEBUFFER,     GL_TRUE,
@@ -390,97 +375,77 @@ _clutter_backend_glx_get_fbconfig (ClutterBackendGLX *backend_glx,
     GLX_ALPHA_SIZE,       1,
     GLX_DEPTH_SIZE,       1,
     GLX_STENCIL_SIZE,     1,
-    GLX_TRANSPARENT_TYPE, GLX_NONE,
     None
   };
 
   if (backend_x11->xdpy == None || backend_x11->xscreen == None)
     return FALSE;
 
-  if (backend_glx->found_fbconfig > 0)
-    {
-      if (use_argb && backend_glx->found_fbconfig == 2)
-        *config = backend_glx->fbconfig_rgba;
-      else
-        *config = backend_glx->fbconfig_rgb;
-
-      return TRUE;
-    }
-
-  if (use_argb)
-    {
-      attributes[ALPHA_SIZE] = 8;
-      attributes[TRANSPARENT_TYPE] = GLX_TRANSPARENT_RGB;
-    }
-
-  CLUTTER_NOTE (BACKEND,
-                "Retrieving GL fbconfig, dpy: %p, xscreen; %p (%d)",
-                backend_x11->xdpy,
-                backend_x11->xscreen,
-                backend_x11->xscreen_num);
-
-  configs = glXChooseFBConfig (backend_x11->xdpy,
-                               backend_x11->xscreen_num,
-                               attributes,
-                               &n_configs);
-  if (!configs)
-    return FALSE;
-
-  if (!use_argb)
+  /* If we don't already have a cached config then try to get one */
+  if (!backend_glx->found_fbconfig)
     {
-      *config = configs[0];
-
-      backend_glx->found_fbconfig = 1;
-      backend_glx->fbconfig_rgb = configs[0];
-
-      retval = TRUE;
-
-      goto out;
-    }
-
-  for (i = 0; i < n_configs; i++)
-    {
-      XVisualInfo *vinfo;
-
-      vinfo = glXGetVisualFromFBConfig (backend_x11->xdpy, configs[i]);
-      if (vinfo == None)
-        continue;
-
-      if (vinfo->depth == 32 &&
-          (vinfo->red_mask   == 0xff0000 &&
-           vinfo->green_mask == 0x00ff00 &&
-           vinfo->blue_mask  == 0x0000ff))
+      CLUTTER_NOTE (BACKEND,
+                    "Retrieving GL fbconfig, dpy: %p, xscreen; %p (%d)",
+                    backend_x11->xdpy,
+                    backend_x11->xscreen,
+                    backend_x11->xscreen_num);
+
+      configs = glXChooseFBConfig (backend_x11->xdpy,
+                                   backend_x11->xscreen_num,
+                                   attributes,
+                                   &n_configs);
+      if (configs)
         {
-          CLUTTER_NOTE (BACKEND, "Found GLX visual ARGB [index:%d]", i);
-
-          *config = configs[i];
+          if (use_argb)
+            {
+              for (i = 0; i < n_configs; i++)
+                {
+                  XVisualInfo *vinfo;
+
+                  vinfo = glXGetVisualFromFBConfig (backend_x11->xdpy,
+                                                    configs[i]);
+                  if (vinfo == None)
+                    continue;
+
+                  if (vinfo->depth == 32 &&
+                      (vinfo->red_mask   == 0xff0000 &&
+                       vinfo->green_mask == 0x00ff00 &&
+                       vinfo->blue_mask  == 0x0000ff))
+                    {
+                      CLUTTER_NOTE (BACKEND,
+                                    "Found GLX visual ARGB [index:%d]", i);
+
+                      backend_glx->found_fbconfig = TRUE;
+                      backend_glx->fbconfig = configs[i];
+
+                      goto out;
+                    }
+                }
 
-          backend_glx->found_fbconfig = 2;
-          backend_glx->fbconfig_rgba = configs[i];
+              /* If we make it here then we didn't find an RGBA config so
+                 we'll fall back to using an RGB config */
+              CLUTTER_NOTE (BACKEND, "ARGB visual requested, but none found");
+            }
 
-          retval = TRUE;
+          if (n_configs >= 1)
+            {
+              backend_glx->found_fbconfig = TRUE;
+              backend_glx->fbconfig = configs[0];
+            }
 
-          goto out;
+        out:
+          XFree (configs);
         }
     }
 
-  /* XXX - we might add a warning here */
-  if (use_argb && !backend_glx->found_fbconfig != 2)
+  if (backend_glx->found_fbconfig)
     {
-      CLUTTER_NOTE (BACKEND, "ARGB visual requested, but none found");
-
-      *config = configs[0];
+      *config = backend_glx->fbconfig;
 
-      backend_glx->found_fbconfig = 1;
-      backend_glx->fbconfig_rgb = configs[0];
-
-      retval = TRUE;
+      return TRUE;
     }
-
-out:
-  XFree (configs);
-
-  return retval;
+  else
+    return FALSE;
 }
 
 static XVisualInfo *

diff --git a/clutter/glx/clutter-backend-glx.h b/clutter/glx/clutter-backend-glx.h
index e7d6d98..2bd3808 100644 (file)
--- a/clutter/glx/clutter-backend-glx.h
+++ b/clutter/glx/clutter-backend-glx.h
@@ -63,9 +63,8 @@ struct _ClutterBackendGLX
   ClutterBackendX11 parent_instance;
 
   /* Single context for all wins */
-  gint                   found_fbconfig;
-  GLXFBConfig            fbconfig_rgb;
-  GLXFBConfig            fbconfig_rgba;
+  gboolean               found_fbconfig;
+  GLXFBConfig            fbconfig;
   GLXContext             gl_context;
 
   /* Vblank stuff */