Conor McCarthy : vkd3d-shader/tpf: Use the default vec4 swizzle if a src param contains a mask.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 92021b7a3c13143165144cfe045b10030597ab1c
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/92021b7a3c13143165144cfe045b10...

Author: Conor McCarthy 
Date:   Tue Aug  8 12:09:10 2023 +1000

vkd3d-shader/tpf: Use the default vec4 swizzle if a src param contains a mask.

---

libs/vkd3d-shader/spirv.c                |  5 -----
 libs/vkd3d-shader/tpf.c                  | 25 +++++++++++++++++++------
 libs/vkd3d-shader/vkd3d_shader_private.h |  6 ++++++
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index f1644587..d79796bc 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -204,11 +204,6 @@ static inline bool register_is_undef(const struct vkd3d_shader_register *reg)
     return reg->type == VKD3DSPR_UNDEF;
 }

-static inline bool register_is_constant(const struct vkd3d_shader_register *reg)
-{
-    return (reg->type == VKD3DSPR_IMMCONST || reg->type == VKD3DSPR_IMMCONST64);
-}
-
 static inline bool register_is_constant_or_undef(const struct vkd3d_shader_register *reg)
 {
     return register_is_constant(reg) || register_is_undef(reg);
diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c
index e00dfd5e..084b0bfd 100644
--- a/libs/vkd3d-shader/tpf.c
+++ b/libs/vkd3d-shader/tpf.c
@@ -507,7 +507,7 @@ enum vkd3d_sm4_input_primitive_type

enum vkd3d_sm4_swizzle_type
 {
-    VKD3D_SM4_SWIZZLE_NONE            = 0x0,
+    VKD3D_SM4_SWIZZLE_NONE            = 0x0, /* swizzle bitfield contains a mask */
     VKD3D_SM4_SWIZZLE_VEC4            = 0x1,
     VKD3D_SM4_SWIZZLE_SCALAR          = 0x2,
 };
@@ -2026,7 +2026,7 @@ static bool shader_sm4_validate_input_output_register(struct vkd3d_shader_sm4_pa
 static bool shader_sm4_read_src_param(struct vkd3d_shader_sm4_parser *priv, const uint32_t **ptr,
         const uint32_t *end, enum vkd3d_data_type data_type, struct vkd3d_shader_src_param *src_param)
 {
-    unsigned int dimension;
+    unsigned int dimension, mask;
     DWORD token;

if (*ptr >= end)
@@ -2057,10 +2057,23 @@ static bool shader_sm4_read_src_param(struct vkd3d_shader_sm4_parser *priv, cons
             switch (swizzle_type)
             {
                 case VKD3D_SM4_SWIZZLE_NONE:
-                    if (shader_sm4_is_scalar_register(&src_param->reg))
-                        src_param->swizzle = VKD3D_SHADER_SWIZZLE(X, X, X, X);
-                    else
-                        src_param->swizzle = VKD3D_SHADER_NO_SWIZZLE;
+                    src_param->swizzle = VKD3D_SHADER_NO_SWIZZLE;
+
+                    mask = (token & VKD3D_SM4_WRITEMASK_MASK) >> VKD3D_SM4_WRITEMASK_SHIFT;
+                    /* Mask seems only to be used for vec4 constants and is always zero. */
+                    if (!register_is_constant(&src_param->reg))
+                    {
+                        FIXME("Source mask %#x is not for a constant.\n", mask);
+                        vkd3d_shader_parser_warning(&priv->p, VKD3D_SHADER_WARNING_TPF_UNHANDLED_REGISTER_MASK,
+                                "Unhandled mask %#x for a non-constant source register.", mask);
+                    }
+                    else if (mask)
+                    {
+                        FIXME("Unhandled mask %#x.\n", mask);
+                        vkd3d_shader_parser_warning(&priv->p, VKD3D_SHADER_WARNING_TPF_UNHANDLED_REGISTER_MASK,
+                                "Unhandled source register mask %#x.", mask);
+                    }
+
                     break;

case VKD3D_SM4_SWIZZLE_SCALAR:
diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h
index c6be6f22..3ea6e5b4 100644
--- a/libs/vkd3d-shader/vkd3d_shader_private.h
+++ b/libs/vkd3d-shader/vkd3d_shader_private.h
@@ -84,6 +84,7 @@ enum vkd3d_shader_error

VKD3D_SHADER_WARNING_TPF_MASK_NOT_CONTIGUOUS        = 1300,
     VKD3D_SHADER_WARNING_TPF_UNHANDLED_INDEX_RANGE_MASK = 1301,
+    VKD3D_SHADER_WARNING_TPF_UNHANDLED_REGISTER_MASK    = 1302,

VKD3D_SHADER_ERROR_SPV_DESCRIPTOR_BINDING_NOT_FOUND = 2000,
     VKD3D_SHADER_ERROR_SPV_INVALID_REGISTER_TYPE        = 2001,
@@ -1018,6 +1019,11 @@ static inline bool vkd3d_shader_register_is_patch_constant(const struct vkd3d_sh
     return reg->type == VKD3DSPR_PATCHCONST;
 }

+static inline bool register_is_constant(const struct vkd3d_shader_register *reg)
+{
+    return (reg->type == VKD3DSPR_IMMCONST || reg->type == VKD3DSPR_IMMCONST64);
+}
+
 struct vkd3d_shader_location
 {
     const char *source_name;