From 62d646f2b8b560ce9b64e6a840ac7bdc8d60bbb8 Mon Sep 17 00:00:00 2001 From: emersion Date: Wed, 31 Oct 2018 17:20:27 +0100 Subject: render/gles2: remove assumptions about supported formats We were assuming GL_BGRA_EXT was always supported. We now check that it's supported for rendering. We fail if it isn't because this format is specified as "always supported" by the Wayland protocol. We also check if it's supported for reading pixels. A new preferred_read_format function returns the preferred format that can be used to read pixels. This is used by the screencopy protocol. --- include/render/gles2.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'include/render/gles2.h') diff --git a/include/render/gles2.h b/include/render/gles2.h index 7ff2f174..063ed20a 100644 --- a/include/render/gles2.h +++ b/include/render/gles2.h @@ -39,6 +39,11 @@ struct wlr_gles2_renderer { struct wlr_egl *egl; const char *exts_str; + struct { + bool read_format_bgra_ext; + bool debug_khr; + } exts; + struct { struct { GLuint program; @@ -87,7 +92,9 @@ struct wlr_gles2_texture { const struct wlr_gles2_pixel_format *get_gles2_format_from_wl( enum wl_shm_format fmt); -const enum wl_shm_format *get_gles2_formats(size_t *len); +const struct wlr_gles2_pixel_format *get_gles2_format_from_gl( + GLint gl_format, GLint gl_type, bool alpha); +const enum wl_shm_format *get_gles2_wl_formats(size_t *len); struct wlr_gles2_texture *gles2_get_texture( struct wlr_texture *wlr_texture); -- cgit v1.2.3 From d592dcdedd78136bbc60193473b230505f94d907 Mon Sep 17 00:00:00 2001 From: emersion Date: Thu, 1 Nov 2018 18:03:32 +0100 Subject: 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(-) (limited to 'include/render/gles2.h') 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) { -- cgit v1.2.3