egl: Fix A2RGB10 platform_{device,surfaceless} PBuffer configs.

[mesa.git] / src / egl / drivers / dri2 / platform_x11.c

diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c
index 414d5f74c5db0759ca77872699714d982565d5b1..ff5dc32c03aa010e760bba8e363e9e968e9adc68 100644 (file)
--- a/src/egl/drivers/dri2/platform_x11.c
+++ b/src/egl/drivers/dri2/platform_x11.c
@@ -339,7 +339,7 @@ dri2_x11_create_surface(_EGLDriver *drv, _EGLDisplay *disp, EGLint type,
       }
    } else {
       if (type == EGL_PBUFFER_BIT) {
-         dri2_surf->depth = _eglGetConfigKey(conf, EGL_BUFFER_SIZE);
+         dri2_surf->depth = conf->BufferSize;
       }
       swrastCreateDrawable(dri2_dpy, dri2_surf);
    }
@@ -816,25 +816,28 @@ dri2_x11_add_configs_for_visuals(struct dri2_egl_display *dri2_dpy,
                if (dri2_conf->base.ConfigID == config_count + 1)
                   config_count++;
 
-            /* Allows RGB visuals to match a 32-bit RGBA EGLConfig.
+            /* Allow a 24-bit RGB visual to match a 32-bit RGBA EGLConfig.
+             * Ditto for 30-bit RGB visuals to match a 32-bit RGBA EGLConfig.
              * Otherwise it will only match a 32-bit RGBA visual.  On a
              * composited window manager on X11, this will make all of the
              * EGLConfigs with destination alpha get blended by the
              * compositor.  This is probably not what the application
              * wants... especially on drivers that only have 32-bit RGBA
              * EGLConfigs! */
-            unsigned int rgba_mask = ~(visuals[i].red_mask |
-                                       visuals[i].green_mask |
-                                       visuals[i].blue_mask);
-            rgba_shifts[3] = ffs(rgba_mask) - 1;
-            rgba_sizes[3] = util_bitcount(rgba_mask);
-            dri2_conf = dri2_add_config(disp, config, config_count + 1,
-                                        surface_type, config_attrs,
-                                        rgba_shifts, rgba_sizes);
-            if (dri2_conf)
-               if (dri2_conf->base.ConfigID == config_count + 1)
-                  config_count++;
-         }
+            if (d.data->depth == 24 || d.data->depth == 30) {
+               unsigned int rgba_mask = ~(visuals[i].red_mask |
+                                          visuals[i].green_mask |
+                                          visuals[i].blue_mask);
+               rgba_shifts[3] = ffs(rgba_mask) - 1;
+               rgba_sizes[3] = util_bitcount(rgba_mask);
+               dri2_conf = dri2_add_config(disp, config, config_count + 1,
+                                           surface_type, config_attrs,
+                                           rgba_shifts, rgba_sizes);
+               if (dri2_conf)
+                  if (dri2_conf->base.ConfigID == config_count + 1)
+                     config_count++;
+            }
+        }
       }
 
       xcb_depth_next(&d);