[PATCH v4 0/3] MR531: Draft: vkd3d: Assorted fixes for MoltenVK.

[Giovanni Mascellani (＠giomasce)]

--
  v4: vkd3d-shader/spirv: Specify behavior for bit field instructions.
      tests: Use a uint target for rendering uint data.
      vkd3d: Specify the aspect when creating NULL UAVs.

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

[PATCH v4 1/3] vkd3d: Specify the aspect when creating NULL UAVs.

[Giovanni Mascellani]

From: Giovanni Mascellani

This fixes a crash on MoltenVK.
---
 libs/vkd3d/resource.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c
index 609c67102..356c2f099 100644
--- a/libs/vkd3d/resource.c
+++ b/libs/vkd3d/resource.c
@@ -3444,6 +3444,7 @@ static void vkd3d_create_null_uav(struct d3d12_desc *descriptor,
     vkd3d_desc.miplevel_count = 1;
     vkd3d_desc.layer_idx = 0;
     vkd3d_desc.layer_count = 1;
+    vkd3d_desc.vk_image_aspect = VK_IMAGE_ASPECT_COLOR_BIT;
     vkd3d_desc.components.r = VK_COMPONENT_SWIZZLE_R;
     vkd3d_desc.components.g = VK_COMPONENT_SWIZZLE_G;
     vkd3d_desc.components.b = VK_COMPONENT_SWIZZLE_B;

[PATCH v4 2/3] tests: Use a uint target for rendering uint data.

[Giovanni Mascellani]

From: Giovanni Mascellani

This fixes a failure in MoltenVK.
---
 tests/d3d12.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/d3d12.c b/tests/d3d12.c
index 1126d9749..3324eef80 100644
--- a/tests/d3d12.c
+++ b/tests/d3d12.c
@@ -35376,7 +35376,7 @@ static void test_bufinfo_instruction(void)

memset(&desc, 0, sizeof(desc));
     desc.rt_width = desc.rt_height = 64;
-    desc.rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT;
+    desc.rt_format = DXGI_FORMAT_R32G32B32A32_UINT;
     desc.no_root_signature = true;
     desc.no_pipeline = true;
     if (!init_test_context(&context, &desc))

[PATCH v4 3/3] vkd3d-shader/spirv: Specify behavior for bit field instructions.

[Giovanni Mascellani]

From: Giovanni Mascellani

Bit field instructions in SPIR-V do not specify what happens when
offset + count exceeds the type bit width. After this commit we
refine the emitted code's behavior to match TPF.

This fixes a few failures on MoltenVK.
---
 libs/vkd3d-shader/spirv.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index 45f46a91c..0e961293c 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -1764,6 +1764,15 @@ static uint32_t vkd3d_spirv_build_op_glsl_std450_max(struct vkd3d_spirv_builder
             GLSLstd450NMax, operands, ARRAY_SIZE(operands));
 }

+static uint32_t vkd3d_spirv_build_op_glsl_std450_umin(struct vkd3d_spirv_builder *builder,
+        uint32_t result_type, uint32_t x, uint32_t y)
+{
+    uint32_t glsl_std450_id = vkd3d_spirv_get_glsl_std450_instr_set(builder);
+    uint32_t operands[] = {x, y};
+    return vkd3d_spirv_build_op_ext_inst(builder, result_type, glsl_std450_id,
+            GLSLstd450UMin, operands, ARRAY_SIZE(operands));
+}
+
 static uint32_t vkd3d_spirv_build_op_glsl_std450_nclamp(struct vkd3d_spirv_builder *builder,
         uint32_t result_type, uint32_t x, uint32_t min, uint32_t max)
 {
@@ -7321,7 +7330,7 @@ static void spirv_compiler_emit_ftou(struct spirv_compiler *compiler,
 static void spirv_compiler_emit_bitfield_instruction(struct spirv_compiler *compiler,
         const struct vkd3d_shader_instruction *instruction)
 {
-    uint32_t src_ids[4], constituents[VKD3D_VEC4_SIZE], type_id, mask_id;
+    uint32_t src_ids[4], constituents[VKD3D_VEC4_SIZE], type_id, mask_id, size_id, max_count_id;
     struct vkd3d_spirv_builder *builder = &compiler->spirv_builder;
     const struct vkd3d_shader_dst_param *dst = instruction->dst;
     const struct vkd3d_shader_src_param *src = instruction->src;
@@ -7336,6 +7345,7 @@ static void spirv_compiler_emit_bitfield_instruction(struct spirv_compiler *comp
     component_type = vkd3d_component_type_from_data_type(dst->reg.data_type);
     type_id = vkd3d_spirv_get_type_id(builder, component_type, 1);
     mask_id = spirv_compiler_get_constant_uint(compiler, 0x1f);
+    size_id = spirv_compiler_get_constant_uint(compiler, 0x20);

switch (instruction->handler_idx)
     {
@@ -7364,6 +7374,9 @@ static void spirv_compiler_emit_bitfield_instruction(struct spirv_compiler *comp
         {
             src_ids[j] = vkd3d_spirv_build_op_and(builder, type_id, src_ids[j], mask_id);
         }
+        max_count_id = vkd3d_spirv_build_op_isub(builder, type_id, size_id, src_ids[src_count - 2]);
+        src_ids[src_count - 1] = vkd3d_spirv_build_op_glsl_std450_umin(builder, type_id,
+                src_ids[src_count - 1], max_count_id);

constituents[k++] = vkd3d_spirv_build_op_trv(builder, &builder->function_stream,
                 op, type_id, src_ids, src_count);