Conor McCarthy : vkd3d-shader/spirv: Always emit clip/cull builtins as an array.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 9fcc90483490ad8a717ef5f3e07a39f2c906ee42
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/9fcc90483490ad8a717ef5f3e07a39...

Author: Conor McCarthy <cmccarthy(a)codeweavers.com>
Date:   Wed Dec  6 15:07:18 2023 +1000

vkd3d-shader/spirv: Always emit clip/cull builtins as an array.

Clip/cull distance can appear as input in pixel shaders, and the
array size must not be forced to zero.

---

 libs/vkd3d-shader/spirv.c                | 5 ++++-
 libs/vkd3d-shader/vkd3d_shader_private.h | 5 +++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index 2197b74d..f72875e1 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -4714,8 +4714,11 @@ static uint32_t spirv_compiler_emit_input(struct spirv_compiler *compiler,
 
     array_sizes[0] = (reg->type == VKD3DSPR_PATCHCONST ? 0 : compiler->input_control_point_count);
     array_sizes[1] = signature_element->register_count;
-    if (array_sizes[1] == 1 && !vsir_sysval_semantic_is_tess_factor(signature_element->sysval_semantic))
+    if (array_sizes[1] == 1 && !vsir_sysval_semantic_is_tess_factor(signature_element->sysval_semantic)
+            && (!vsir_sysval_semantic_is_clip_cull(signature_element->sysval_semantic) || array_sizes[0]))
+    {
         array_sizes[1] = 0;
+    }
 
     write_mask = signature_element->mask;
 
diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h
index d3989672..267b467e 100644
--- a/libs/vkd3d-shader/vkd3d_shader_private.h
+++ b/libs/vkd3d-shader/vkd3d_shader_private.h
@@ -980,6 +980,11 @@ static inline bool vsir_sysval_semantic_is_tess_factor(enum vkd3d_shader_sysval_
         && sysval_semantic <= VKD3D_SHADER_SV_TESS_FACTOR_LINEDEN;
 }
 
+static inline bool vsir_sysval_semantic_is_clip_cull(enum vkd3d_shader_sysval_semantic sysval_semantic)
+{
+    return sysval_semantic == VKD3D_SHADER_SV_CLIP_DISTANCE || sysval_semantic == VKD3D_SHADER_SV_CULL_DISTANCE;
+}
+
 struct signature_element *vsir_signature_find_element_for_reg(const struct shader_signature *signature,
         unsigned int reg_idx, unsigned int write_mask);
 void shader_signature_cleanup(struct shader_signature *signature);