From 60af3b6b78365f26247187593fbb722515719027 Mon Sep 17 00:00:00 2001 From: Leo Li Date: Wed, 31 Jan 2024 14:15:00 -0500 Subject: render/gles2: Fixup dropping has_alpha from pixel_format Fixes: 71fb55f3 ("render/pixel-format: Move has_alpha into it's own array") --- render/gles2/pixel_format.c | 4 +--- render/gles2/texture.c | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/render/gles2/pixel_format.c b/render/gles2/pixel_format.c index 1d9884e3..5cdf8c99 100644 --- a/render/gles2/pixel_format.c +++ b/render/gles2/pixel_format.c @@ -141,9 +141,7 @@ const struct wlr_gles2_pixel_format *get_gles2_format_from_gl( continue; } - const struct wlr_pixel_format_info *drm_fmt = - drm_get_pixel_format_info(formats[i].drm_format); - if (drm_fmt->has_alpha != alpha) { + if (pixel_format_has_alpha(formats[i].drm_format) != alpha) { continue; } diff --git a/render/gles2/texture.c b/render/gles2/texture.c index e4caf6ca..d66e9c16 100644 --- a/render/gles2/texture.c +++ b/render/gles2/texture.c @@ -330,7 +330,7 @@ static struct wlr_texture *gles2_texture_from_pixels( return NULL; } texture->target = GL_TEXTURE_2D; - texture->has_alpha = drm_fmt->has_alpha; + texture->has_alpha = pixel_format_has_alpha(fmt->drm_format); texture->drm_format = fmt->drm_format; GLint internal_format = fmt->gl_internalformat; -- cgit v1.2.3