egl_dri2: call dri2_add_configs_for_visuals after extensions set
authorTapani Pälli <tapani.palli@intel.com>
Wed, 8 Jan 2014 13:17:58 +0000 (15:17 +0200)
committerTapani Pälli <tapani.palli@intel.com>
Mon, 13 Jan 2014 05:59:56 +0000 (07:59 +0200)
dri2_add_config makes decisions based on NOK_texture_from_pixmap so
it needs to be enabled before calling dri2_add_configs_for_visuals.

Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
src/egl/drivers/dri2/platform_x11.c

index d3397d4963957340023c11a32869f52b106be1fa..d878b772d8254c99edd2d59f77e1cacbaec75875 100644 (file)
@@ -1195,11 +1195,6 @@ dri2_initialize_x11_dri2(_EGLDriver *drv, _EGLDisplay *disp)
 
    dri2_setup_swap_interval(dri2_dpy);
 
-   if (dri2_dpy->conn) {
-      if (!dri2_add_configs_for_visuals(dri2_dpy, disp))
-        goto cleanup_configs;
-   }
-
    disp->Extensions.KHR_image_pixmap = EGL_TRUE;
    disp->Extensions.NOK_swap_region = EGL_TRUE;
    disp->Extensions.NOK_texture_from_pixmap = EGL_TRUE;
@@ -1208,6 +1203,12 @@ dri2_initialize_x11_dri2(_EGLDriver *drv, _EGLDisplay *disp)
 #ifdef HAVE_WAYLAND_PLATFORM
    disp->Extensions.WL_bind_wayland_display = EGL_TRUE;
 #endif
+
+   if (dri2_dpy->conn) {
+      if (!dri2_add_configs_for_visuals(dri2_dpy, disp))
+        goto cleanup_configs;
+   }
+
    dri2_dpy->authenticate = dri2_x11_authenticate;
 
    /* we're supporting EGL 1.4 */