[PATCH 0/3] MR493: vkd3d: Clang warning fixes

[Jacek Caban (＠jacek)]

This MR fixes remaining Clang warnings related to enums for vkd3d in Wine tree, both in mingw and msvc mode.

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

[PATCH 1/3] vkd3d: Use VkPipelineStageFlags type for VkSubmitInfo.pWaitDstStageMask flags.

[Jacek Caban]

From: Jacek Caban <jacek(a)codeweavers.com>

---
 libs/vkd3d/command.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c
index 77d0f2751..15c8317b1 100644
--- a/libs/vkd3d/command.c
+++ b/libs/vkd3d/command.c
@@ -6852,7 +6852,7 @@ fail:
 static HRESULT d3d12_command_queue_wait_binary_semaphore_locked(struct d3d12_command_queue *command_queue,
         struct d3d12_fence *fence, uint64_t value)
 {
-    static const VkPipelineStageFlagBits wait_stage_mask = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT;
+    static const VkPipelineStageFlags wait_stage_mask = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT;
     const struct vkd3d_vk_device_procs *vk_procs;
     struct vkd3d_signaled_semaphore *semaphore;
     uint64_t completed_value = 0;
@@ -6948,7 +6948,7 @@ fail:
 static HRESULT d3d12_command_queue_wait_locked(struct d3d12_command_queue *command_queue,
         struct d3d12_fence *fence, uint64_t value)
 {
-    static const VkPipelineStageFlagBits wait_stage_mask = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT;
+    static const VkPipelineStageFlags wait_stage_mask = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT;
     VkTimelineSemaphoreSubmitInfoKHR timeline_submit_info;
     const struct vkd3d_vk_device_procs *vk_procs;
     struct vkd3d_queue *queue;
-- 
GitLab


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

[PATCH 2/3] vkd3d-shader: Use unsigned int type for tags passed to sm6_metadata_get_uint_value.

[Jacek Caban]

From: Jacek Caban <jacek(a)codeweavers.com>

---
 libs/vkd3d-shader/dxil.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c
index ca7e0e723..17c9082a8 100644
--- a/libs/vkd3d-shader/dxil.c
+++ b/libs/vkd3d-shader/dxil.c
@@ -4498,8 +4498,7 @@ static enum vkd3d_result sm6_parser_resources_init(struct sm6_parser *sm6)
 static void signature_element_read_additional_element_values(struct signature_element *e,
         const struct sm6_metadata_node *node, struct sm6_parser *sm6)
 {
-    unsigned int i, operand_count, value;
-    enum dxil_element_additional_tag tag;
+    unsigned int i, operand_count, value, tag;
 
     if (node->operand_count < 11 || !node->operands[10])
         return;
@@ -4857,8 +4856,7 @@ static enum vkd3d_result sm6_parser_entry_point_init(struct sm6_parser *sm6)
 {
     const struct sm6_metadata_value *m = sm6_parser_find_named_metadata(sm6, "dx.entryPoints");
     const struct sm6_metadata_node *node, *entry_node = m ? m->u.node : NULL;
-    enum dxil_shader_properties_tag tag;
-    unsigned int i, operand_count;
+    unsigned int i, operand_count, tag;
     const struct sm6_value *value;
     enum vkd3d_result ret;
 
-- 
GitLab


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

[PATCH 3/3] vkd3d-shader: Avoid implicit enum pointer casts in allocate_semantic_register.

[Jacek Caban]

From: Jacek Caban <jacek(a)codeweavers.com>

---
 libs/vkd3d-shader/hlsl_codegen.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c
index 5a70878bc..294a8156b 100644
--- a/libs/vkd3d-shader/hlsl_codegen.c
+++ b/libs/vkd3d-shader/hlsl_codegen.c
@@ -4089,7 +4089,7 @@ static void allocate_semantic_register(struct hlsl_ctx *ctx, struct hlsl_ir_var
         [VKD3D_SHADER_TYPE_COMPUTE] = "Compute",
     };
 
-    unsigned int type;
+    enum vkd3d_shader_register_type type;
     uint32_t reg;
     bool builtin;
 
@@ -4097,6 +4097,7 @@ static void allocate_semantic_register(struct hlsl_ctx *ctx, struct hlsl_ir_var
 
     if (ctx->profile->major_version < 4)
     {
+        D3DSHADER_PARAM_REGISTER_TYPE sm1_type;
         D3DDECLUSAGE usage;
         uint32_t usage_idx;
 
@@ -4104,7 +4105,7 @@ static void allocate_semantic_register(struct hlsl_ctx *ctx, struct hlsl_ir_var
         if (ctx->profile->major_version == 1 && output && ctx->profile->type == VKD3D_SHADER_TYPE_PIXEL)
             return;
 
-        builtin = hlsl_sm1_register_from_semantic(ctx, &var->semantic, output, &type, ®);
+        builtin = hlsl_sm1_register_from_semantic(ctx, &var->semantic, output, &sm1_type, ®);
         if (!builtin && !hlsl_sm1_usage_from_semantic(&var->semantic, &usage, &usage_idx))
         {
             hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SEMANTIC,
@@ -4114,6 +4115,7 @@ static void allocate_semantic_register(struct hlsl_ctx *ctx, struct hlsl_ir_var
 
         if ((!output && !var->last_read) || (output && !var->first_write))
             return;
+        type = (enum vkd3d_shader_register_type)sm1_type;
     }
     else
     {
-- 
GitLab

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

[Giovanni Mascellani (＠giomasce)]

I think you should be able to remove `-Wno-enum-conversion` from `gitlab/build-mac`. I guess `-Wno-implicit-fallthrough` is still needed, though.

-- 
https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/493#note_53895