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

nir: Remove deref chain support from lower_wpos_center

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_wpos_center.c b/src/compiler/nir/nir_lower_wpos_center.c
index 5b68caca358..26f2b5d165f 100644
--- a/src/compiler/nir/nir_lower_wpos_center.c
+++ b/src/compiler/nir/nir_lower_wpos_center.c
@@ -92,17 +92,6 @@ lower_wpos_center_block(nir_builder *b, nir_block *block,
                update_fragcoord(b, intr, for_sample_shading);
                progress = true;
             }
-         } else if (intr->intrinsic == nir_intrinsic_load_var) {
-            nir_deref_var *dvar = intr->variables[0];
-            nir_variable *var = dvar->var;
-
-            if (var->data.mode == nir_var_shader_in &&
-                var->data.location == VARYING_SLOT_POS) {
-               /* gl_FragCoord should not have array/struct derefs: */
-               assert(dvar->deref.child == NULL);
-               update_fragcoord(b, intr, for_sample_shading);
-               progress = true;
-            }
          }
       }
    }
@@ -118,6 +107,8 @@ nir_lower_wpos_center(nir_shader *shader, const bool for_sample_shading)
 
    assert(shader->info.stage == MESA_SHADER_FRAGMENT);
 
+   nir_assert_unlowered_derefs(shader, nir_lower_load_store_derefs);
+
    nir_foreach_function(function, shader) {
       if (function->impl) {
          nir_builder_init(&b, function->impl);