From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Tue, 27 Mar 2018 00:21:08 +0000 (-0700)
Subject: nir: Remove deref chain support from lower_clamp_color_outputs
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=41c52c963a6a252fcb7208f70c0b11730fc40784;p=mesa.git

nir: Remove deref chain support from lower_clamp_color_outputs

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>
---

diff --git a/src/compiler/nir/nir_lower_clamp_color_outputs.c b/src/compiler/nir/nir_lower_clamp_color_outputs.c
index ec398489823..499fce3ef2c 100644
--- a/src/compiler/nir/nir_lower_clamp_color_outputs.c
+++ b/src/compiler/nir/nir_lower_clamp_color_outputs.c
@@ -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);