nir: Remove deref chain support from lower_clamp_color_outputs
authorJason Ekstrand <jason.ekstrand@intel.com>
Tue, 27 Mar 2018 00:21:08 +0000 (17:21 -0700)
committerJason Ekstrand <jason.ekstrand@intel.com>
Sat, 23 Jun 2018 03:54:00 +0000 (20:54 -0700)
Acked-by: Rob Clark <robdclark@gmail.com>
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Acked-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
src/compiler/nir/nir_lower_clamp_color_outputs.c

index ec3984898239f7f312ca5f7a4574ff9c47b80df3..499fce3ef2c2253b8a295d26a8151ace379322dd 100644 (file)
@@ -67,9 +67,6 @@ lower_intrinsic(lower_state *state, nir_intrinsic_instr *intr)
    nir_ssa_def *s;
 
    switch (intr->intrinsic) {
-   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;
@@ -138,6 +135,8 @@ nir_lower_clamp_color_outputs(nir_shader *shader)
       .shader = shader,
    };
 
+   nir_assert_unlowered_derefs(shader, nir_lower_load_store_derefs);
+
    nir_foreach_function(function, shader) {
       if (function->impl)
          progress |= lower_impl(&state, function->impl);