blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

render/gles2: check for GL_OES_EGL_image_external

This commit is contained in:
emersion 2018-11-01 18:03:32 +01:00
parent b5125ff328
commit d592dcdedd
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/render/gles2.h
View File

@ -42,6 +42,7 @@ struct wlr_gles2_renderer {
struct { struct {
bool read_format_bgra_ext; bool read_format_bgra_ext;
bool debug_khr; bool debug_khr;
bool egl_image_external_oes;
} exts; } exts;
struct { struct {

11
render/gles2/renderer.c
View File

@ -135,6 +135,12 @@ static bool gles2_render_texture_with_matrix(struct wlr_renderer *wlr_renderer,
case WLR_GLES2_TEXTURE_DMABUF: case WLR_GLES2_TEXTURE_DMABUF:
shader = &renderer->shaders.tex_ext; shader = &renderer->shaders.tex_ext;
target = GL_TEXTURE_EXTERNAL_OES; 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; break;
} }
@ -559,6 +565,9 @@ struct wlr_renderer *wlr_gles2_renderer_create(struct wlr_egl *egl) {
renderer->exts.debug_khr = renderer->exts.debug_khr =
check_gl_ext(renderer->exts_str, "GL_KHR_debug") && check_gl_ext(renderer->exts_str, "GL_KHR_debug") &&
glDebugMessageCallbackKHR && glDebugMessageControlKHR; 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) { if (renderer->exts.debug_khr) {
glEnable(GL_DEBUG_OUTPUT_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.tex = glGetUniformLocation(prog, "tex");
renderer->shaders.tex_rgbx.alpha = glGetUniformLocation(prog, "alpha"); renderer->shaders.tex_rgbx.alpha = glGetUniformLocation(prog, "alpha");
if (glEGLImageTargetTexture2DOES) { if (renderer->exts.egl_image_external_oes) {
renderer->shaders.tex_ext.program = prog = renderer->shaders.tex_ext.program = prog =
link_program(tex_vertex_src, tex_fragment_src_external); link_program(tex_vertex_src, tex_fragment_src_external);
if (!renderer->shaders.tex_ext.program) { if (!renderer->shaders.tex_ext.program) {