From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Fri, 23 Mar 2018 14:51:24 +0000 (-0700)
Subject: nir: Support deref instructions in lower_pos_center
X-Git-Tag: upstream/19.0.0~4387
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=933c2851ab248358e3887f1afd7d228d34af625d;p=platform%2Fupstream%2Fmesa.git

nir: Support deref instructions in lower_pos_center

Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
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 fa22599..5b68cac 100644
--- a/src/compiler/nir/nir_lower_wpos_center.c
+++ b/src/compiler/nir/nir_lower_wpos_center.c
@@ -81,7 +81,18 @@ lower_wpos_center_block(nir_builder *b, nir_block *block,
    nir_foreach_instr(instr, block) {
       if (instr->type == nir_instr_type_intrinsic) {
          nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr);
-         if (intr->intrinsic == nir_intrinsic_load_var) {
+         if (intr->intrinsic == nir_intrinsic_load_deref) {
+            nir_deref_instr *deref = nir_src_as_deref(intr->src[0]);
+            nir_variable *var = nir_deref_instr_get_variable(deref);
+
+            if (var->data.mode == nir_var_shader_in &&
+                var->data.location == VARYING_SLOT_POS) {
+               /* gl_FragCoord should not have array/struct derefs: */
+               assert(deref->deref_type == nir_deref_type_var);
+               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;
 
@@ -107,8 +118,6 @@ nir_lower_wpos_center(nir_shader *shader, const bool for_sample_shading)
 
    assert(shader->info.stage == MESA_SHADER_FRAGMENT);
 
-   nir_assert_lowered_derefs(shader, nir_lower_load_store_derefs);
-
    nir_foreach_function(function, shader) {
       if (function->impl) {
          nir_builder_init(&b, function->impl);