From d592dcdedd78136bbc60193473b230505f94d907 Mon Sep 17 00:00:00 2001 From: emersion Date: Thu, 1 Nov 2018 18:03:32 +0100 Subject: [PATCH] render/gles2: check for GL_OES_EGL_image_external --- include/render/gles2.h | 1 + render/gles2/renderer.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/include/render/gles2.h b/include/render/gles2.h index 063ed20a..1857383f 100644 --- a/include/render/gles2.h +++ b/include/render/gles2.h @@ -42,6 +42,7 @@ struct wlr_gles2_renderer { struct { bool read_format_bgra_ext; bool debug_khr; + bool egl_image_external_oes; } exts; struct { diff --git a/render/gles2/renderer.c b/render/gles2/renderer.c index ddcd219b..a5521909 100644 --- a/render/gles2/renderer.c +++ b/render/gles2/renderer.c @@ -135,6 +135,12 @@ static bool gles2_render_texture_with_matrix(struct wlr_renderer *wlr_renderer, case WLR_GLES2_TEXTURE_DMABUF: shader = &renderer->shaders.tex_ext; target = GL_TEXTURE_EXTERNAL_OES; + + if (!renderer->exts.egl_image_external_oes) { + wlr_log(WLR_ERROR, "Failed to render texture: " + "GL_TEXTURE_EXTERNAL_OES not supported"); + return false; + } break; } @@ -559,6 +565,9 @@ struct wlr_renderer *wlr_gles2_renderer_create(struct wlr_egl *egl) { renderer->exts.debug_khr = check_gl_ext(renderer->exts_str, "GL_KHR_debug") && glDebugMessageCallbackKHR && glDebugMessageControlKHR; + renderer->exts.egl_image_external_oes = + check_gl_ext(renderer->exts_str, "GL_OES_EGL_image_external") && + glEGLImageTargetTexture2DOES; if (renderer->exts.debug_khr) { glEnable(GL_DEBUG_OUTPUT_KHR); @@ -611,7 +620,7 @@ struct wlr_renderer *wlr_gles2_renderer_create(struct wlr_egl *egl) { renderer->shaders.tex_rgbx.tex = glGetUniformLocation(prog, "tex"); renderer->shaders.tex_rgbx.alpha = glGetUniformLocation(prog, "alpha"); - if (glEGLImageTargetTexture2DOES) { + if (renderer->exts.egl_image_external_oes) { renderer->shaders.tex_ext.program = prog = link_program(tex_vertex_src, tex_fragment_src_external); if (!renderer->shaders.tex_ext.program) {