[Mesa-dev] [PATCH v3 094/104] nir: Remove deref chain support from propagate_invariant
Jason Ekstrand
jason at jlekstrand.net
Tue Apr 3 18:39:38 UTC 2018
---
src/compiler/nir/nir_propagate_invariant.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/src/compiler/nir/nir_propagate_invariant.c b/src/compiler/nir/nir_propagate_invariant.c
index b48b91c..a6d32b2 100644
--- a/src/compiler/nir/nir_propagate_invariant.c
+++ b/src/compiler/nir/nir_propagate_invariant.c
@@ -77,10 +77,7 @@ var_is_invariant(nir_variable *var, struct set * invariants)
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;
+ return nir_deref_instr_get_variable(nir_src_as_deref(intrin->src[i]));
}
static void
@@ -107,24 +104,17 @@ 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);
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);
- break;
-
case nir_intrinsic_store_deref:
if (var_is_invariant(intrinsic_get_var(intrin, 0), invariants))
add_src(&intrin->src[1], invariants);
--
2.5.0.400.gff86faf
More information about the mesa-dev
mailing list