[Mesa-dev] [PATCH v4 094/129] nir: Remove deref chain support from lower_wpos_center

Jason Ekstrand jason at jlekstrand.net
Fri Jun 1 05:04:24 UTC 2018


---
 src/compiler/nir/nir_lower_wpos_center.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/compiler/nir/nir_lower_wpos_center.c b/src/compiler/nir/nir_lower_wpos_center.c
index 5b68cac..26f2b5d 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);
-- 
2.5.0.400.gff86faf



More information about the mesa-dev mailing list