commit 418c4c0d7d48a42f475df1ffb93b3a33763e7a4a
author Gert Wollny <gert.wollny@collabora.com> Mon Jul 06 09:41:25 2020 +0200
committer Marge Bot <eric+marge@anholt.net> Mon Aug 17 12:38:05 2020 +0000
tree 5f8adb1ac70338405a42ba34dfeeae8fb07ddeab
parent 7aaddf1a342944743f65ab0c55df46f2c7d3c17f

compiler/nir: extend lower_fragcoord_wtrans to support VARYING_SLOT_POS

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Reviewed-by: Andreas Baierl <ichgeh@imkreisrum.de>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6220>

src/compiler/nir/nir_lower_fragcoord_wtrans.c

diff --git a/src/compiler/nir/nir_lower_fragcoord_wtrans.c b/src/compiler/nir/nir_lower_fragcoord_wtrans.c
index f469b95..ed630bb 100644
--- a/src/compiler/nir/nir_lower_fragcoord_wtrans.c
+++ b/src/compiler/nir/nir_lower_fragcoord_wtrans.c
@@ -30,8 +30,6 @@
  *    gl_FragCoord.xyz = gl_FragCoord_orig.xyz
  *    gl_FragCoord.w = 1.0 / gl_FragCoord_orig.w
  *
- * To trigger the transformation, gl_FragCoord currently has to be treated
- * as a system value with PIPE_CAP_TGSI_FS_POSITION_IS_SYSVAL enabled.
  */
 
 static bool
@@ -41,7 +39,14 @@
       return false;
 
    nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr);
-   return intr->intrinsic == nir_intrinsic_load_frag_coord;
+   if (intr->intrinsic == nir_intrinsic_load_frag_coord)
+      return true;
+
+   if (intr->intrinsic != nir_intrinsic_load_deref)
+      return false;
+
+   nir_variable *var = nir_intrinsic_get_var(intr, 0);
+   return var->data.location == VARYING_SLOT_POS;
 }
 
 static nir_ssa_def *