Henri Verbeet : vkd3d-shader/ir: Pass a uint32_t write mask to vkd3d_write_mask_64_from_32().

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 3759186193534f7bbd59b21f25b42e1ce026c0c5
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/3759186193534f7bbd59b21f25b42e...

Author: Henri Verbeet 
Date:   Tue Dec  5 22:39:12 2023 +0100

vkd3d-shader/ir: Pass a uint32_t write mask to vkd3d_write_mask_64_from_32().

---

libs/vkd3d-shader/tpf.c                  | 2 +-
 libs/vkd3d-shader/vkd3d_shader_private.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c
index d236c9f4..235e8552 100644
--- a/libs/vkd3d-shader/tpf.c
+++ b/libs/vkd3d-shader/tpf.c
@@ -2231,7 +2231,7 @@ static bool shader_sm4_read_dst_param(struct vkd3d_shader_sm4_parser *priv, cons
     }

if (data_type == VKD3D_DATA_DOUBLE)
-        dst_param->write_mask = vkd3d_write_mask_64_from_32(dst_param->write_mask);
+        dst_param->write_mask = vsir_write_mask_64_from_32(dst_param->write_mask);
     /* Some scalar registers are declared with no write mask in shader bytecode. */
     if (!dst_param->write_mask && shader_sm4_is_scalar_register(&dst_param->reg))
         dst_param->write_mask = VKD3DSP_WRITEMASK_0;
diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h
index a89248ef..4fd6db0b 100644
--- a/libs/vkd3d-shader/vkd3d_shader_private.h
+++ b/libs/vkd3d-shader/vkd3d_shader_private.h
@@ -1544,9 +1544,9 @@ static inline unsigned int vkd3d_write_mask_from_component_count(unsigned int co
     return (VKD3DSP_WRITEMASK_0 << component_count) - 1;
 }

-static inline unsigned int vkd3d_write_mask_64_from_32(DWORD write_mask32)
+static inline uint32_t vsir_write_mask_64_from_32(uint32_t write_mask32)
 {
-    unsigned int write_mask64 = write_mask32 | (write_mask32 >> 1);
+    uint32_t write_mask64 = write_mask32 | (write_mask32 >> 1);
     return (write_mask64 & VKD3DSP_WRITEMASK_0) | ((write_mask64 & VKD3DSP_WRITEMASK_2) >> 1);
 }