From 7dcf12b847e47981a66e40e8a43a558563a65257 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Wed, 7 Aug 2013 12:11:27 -0700 Subject: [PATCH] gl-renderer: Only check for subimage when we have extension at compile time If weston is compiled against a gl2ext.h that doesn't have the subimage extension, but then run against a gles2 library that does provide it, we end up disabling the glTexImage2D falback without having the subimage code paths compiled in. --- src/gl-renderer.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gl-renderer.c b/src/gl-renderer.c index b575a6c60..54da534f2 100644 --- a/src/gl-renderer.c +++ b/src/gl-renderer.c @@ -2050,8 +2050,10 @@ gl_renderer_setup(struct weston_compositor *ec, EGLSurface egl_surface) else ec->read_format = PIXMAN_a8b8g8r8; +#ifdef GL_EXT_unpack_subimage if (strstr(extensions, "GL_EXT_unpack_subimage")) gr->has_unpack_subimage = 1; +#endif if (strstr(extensions, "GL_OES_EGL_image_external")) gr->has_egl_image_external = 1;