From: Jason Ekstrand Date: Tue, 27 Mar 2018 00:20:12 +0000 (-0700) Subject: nir: Support deref instructions in lower_clamp_color_outputs X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=932c6577a0b9d226c7a727188138a941b8413bb0;p=mesa.git nir: Support deref instructions in lower_clamp_color_outputs Reviewed-by: Caio Marcelo de Oliveira Filho Acked-by: Rob Clark Acked-by: Bas Nieuwenhuizen Acked-by: Dave Airlie Reviewed-by: Kenneth Graunke --- 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);