Mesa (staging/21.3): microsoft/spirv_to_dxil: turn sysvals into input varyings

[GitLab Mirror]

Module: Mesa
Branch: staging/21.3
Commit: 609f6a9cb373349694f01075f18db2b2b060bd79
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=609f6a9cb373349694f01075f18db2b2b060bd79

Author: Michael Tang <tangm at microsoft.com>
Date:   Fri Oct  8 14:19:04 2021 -0700

microsoft/spirv_to_dxil: turn sysvals into input varyings

Fixes: b47090c5b33 ("spirv: Always declare FragCoord as a sysval")
Reviewed-by: Jesse Natalie <jenatali at microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13276>
(cherry picked from commit 3094524621291e6010232c4fd930e1e2d335f2ee)

---

 .pick_status.json                           | 2 +-
 src/microsoft/spirv_to_dxil/spirv_to_dxil.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 36b4960eb47..0114b9f4a83 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -4,7 +4,7 @@
         "description": "microsoft/spirv_to_dxil: turn sysvals into input varyings",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "b47090c5b33c89e5c29dd4f95230863ec018e2bc"
     },
diff --git a/src/microsoft/spirv_to_dxil/spirv_to_dxil.c b/src/microsoft/spirv_to_dxil/spirv_to_dxil.c
index 36bb65ff26a..b3649d01176 100644
--- a/src/microsoft/spirv_to_dxil/spirv_to_dxil.c
+++ b/src/microsoft/spirv_to_dxil/spirv_to_dxil.c
@@ -194,6 +194,12 @@ spirv_to_dxil(const uint32_t *words, size_t word_count,
    nir_validate_shader(nir,
                        "Validate before feeding NIR to the DXIL compiler");
 
+   const struct nir_lower_sysvals_to_varyings_options sysvals_to_varyings = {
+      .frag_coord = true,
+      .point_coord = true,
+   };
+   NIR_PASS_V(nir, nir_lower_sysvals_to_varyings, &sysvals_to_varyings);
+
    NIR_PASS_V(nir, nir_lower_system_values);
 
    if (conf->zero_based_vertex_instance_id) {