Mesa (staging/22.0): nouveau/nir: Fix the inverted sense of usesSampleMaskIn.

[GitLab Mirror]

Module: Mesa
Branch: staging/22.0
Commit: 0e58d0b73cdfe3fd6db90826e601a4315af36f06
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0e58d0b73cdfe3fd6db90826e601a4315af36f06

Author: Emma Anholt <emma at anholt.net>
Date:   Thu Apr 14 11:03:00 2022 -0700

nouveau/nir: Fix the inverted sense of usesSampleMaskIn.

Fixes: 9f3d5e99ea60 ("compiler: Use util/bitset.h for system_values_read")
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Reviewed-by: Karol Herbst <kherbst at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16063>
(cherry picked from commit af718674ab50eebd2a97b85455214bda3864fb1b)

---

 .pick_status.json                                        | 2 +-
 src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index f29699aad6a..c391ec1086a 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -452,7 +452,7 @@
         "description": "nouveau/nir: Fix the inverted sense of usesSampleMaskIn.",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "because_sha": "9f3d5e99ea601ae4bc492ff47738290eed520651"
     },
     {
diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp
index 45cf8089460..eb38a70bf2e 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_from_nir.cpp
@@ -1317,7 +1317,7 @@ Converter::parseNIR()
          BITSET_TEST(nir->info.system_values_read, SYSTEM_VALUE_SAMPLE_POS);
       info_out->prop.fp.usesDiscard = nir->info.fs.uses_discard || nir->info.fs.uses_demote;
       info_out->prop.fp.usesSampleMaskIn =
-         !BITSET_TEST(nir->info.system_values_read, SYSTEM_VALUE_SAMPLE_MASK_IN);
+         BITSET_TEST(nir->info.system_values_read, SYSTEM_VALUE_SAMPLE_MASK_IN);
       break;
    case Program::TYPE_GEOMETRY:
       info_out->prop.gp.instanceCount = nir->info.gs.invocations;