nir: Copy propagation between blocks

[mesa.git] / src / compiler / nir / nir_propagate_invariant.c

diff --git a/src/compiler/nir/nir_propagate_invariant.c b/src/compiler/nir/nir_propagate_invariant.c
index 63340c4ab68e23b3b1ede25bd86c6257302e4bfa..eb858f50f038f07ceb97500946555a2c2a7bb287 100644 (file)
--- a/src/compiler/nir/nir_propagate_invariant.c
+++ b/src/compiler/nir/nir_propagate_invariant.c
@@ -74,15 +74,6 @@ 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[i]->var;
-}
-
 static void
 propagate_invariant_instr(nir_instr *instr, struct set *invariants)
 {
@@ -107,26 +98,19 @@ propagate_invariant_instr(nir_instr *instr, struct set *invariants)
    case nir_instr_type_intrinsic: {
       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(intrinsic_get_var(intrin, 0), invariants))
-            add_var(intrinsic_get_var(intrin, 1), invariants);
+         if (var_is_invariant(nir_intrinsic_get_var(intrin, 0), invariants))
+            add_var(nir_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(intrinsic_get_var(intrin, 0), invariants);
-         break;
-
-      case nir_intrinsic_store_var:
-         if (var_is_invariant(intrin->variables[0]->var, invariants))
-            add_src(&intrin->src[0], invariants);
+            add_var(nir_intrinsic_get_var(intrin, 0), invariants);
          break;
 
       case nir_intrinsic_store_deref:
-         if (var_is_invariant(intrinsic_get_var(intrin, 0), invariants))
+         if (var_is_invariant(nir_intrinsic_get_var(intrin, 0), invariants))
             add_src(&intrin->src[1], invariants);
          break;