commit 60bf76735c80352859d242e0925f9057b666f899
author Marek Olšák <marek.olsak@amd.com> Fri Nov 13 23:13:45 2020 -0500
committer Dylan Baker <dylan.c.baker@intel.com> Mon Nov 23 09:07:34 2020 -0800
tree 2aaa378b78dd5abf661d1a1f70475f62813690bf
parent 6adf918d341557b1de43f09c0c668130dbdeb98d

ac/nir: fix a typo in ac_are_tessfactors_def_in_all_invocs

I think it only made the pass return false if there was a barrier

Fixes: 2832bc972bf - ac/nir_to_llvm: add ac_are_tessfactors_def_in_all_invocs()

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7623>
(cherry picked from commit 96593847445bd4f80ef65040dda5f74c26c7a80a)

.pick_status.json

diff --git a/.pick_status.json b/.pick_status.json
index 4e8041c..59096b2 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -274,7 +274,7 @@
         "description": "ac/nir: fix a typo in ac_are_tessfactors_def_in_all_invocs",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "2832bc972bfb512b314a3180a1258be984807760"
     },

src/amd/llvm/ac_nir_to_llvm.c

diff --git a/src/amd/llvm/ac_nir_to_llvm.c b/src/amd/llvm/ac_nir_to_llvm.c
index fcab257..4869f1b 100644
--- a/src/amd/llvm/ac_nir_to_llvm.c
+++ b/src/amd/llvm/ac_nir_to_llvm.c
@@ -4967,7 +4967,7 @@
              * such segment that writes tess factor channels should write the same
              * channels in all codepaths within that segment.
              */
-            if (upper_block_tf_writemask || cond_block_tf_writemask) {
+            if (*upper_block_tf_writemask || *cond_block_tf_writemask) {
                /* Accumulate the result: */
                *tessfactors_are_def_in_all_invocs &=
                   !(*cond_block_tf_writemask & ~(*upper_block_tf_writemask));