Mesa (staging/20.1): mesa/main: fix inverted condition

[GitLab Mirror]

Module: Mesa
Branch: staging/20.1
Commit: a2979f9162017fca9c9d7ceb438a3faeb35a26b9
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a2979f9162017fca9c9d7ceb438a3faeb35a26b9

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>
(cherry picked from commit 747e808697c56dcabc76ae7bae350e4552af12e3)

---

 .pick_status.json         | 2 +-
 src/mesa/main/glformats.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 2c2cde94dcf..f4394c358ab 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -436,7 +436,7 @@
         "description": "mesa/main: fix inverted condition",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "b112e62ba4819e3b230b63f778bb93c056dc059d"
     },
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;
    }