From e8160e059dee8e1c352938c54cc6d91512cec9ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Molinari?= Date: Thu, 28 Nov 2024 11:30:49 +0100 Subject: [PATCH] gl-renderer: Relax EXT_texture_format_BGRA8888 requirement MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This can now be removed thanks to texture swizzles. Signed-off-by: Loïc Molinari --- libweston/renderer-gl/gl-renderer.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libweston/renderer-gl/gl-renderer.c b/libweston/renderer-gl/gl-renderer.c index 15fe4a0b2..481c21658 100644 --- a/libweston/renderer-gl/gl-renderer.c +++ b/libweston/renderer-gl/gl-renderer.c @@ -1994,6 +1994,7 @@ static void update_borders_tex(struct gl_renderer *gr, struct gl_output_state *go) { + GLint swizzles[] = { GL_BLUE, GL_GREEN, GL_RED, GL_ALPHA }; int i; for (i = 0; i < 4; i++) { @@ -2010,18 +2011,19 @@ update_borders_tex(struct gl_renderer *gr, if (pending->data) { gl_texture_2d_init( - gr, 1, GL_BGRA8_EXT, pending->tex_width, + gr, 1, GL_RGBA8, pending->tex_width, pending->height, &go->borders_tex[i]); gl_texture_parameters_init( gr, &go->borders_param[i], - GL_TEXTURE_2D, NULL, NULL, NULL, false); + GL_TEXTURE_2D, NULL, NULL, swizzles, + false); } } if (pending->data) { glBindTexture(GL_TEXTURE_2D, go->borders_tex[i]); gl_texture_2d_store(gr, 0, 0, 0, pending->tex_width, - pending->height, GL_BGRA_EXT, + pending->height, GL_RGBA, GL_UNSIGNED_BYTE, pending->data); } *current = *pending;