diff options
| author | Emma Anholt <emma@anholt.net> | 2022-04-14 11:03:00 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2022-04-21 21:03:07 -0700 |
| commit | 393180a1c20b71900e98e84d41dec5fa22e72bcd (patch) | |
| tree | d401bce90c0039e10168384d3d83c2f614cf22b2 | |
| parent | abc89d4f39537036b47a8a286b350d775a00aba4 (diff) | |
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@collabora.com>
Reviewed-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16063>
(cherry picked from commit af718674ab50eebd2a97b85455214bda3864fb1b)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | 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 e14191784e0..cd045e850cc 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; |