diff options
| author | Tapani Pälli <tapani.palli@intel.com> | 2014-01-08 15:17:58 +0200 |
|---|---|---|
| committer | Tapani Pälli <tapani.palli@intel.com> | 2014-01-13 07:59:56 +0200 |
| commit | f8c5b8a17dae2ee0d63e5456dc76c77436ac1946 (patch) | |
| tree | 1979e9d5d2eb2b23ae9960df927fd8f7ed48384c | |
| parent | 2dc35a619c50139d07ad96fc4dfe456e5811c84e (diff) | |
egl_dri2: call dri2_add_configs_for_visuals after extensions set
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>
| -rw-r--r-- | src/egl/drivers/dri2/platform_x11.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c index d3397d49639..d878b772d82 100644 --- a/src/egl/drivers/dri2/platform_x11.c +++ b/src/egl/drivers/dri2/platform_x11.c @@ -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 */ |