[Mesa-dev] [PATCH v3 026/104] nir: Support deref instructions in propagate_invariant

[Jason Ekstrand]

---
 src/compiler/nir/nir_propagate_invariant.c | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/compiler/nir/nir_propagate_invariant.c b/src/compiler/nir/nir_propagate_invariant.c
index 7b5bd6c..b48b91c 100644
--- a/src/compiler/nir/nir_propagate_invariant.c
+++ b/src/compiler/nir/nir_propagate_invariant.c
@@ -74,6 +74,15 @@ var_is_invariant(nir_variable *var, struct set * invariants)
    return var->data.invariant || _mesa_set_search(invariants, var);
 }
 
+static nir_variable *
+intrinsic_get_var(nir_intrinsic_instr *intrin, unsigned i)
+{
+   if (nir_intrinsic_infos[intrin->intrinsic].num_variables == 0)
+      return nir_deref_instr_get_variable(nir_src_as_deref(intrin->src[i]));
+   else
+      return intrin->variables[0]->var;
+}
+
 static void
 propagate_invariant_instr(nir_instr *instr, struct set *invariants)
 {
@@ -99,14 +108,16 @@ propagate_invariant_instr(nir_instr *instr, struct set *invariants)
       nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
       switch (intrin->intrinsic) {
       case nir_intrinsic_copy_var:
+      case nir_intrinsic_copy_deref:
          /* If the destination is invariant then so is the source */
-         if (var_is_invariant(intrin->variables[0]->var, invariants))
-            add_var(intrin->variables[1]->var, invariants);
+         if (var_is_invariant(intrinsic_get_var(intrin, 0), invariants))
+            add_var(intrinsic_get_var(intrin, 1), invariants);
          break;
 
       case nir_intrinsic_load_var:
+      case nir_intrinsic_load_deref:
          if (dest_is_invariant(&intrin->dest, invariants))
-            add_var(intrin->variables[0]->var, invariants);
+            add_var(intrinsic_get_var(intrin, 0), invariants);
          break;
 
       case nir_intrinsic_store_var:
@@ -114,12 +125,18 @@ propagate_invariant_instr(nir_instr *instr, struct set *invariants)
             add_src(&intrin->src[0], invariants);
          break;
 
+      case nir_intrinsic_store_deref:
+         if (var_is_invariant(intrinsic_get_var(intrin, 0), invariants))
+            add_src(&intrin->src[1], invariants);
+         break;
+
       default:
          /* Nothing to do */
          break;
       }
    }
 
+   case nir_instr_type_deref:
    case nir_instr_type_jump:
    case nir_instr_type_ssa_undef:
    case nir_instr_type_load_const:
-- 
2.5.0.400.gff86faf