[PATCH 0/2] MR503: vkd3d-shader/spirv: Silence fixmes for SV_TARGET.

[Conor McCarthy (＠cmccarthy)]

Tests produce many spurious fixmes since SV_TARGET used to map to SV_NONE.

-- 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/503

[PATCH 1/2] vkd3d-shader/spirv: Do not emit a fixme for SV_TARGET in get_spirv_builtin_for_sysval().

[Conor McCarthy]

From: Conor McCarthy <cmccarthy(a)codeweavers.com>

---
 libs/vkd3d-shader/spirv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index be149a0cf..55afa1cc7 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -4455,7 +4455,7 @@ static const struct vkd3d_spirv_builtin *get_spirv_builtin_for_sysval(
     enum vkd3d_shader_spirv_environment environment;
     unsigned int i;
 
-    if (!sysval)
+    if (sysval == VKD3D_SHADER_SV_NONE || sysval == VKD3D_SHADER_SV_TARGET)
         return NULL;
 
     /* In pixel shaders, SV_Position is mapped to SpvBuiltInFragCoord. */
-- 
GitLab


https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/503

[PATCH 2/2] vkd3d-shader/spirv: Do not emit a fixme for SV_TARGET in vkd3d_get_spirv_builtin().

[Conor McCarthy]

From: Conor McCarthy <cmccarthy(a)codeweavers.com>

---
 libs/vkd3d-shader/spirv.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index 55afa1cc7..2197b74dd 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -4500,8 +4500,11 @@ static const struct vkd3d_spirv_builtin *vkd3d_get_spirv_builtin(const struct sp
     if ((builtin = get_spirv_builtin_for_register(reg_type)))
         return builtin;
 
-    if (sysval != VKD3D_SHADER_SV_NONE || (reg_type != VKD3DSPR_OUTPUT && reg_type != VKD3DSPR_PATCHCONST))
+    if ((sysval != VKD3D_SHADER_SV_NONE && sysval != VKD3D_SHADER_SV_TARGET)
+            || (reg_type != VKD3DSPR_OUTPUT && reg_type != VKD3DSPR_PATCHCONST))
+    {
         FIXME("Unhandled builtin (register type %#x, sysval %#x).\n", reg_type, sysval);
+    }
     return NULL;
 }
 
-- 
GitLab

https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/503

[PATCH 0/2] MR503: vkd3d-shader/spirv: Silence fixmes for SV_TARGET. - approved

[Henri Verbeet (＠hverbeet)]

This merge request was approved by Henri Verbeet.
-- 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/503