Zebediah Figura : vkd3d-shader/dxbc: Map sm4 fragment outputs to system values based on their name.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 1615e5a76b97bfe4014e27fc51a2d66b579973b5
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/1615e5a76b97bfe4014e27fc51a2d6...

Author: Zebediah Figura <zfigura(a)codeweavers.com>
Date:   Wed Sep 20 13:15:55 2023 -0500

vkd3d-shader/dxbc: Map sm4 fragment outputs to system values based on their name.

---

 libs/vkd3d-shader/dxbc.c | 23 +++++++++++++++++++++++
 tests/vkd3d_shader_api.c |  4 ++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c
index cedc3da4..1cb00688 100644
--- a/libs/vkd3d-shader/dxbc.c
+++ b/libs/vkd3d-shader/dxbc.c
@@ -321,6 +321,26 @@ int vkd3d_shader_parse_dxbc(const struct vkd3d_shader_code *dxbc,
     return ret;
 }
 
+/* Shader Model 6 shaders use these special values in the output signature,
+ * but Shader Model 4/5 just use VKD3D_SHADER_SV_NONE. Normalize to SM6. */
+static enum vkd3d_shader_sysval_semantic map_fragment_output_sysval(const char *name)
+{
+    if (!ascii_strcasecmp(name, "sv_target"))
+        return VKD3D_SHADER_SV_TARGET;
+    if (!ascii_strcasecmp(name, "sv_depth"))
+        return VKD3D_SHADER_SV_DEPTH;
+    if (!ascii_strcasecmp(name, "sv_coverage"))
+        return VKD3D_SHADER_SV_COVERAGE;
+    if (!ascii_strcasecmp(name, "sv_depthgreaterequal"))
+        return VKD3D_SHADER_SV_DEPTH_GREATER_EQUAL;
+    if (!ascii_strcasecmp(name, "sv_depthlessequal"))
+        return VKD3D_SHADER_SV_DEPTH_LESS_EQUAL;
+    if (!ascii_strcasecmp(name, "sv_stencilref"))
+        return VKD3D_SHADER_SV_STENCIL_REF;
+
+    return VKD3D_SHADER_SV_NONE;
+}
+
 static int shader_parse_signature(const struct vkd3d_shader_dxbc_section_desc *section,
         struct vkd3d_shader_message_context *message_context, struct shader_signature *s)
 {
@@ -401,6 +421,9 @@ static int shader_parse_signature(const struct vkd3d_shader_dxbc_section_desc *s
             case TAG_OSGN:
             case TAG_OSG1:
             case TAG_OSG5:
+                if (e[i].sysval_semantic == VKD3D_SHADER_SV_NONE)
+                    e[i].sysval_semantic = map_fragment_output_sysval(e[i].semantic_name);
+                /* Fall through. */
             case TAG_PCSG:
             case TAG_PSG1:
                 e[i].used_mask = e[i].mask & ~e[i].used_mask;
diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c
index ea53c81d..3182fe0d 100644
--- a/tests/vkd3d_shader_api.c
+++ b/tests/vkd3d_shader_api.c
@@ -566,8 +566,8 @@ static void test_scan_signatures(void)
 
     static const struct vkd3d_shader_signature_element ps1_outputs[] =
     {
-        {"sv_target",   2, 0, VKD3D_SHADER_SV_NONE,     VKD3D_SHADER_COMPONENT_FLOAT, 2,   0xf, 0xf},
-        {"sv_depth",    0, 0, VKD3D_SHADER_SV_NONE,     VKD3D_SHADER_COMPONENT_FLOAT, ~0u, 0x1, 0x1},
+        {"sv_target",   2, 0, VKD3D_SHADER_SV_TARGET,   VKD3D_SHADER_COMPONENT_FLOAT, 2,   0xf, 0xf},
+        {"sv_depth",    0, 0, VKD3D_SHADER_SV_DEPTH,    VKD3D_SHADER_COMPONENT_FLOAT, ~0u, 0x1, 0x1},
     };
 
     static const char ps2_source[] =