Mesa (master): mesa/main: fix inverted condition

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Thu Jun 18 17:28:41 UTC 2020


Module: Mesa
Branch: master
Commit: 747e808697c56dcabc76ae7bae350e4552af12e3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=747e808697c56dcabc76ae7bae350e4552af12e3

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Wed Jun 17 23:50:06 2020 +0200

mesa/main: fix inverted condition

I accidentally got one of the conditions wrong here. Sorry for the
mixup.

See ttps://gitlab.freedesktop.org/mesa/mesa/-/issues/3134 for details.

Fixes: b112e62ba48 ("mesa/main: do not allow MESA_ycbcr_texture enums on gles")
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5532>

---

 src/mesa/main/glformats.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/main/glformats.c b/src/mesa/main/glformats.c
index 5709b983067..dfff4a21f04 100644
--- a/src/mesa/main/glformats.c
+++ b/src/mesa/main/glformats.c
@@ -2391,7 +2391,7 @@ _mesa_base_tex_format(const struct gl_context *ctx, GLint internalFormat)
         is_astc_3d_format(internalFormat)))
         return GL_RGBA;
 
-   if (!_mesa_has_MESA_ycbcr_texture(ctx)) {
+   if (_mesa_has_MESA_ycbcr_texture(ctx)) {
       if (internalFormat == GL_YCBCR_MESA)
          return GL_YCBCR_MESA;
    }



More information about the mesa-commit mailing list