aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJason Ekstrand <[email protected]>2018-03-26 17:20:12 -0700
committerJason Ekstrand <[email protected]>2018-06-22 20:15:56 -0700
commit932c6577a0b9d226c7a727188138a941b8413bb0 (patch)
treeab3341fadaee6603b54f32a67951ba4c73ebba51 /src
parent076b6627c2bc2ab7b441c5ca81528ded63198f55 (diff)
nir: Support deref instructions in lower_clamp_color_outputs
Reviewed-by: Caio Marcelo de Oliveira Filho <[email protected]> Acked-by: Rob Clark <[email protected]> Acked-by: Bas Nieuwenhuizen <[email protected]> Acked-by: Dave Airlie <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/compiler/nir/nir_lower_clamp_color_outputs.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/compiler/nir/nir_lower_clamp_color_outputs.c b/src/compiler/nir/nir_lower_clamp_color_outputs.c
index 17bda24bf74..ec398489823 100644
--- a/src/compiler/nir/nir_lower_clamp_color_outputs.c
+++ b/src/compiler/nir/nir_lower_clamp_color_outputs.c
@@ -70,6 +70,9 @@ lower_intrinsic(lower_state *state, nir_intrinsic_instr *intr)
case nir_intrinsic_store_var:
out = intr->variables[0]->var;
break;
+ case nir_intrinsic_store_deref:
+ out = nir_deref_instr_get_variable(nir_src_as_deref(intr->src[0]));
+ break;
case nir_intrinsic_store_output:
/* already had i/o lowered.. lookup the matching output var: */
nir_foreach_variable(var, &state->shader->outputs) {
@@ -90,9 +93,10 @@ lower_intrinsic(lower_state *state, nir_intrinsic_instr *intr)
if (is_color_output(state, out)) {
b->cursor = nir_before_instr(&intr->instr);
- s = nir_ssa_for_src(b, intr->src[0], intr->num_components);
+ int src = intr->intrinsic == nir_intrinsic_store_deref ? 1 : 0;
+ s = nir_ssa_for_src(b, intr->src[src], intr->num_components);
s = nir_fsat(b, s);
- nir_instr_rewrite_src(&intr->instr, &intr->src[0], nir_src_for_ssa(s));
+ nir_instr_rewrite_src(&intr->instr, &intr->src[src], nir_src_for_ssa(s));
}
return true;
@@ -134,8 +138,6 @@ nir_lower_clamp_color_outputs(nir_shader *shader)
.shader = shader,
};
- nir_assert_lowered_derefs(shader, nir_lower_load_store_derefs);
-
nir_foreach_function(function, shader) {
if (function->impl)
progress |= lower_impl(&state, function->impl);