From: Georg Lehmann <dadschoorse@gmail.com>
Date: Thu, 10 Aug 2023 19:05:32 +0000 (+0200)
Subject: nir/opt_if: also rewrite uniform uses for read_invocation
X-Git-Tag: upstream/23.3.3~3428
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=95856898393782a14da6062bfce3ee92d88497d6;p=platform%2Fupstream%2Fmesa.git

nir/opt_if: also rewrite uniform uses for read_invocation

No Foz-DB changes, but maybe it matters in the future because dxil-spirv
will use read_invocation for WaveReadLaneFirst in fragment shaders.

Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24618>
---

diff --git a/src/compiler/nir/nir_opt_if.c b/src/compiler/nir/nir_opt_if.c
index 65b85d1..c08a9b9 100644
--- a/src/compiler/nir/nir_opt_if.c
+++ b/src/compiler/nir/nir_opt_if.c
@@ -1424,6 +1424,7 @@ opt_if_rewrite_uniform_uses(nir_builder *b, nir_if *nif, nir_ssa_scalar cond, bo
          continue;
       nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(src_uni.def->parent_instr);
       if (intrin->intrinsic != nir_intrinsic_read_first_invocation &&
+          intrin->intrinsic != nir_intrinsic_read_invocation &&
           (intrin->intrinsic != nir_intrinsic_reduce || nir_intrinsic_cluster_size(intrin)))
          continue;