From cc1a22bca9401b40c9660a1bba95b1cadb00e86a Mon Sep 17 00:00:00 2001 From: Arnaud Vrac Date: Wed, 17 Jan 2018 19:36:34 +0100 Subject: [PATCH] gl-renderer: move GL_EXT_texture_rg extension check This is a GL extension and not EGL, so it should be checked after the EGL context has been created. Signed-off-by: Arnaud Vrac Reviewed-by: Derek Foreman Reviewed-by: Daniel Stone --- libweston/gl-renderer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libweston/gl-renderer.c b/libweston/gl-renderer.c index ff0a2bb9..c2767cfc 100644 --- a/libweston/gl-renderer.c +++ b/libweston/gl-renderer.c @@ -3221,9 +3221,6 @@ gl_renderer_setup_egl_extensions(struct weston_compositor *ec) gr->has_dmabuf_import_modifiers = 1; } - if (weston_check_egl_extension(extensions, "GL_EXT_texture_rg")) - gr->has_gl_texture_rg = 1; - if (weston_check_egl_extension(extensions, "EGL_KHR_fence_sync") && weston_check_egl_extension(extensions, "EGL_ANDROID_native_fence_sync")) { gr->create_sync = @@ -3691,6 +3688,9 @@ gl_renderer_setup(struct weston_compositor *ec, EGLSurface egl_surface) if (weston_check_egl_extension(extensions, "GL_EXT_unpack_subimage")) gr->has_unpack_subimage = 1; + if (weston_check_egl_extension(extensions, "GL_EXT_texture_rg")) + gr->has_gl_texture_rg = 1; + if (weston_check_egl_extension(extensions, "GL_OES_EGL_image_external")) gr->has_egl_image_external = 1;