January 2024 - Wine-Commits

Giovanni Mascellani : tests: Mark count buffers as buggy on MoltenVK.
by Alexandre Julliard Jan. 24, 2024

Jan. 24, 2024

Module: vkd3d Branch: master Commit: d304422a345d1437c69a1b4c99a9ed148d564ea3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d304422a345d1437c69a1b4c99a9e… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Dec 27 22:36:42 2023 +0100 tests: Mark count buffers as buggy on MoltenVK. They require Vulkan indirect draw count extension. --- tests/d3d12.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 77579c35..73253f54 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -25220,6 +25220,7 @@ static void test_execute_indirect(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + bug_if(is_mvk_device(context.device)) check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); reset_command_list(command_list, context.allocator); @@ -25317,6 +25318,7 @@ static void test_execute_indirect(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + bug_if(is_mvk_device(context.device)) check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xffffff00, 0); ID3D12PipelineState_Release(pipeline_state);

1 0

Giovanni Mascellani : tests: Mark a timestamp query test as buggy on MoltenVK.
by Alexandre Julliard Jan. 24, 2024

Jan. 24, 2024

Module: vkd3d Branch: master Commit: 5d4edba925537bf0b0b1dbb755439d09219306b9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5d4edba925537bf0b0b1dbb755439… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Dec 27 20:07:47 2023 +0100 tests: Mark a timestamp query test as buggy on MoltenVK. The generated Vulkan calls look right and do not trigger any validation error, but the returned timestamp is 0. A valid timestamp is returned if the CopyResource() call is commented, or the second EndQuery() call is moved before CopyResource(), or the first EndQuery() call is commented. I am not seeing any sensible pattern here, so I guess there is just a bug in MoltenVK. --- tests/d3d12.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index fce9d05f..77579c35 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -24848,6 +24848,7 @@ static void test_resolve_non_issued_query_data(void) "Got unexpected timestamp %#"PRIx64".\n", timestamps[0]); ok(!timestamps[1], "Got unexpected timestamp %#"PRIx64".\n", timestamps[1]); ok(!timestamps[2], "Got unexpected timestamp %#"PRIx64".\n", timestamps[2]); + bug_if(is_mvk_device(device)) ok(timestamps[3] != initial_data[3] && timestamps[3] > 0, "Got unexpected timestamp %#"PRIx64".\n", timestamps[3]); release_resource_readback(&rb);

1 0

Giovanni Mascellani : tests: Mark clip distance as unsupported on MoltenVK.
by Alexandre Julliard Jan. 24, 2024

Jan. 24, 2024

Module: vkd3d Branch: master Commit: 66cd2af1887e3abe467f91fd84229a3cb1da122b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/66cd2af1887e3abe467f91fd84229… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Dec 27 11:59:14 2023 +0100 tests: Mark clip distance as unsupported on MoltenVK. At least for tessellation and geometry shaders. --- tests/d3d12.c | 159 ++++++++++++++++++++++++++++++---------------------------- 1 file changed, 83 insertions(+), 76 deletions(-)

1 0

Giovanni Mascellani : tests: Mark cull distance as buggy on MoltenVK.
by Alexandre Julliard Jan. 24, 2024

Jan. 24, 2024

Module: vkd3d Branch: master Commit: 9a83e568b414853d2814c30835264e6e3c43749b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9a83e568b414853d2814c30835264… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Dec 27 11:55:12 2023 +0100 tests: Mark cull distance as buggy on MoltenVK. The generated MSL code is not accepted by the Metal runtime, and it looks wrong anyway. --- tests/d3d12.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 9b1ec8e3..b0a5182c 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -31973,6 +31973,13 @@ static void test_combined_clip_and_cull_distances(void) command_list = context.list; queue = context.queue; + if (is_mvk_device(device)) + { + skip("Cull distance not supported on MoltenVK.\n"); + destroy_test_context(&context); + return; + } + input_layout.pInputElementDescs = layout_desc; input_layout.NumElements = ARRAY_SIZE(layout_desc);

1 0

Giovanni Mascellani : tests: Skip unbounded descriptor ranges tests when they're unsupported.
by Alexandre Julliard Jan. 24, 2024

Jan. 24, 2024

Module: vkd3d Branch: master Commit: 60e0246436f1e1b72af4673846f8eb52010fa9e1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/60e0246436f1e1b72af4673846f8e… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Dec 26 20:42:45 2023 +0100 tests: Skip unbounded descriptor ranges tests when they're unsupported. They are unsupported if the Vulkan descriptor indexing extension is not available; on MoltenVK it is known to be buggy, so it is disabled. --- tests/d3d12.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index e6ae6c5f..9b1ec8e3 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -36861,6 +36861,12 @@ static void test_unbounded_resource_arrays(void) command_list = context.list; queue = context.queue; + if (get_resource_binding_tier(device) < D3D12_RESOURCE_BINDING_TIER_2) + { + skip("Device doesn't support resource binding tier 2.\n"); + goto done; + } + memset(&root_signature_desc, 0, sizeof(root_signature_desc)); root_signature_desc.NumParameters = ARRAY_SIZE(root_parameters); root_signature_desc.pParameters = root_parameters; @@ -37021,6 +37027,12 @@ static void test_unbounded_samplers(void) command_list = context.list; queue = context.queue; + if (get_resource_binding_tier(device) < D3D12_RESOURCE_BINDING_TIER_2) + { + skip("Device doesn't support resource binding tier 2.\n"); + goto done; + } + root_signature_desc.NumParameters = ARRAY_SIZE(root_parameters); root_signature_desc.Flags = 0; root_signature_desc.NumStaticSamplers = 0;

1 0

Giovanni Mascellani : tests: Mark loading from stencil as buggy on MoltenVK.
by Alexandre Julliard Jan. 24, 2024

Jan. 24, 2024

Module: vkd3d Branch: master Commit: 711ce4e65d083da591ce9444c57aadcccb2534b2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/711ce4e65d083da591ce9444c57aa… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Dec 26 22:32:47 2023 +0100 tests: Mark loading from stencil as buggy on MoltenVK. Specifically, MoltenVK seems to be able to load from stencil, but the specific replicating swizzle (repeating the stencil value on all the channels) is not honored. The stencil value is read only on the red channel. --- tests/d3d12.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 896a0f22..e6ae6c5f 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -21394,11 +21394,13 @@ static void test_stencil_load(void) transition_sub_resource_state(command_list, context.render_target, 0, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + bug_if(is_mvk_device(context.device)) check_sub_resource_uvec4(context.render_target, 0, queue, command_list, &uvec4); reset_command_list(command_list, context.allocator); transition_sub_resource_state(command_list, texture, 0, D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); + bug_if(is_mvk_device(context.device)) check_sub_resource_uvec4(texture, 0, queue, command_list, &uvec4); reset_command_list(command_list, context.allocator);

1 0

Conor McCarthy : vkd3d-shader/spirv: Check for FEATURE_FLOAT64 when double precision use is flagged.
by Alexandre Julliard Jan. 24, 2024

Jan. 24, 2024

Module: vkd3d Branch: master Commit: 54f6e6dd67800ee9fd58ba1585aa9e73ba60376b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/54f6e6dd67800ee9fd58ba1585aa9… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jan 23 13:00:22 2024 +1000 vkd3d-shader/spirv: Check for FEATURE_FLOAT64 when double precision use is flagged. --- libs/vkd3d-shader/spirv.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index b6dadeda..299b4e96 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2369,6 +2369,7 @@ struct spirv_compiler size_t spec_constants_size; enum vkd3d_shader_compile_option_formatting_flags formatting; enum vkd3d_shader_compile_option_feature_flags features; + enum vkd3d_shader_api_version api_version; bool write_tess_geom_point_size; struct vkd3d_string_buffer_cache string_buffers; @@ -2513,6 +2514,7 @@ static struct spirv_compiler *spirv_compiler_create(const struct vkd3d_shader_ve break; case VKD3D_SHADER_COMPILE_OPTION_API_VERSION: + compiler->api_version = option->value; break; case VKD3D_SHADER_COMPILE_OPTION_TYPED_UAV: @@ -2547,6 +2549,10 @@ static struct spirv_compiler *spirv_compiler_create(const struct vkd3d_shader_ve } } + /* Explicit enabling of float64 was not required for API versions <= 1.10. */ + if (compiler->api_version <= VKD3D_SHADER_API_VERSION_1_10) + compiler->features |= VKD3D_SHADER_COMPILE_OPTION_FEATURE_FLOAT64; + rb_init(&compiler->symbol_table, vkd3d_symbol_compare); compiler->shader_type = shader_version->type; @@ -5601,7 +5607,16 @@ static void spirv_compiler_emit_dcl_global_flags(struct spirv_compiler *compiler if (flags & (VKD3DSGF_ENABLE_DOUBLE_PRECISION_FLOAT_OPS | VKD3DSGF_ENABLE_11_1_DOUBLE_EXTENSIONS)) { - vkd3d_spirv_enable_capability(&compiler->spirv_builder, SpvCapabilityFloat64); + if (compiler->features & VKD3D_SHADER_COMPILE_OPTION_FEATURE_FLOAT64) + { + vkd3d_spirv_enable_capability(&compiler->spirv_builder, SpvCapabilityFloat64); + } + else + { + WARN("Unsupported 64-bit float ops.\n"); + spirv_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_UNSUPPORTED_FEATURE, + "The target environment does not support 64-bit floating point."); + } flags &= ~(VKD3DSGF_ENABLE_DOUBLE_PRECISION_FLOAT_OPS | VKD3DSGF_ENABLE_11_1_DOUBLE_EXTENSIONS); }

1 0

Conor McCarthy : vkd3d-shader: Introduce VKD3D_SHADER_COMPILE_OPTION_FEATURE_FLOAT64.
by Alexandre Julliard Jan. 24, 2024

Jan. 24, 2024

Module: vkd3d Branch: master Commit: 6446b6ea21568ccb92d01cc622b78f3179a8444d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6446b6ea21568ccb92d01cc622b78… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jan 23 12:59:21 2024 +1000 vkd3d-shader: Introduce VKD3D_SHADER_COMPILE_OPTION_FEATURE_FLOAT64. --- include/vkd3d_shader.h | 1 + libs/vkd3d/state.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 449b3684..a8cc3a33 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -200,6 +200,7 @@ enum vkd3d_shader_compile_option_fragment_coordinate_origin enum vkd3d_shader_compile_option_feature_flags { VKD3D_SHADER_COMPILE_OPTION_FEATURE_INT64 = 0x00000001, + VKD3D_SHADER_COMPILE_OPTION_FEATURE_FLOAT64 = 0x00000002, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPILE_OPTION_FEATURE_FLAGS), }; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 82782e7d..12a8cd54 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2154,6 +2154,8 @@ static unsigned int feature_flags_compile_option(const struct d3d12_device *devi if (device->feature_options1.Int64ShaderOps) flags |= VKD3D_SHADER_COMPILE_OPTION_FEATURE_INT64; + if (device->feature_options.DoublePrecisionFloatShaderOps) + flags |= VKD3D_SHADER_COMPILE_OPTION_FEATURE_FLOAT64; return flags; }

1 0

Conor McCarthy : vkd3d-shader/spirv: Implement the ISFINITE instruction.
by Alexandre Julliard Jan. 24, 2024

Jan. 24, 2024

Module: vkd3d Branch: master Commit: cd674d593e8c166b6e3eea9ee75b024f2ee7f259 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/cd674d593e8c166b6e3eea9ee75b0… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Jan 22 15:57:27 2024 +1000 vkd3d-shader/spirv: Implement the ISFINITE instruction. --- libs/vkd3d-shader/spirv.c | 39 +++++++++++++++++++++++++++++++++ tests/hlsl/float-comparison.shader_test | 2 +- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d511b4a1..2d632937 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1515,6 +1515,25 @@ static uint32_t vkd3d_spirv_build_op_uless_than_equal(struct vkd3d_spirv_builder SpvOpULessThanEqual, result_type, operand0, operand1); } +static uint32_t vkd3d_spirv_build_op_is_inf(struct vkd3d_spirv_builder *builder, + uint32_t result_type, uint32_t operand) +{ + return vkd3d_spirv_build_op_tr1(builder, &builder->function_stream, SpvOpIsInf, result_type, operand); +} + +static uint32_t vkd3d_spirv_build_op_is_nan(struct vkd3d_spirv_builder *builder, + uint32_t result_type, uint32_t operand) +{ + return vkd3d_spirv_build_op_tr1(builder, &builder->function_stream, SpvOpIsNan, result_type, operand); +} + +static uint32_t vkd3d_spirv_build_op_logical_equal(struct vkd3d_spirv_builder *builder, + uint32_t result_type, uint32_t operand0, uint32_t operand1) +{ + return vkd3d_spirv_build_op_tr2(builder, &builder->function_stream, + SpvOpLogicalEqual, result_type, operand0, operand1); +} + static uint32_t vkd3d_spirv_build_op_convert_utof(struct vkd3d_spirv_builder *builder, uint32_t result_type, uint32_t unsigned_value) { @@ -6896,6 +6915,23 @@ static enum vkd3d_result spirv_compiler_emit_alu_instruction(struct spirv_compil return VKD3D_OK; } +static void spirv_compiler_emit_isfinite(struct spirv_compiler *compiler, + const struct vkd3d_shader_instruction *instruction) +{ + 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; + uint32_t type_id, src_id, isinf_id, isnan_id, val_id; + + type_id = spirv_compiler_get_type_id_for_dst(compiler, dst); + src_id = spirv_compiler_emit_load_src(compiler, src, dst->write_mask); + /* OpIsFinite is only available in Kernel mode. */ + isinf_id = vkd3d_spirv_build_op_is_inf(builder, type_id, src_id); + isnan_id = vkd3d_spirv_build_op_is_nan(builder, type_id, src_id); + val_id = vkd3d_spirv_build_op_logical_equal(builder, type_id, isinf_id, isnan_id); + spirv_compiler_emit_store_dst(compiler, dst, val_id); +} + static enum GLSLstd450 spirv_compiler_map_ext_glsl_instruction( const struct vkd3d_shader_instruction *instruction) { @@ -9465,6 +9501,9 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, case VKD3DSIH_XOR: ret = spirv_compiler_emit_alu_instruction(compiler, instruction); break; + case VKD3DSIH_ISFINITE: + spirv_compiler_emit_isfinite(compiler, instruction); + break; case VKD3DSIH_DFMA: case VKD3DSIH_DMAX: case VKD3DSIH_DMIN: diff --git a/tests/hlsl/float-comparison.shader_test b/tests/hlsl/float-comparison.shader_test index 9bbd493f..9cab3442 100644 --- a/tests/hlsl/float-comparison.shader_test +++ b/tests/hlsl/float-comparison.shader_test @@ -92,5 +92,5 @@ float4 main() : sv_target [test] uniform 0 float4 1.5 0.0 1.0 -1.0 -todo draw quad +draw quad probe all rgba (0.0, 0.0, 1.0, 0.0)

1 0

Conor McCarthy : vkd3d-shader/spirv: Handle the ISINF and ISNAN instructions in spirv_compiler_emit_alu_instruction().
by Alexandre Julliard Jan. 24, 2024

Jan. 24, 2024

Module: vkd3d Branch: master Commit: e973271a40676c19f2b842befdc9f15c593fe8ef URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e973271a40676c19f2b842befdc9f… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Jan 22 15:59:22 2024 +1000 vkd3d-shader/spirv: Handle the ISINF and ISNAN instructions in spirv_compiler_emit_alu_instruction(). --- libs/vkd3d-shader/spirv.c | 4 ++++ tests/hlsl/float-comparison.shader_test | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 2d632937..b6dadeda 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6768,6 +6768,8 @@ static SpvOp spirv_compiler_map_alu_instruction(const struct vkd3d_shader_instru {VKD3DSIH_INEG, SpvOpSNegate}, {VKD3DSIH_ISHL, SpvOpShiftLeftLogical}, {VKD3DSIH_ISHR, SpvOpShiftRightArithmetic}, + {VKD3DSIH_ISINF, SpvOpIsInf}, + {VKD3DSIH_ISNAN, SpvOpIsNan}, {VKD3DSIH_ITOD, SpvOpConvertSToF}, {VKD3DSIH_ITOF, SpvOpConvertSToF}, {VKD3DSIH_ITOI, SpvOpSConvert}, @@ -9488,6 +9490,8 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, case VKD3DSIH_INEG: case VKD3DSIH_ISHL: case VKD3DSIH_ISHR: + case VKD3DSIH_ISINF: + case VKD3DSIH_ISNAN: case VKD3DSIH_ITOD: case VKD3DSIH_ITOF: case VKD3DSIH_ITOI: diff --git a/tests/hlsl/float-comparison.shader_test b/tests/hlsl/float-comparison.shader_test index 9cab3442..b6654344 100644 --- a/tests/hlsl/float-comparison.shader_test +++ b/tests/hlsl/float-comparison.shader_test @@ -78,7 +78,7 @@ float4 main() : sv_target [test] uniform 0 float4 1.5 0.0 1.0 -1.0 -todo draw quad +draw quad probe all rgba (1.0, 1.0, 0.0, 0.0)

1 0