January 2024 - Wine-commits

Giovanni Mascellani : tests: Mark a strip cut test as buggy in MoltenVK.
by Alexandre Julliard 25 Jan '24

25 Jan '24

Module: vkd3d Branch: master Commit: fd7d23f64bc8c33fe3b59431219e14c0865be37a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fd7d23f64bc8c33fe3b59431219e1… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jan 5 16:12:40 2024 +0100 tests: Mark a strip cut test as buggy in MoltenVK. Metal, and therefore MoltenVK, doesn't support disabling primitive restart. --- tests/d3d12.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 46d8bad7..9a853296 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -33741,11 +33741,14 @@ static void test_primitive_restart(void) unsigned int last_index; bool full_quad; bool is_todo; + bool is_mvk_bug; } tests[] = { {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_DISABLED, DXGI_FORMAT_R16_UINT, indices16, sizeof(indices16), 0x0003, true}, - {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_DISABLED, DXGI_FORMAT_R16_UINT, indices16_max, sizeof(indices16_max), 0xffff, true}, + /* Metal, and therefore MoltenVK, doesn't support disabling + * primitive restart. */ + {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_DISABLED, DXGI_FORMAT_R16_UINT, indices16_max, sizeof(indices16_max), 0xffff, true, false, true}, {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_DISABLED, DXGI_FORMAT_R32_UINT, indices, sizeof(indices), 0x0003, true}, {D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_DISABLED, DXGI_FORMAT_R32_UINT, indices_max16, sizeof(indices_max16), 0xffff, true}, @@ -33821,6 +33824,7 @@ static void test_primitive_restart(void) get_resource_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); if (tests[i].full_quad) { + bug_if(is_mvk_device(context.device) && tests[i].is_mvk_bug) todo_if(tests[i].is_todo) check_readback_data_uint(&rb.rb, NULL, 0xff00ff00, 0); }

1 0

Francisco Casas : vkd3d-shader/ir: Update flatten_control_flow_constructs() comment.
by Alexandre Julliard 25 Jan '24

25 Jan '24

Module: vkd3d Branch: master Commit: cec45da45b411954d42b892a9729f905b28c715c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/cec45da45b411954d42b892a9729f… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Jan 24 17:25:38 2024 -0300 vkd3d-shader/ir: Update flatten_control_flow_constructs() comment. --- libs/vkd3d-shader/ir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 45ccea45..9079be48 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -2343,7 +2343,7 @@ static enum vkd3d_result flatten_control_flow_constructs(struct vkd3d_shader_par } vkd3d_free(flattener.control_flow_info); - /* Simpler to always free these in free_shader_desc(). */ + /* Simpler to always free these in vsir_program_cleanup(). */ program->block_names = flattener.block_names; program->block_name_count = flattener.block_name_count;

1 0

Francisco Casas : tests/shader_runner: Pass a pointer to the data when creating uav buffers in d3d12.
by Alexandre Julliard 25 Jan '24

25 Jan '24

Module: vkd3d Branch: master Commit: 8f9b48c4550d8644cf22342ac063258ab7616bee URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8f9b48c4550d8644cf22342ac0632… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Jan 24 17:49:22 2024 -0300 tests/shader_runner: Pass a pointer to the data when creating uav buffers in d3d12. The implementation of upload_buffer_data_with_states(), unlike the implementation of upload_texture_data_with_states(), does not expect a pointer to a D3D12_SUBRESOURCE_DATA, but rather, a direct pointer to the data. --- tests/shader_runner_d3d12.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index c151b85b..c6154cd1 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -205,7 +205,7 @@ static struct resource *d3d12_runner_create_resource(struct shader_runner *r, co resource->resource = create_default_buffer(device, params->data_size, D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); - upload_buffer_data_with_states(resource->resource, 0, params->data_size, resource_data, + upload_buffer_data_with_states(resource->resource, 0, params->data_size, resource_data[0].pData, test_context->queue, test_context->list, RESOURCE_STATE_DO_NOT_CHANGE, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); reset_command_list(test_context->list, test_context->allocator);

1 0

Francisco Casas : tests/shader_runner: Free params.data on test directives (valgrind).
by Alexandre Julliard 25 Jan '24

25 Jan '24

Module: vkd3d Branch: master Commit: 969350a280147b8cd01bb35548e2c51f9c54f709 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/969350a280147b8cd01bb35548e2c… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Jan 24 18:50:30 2024 -0300 tests/shader_runner: Free params.data on test directives (valgrind). --- tests/shader_runner.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 250aaa5a..214053ef 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -713,6 +713,7 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) memcpy(params.data, quad, sizeof(quad)); params.data_size = sizeof(quad); set_resource(runner, runner->ops->create_resource(runner, &params)); + free(params.data); if (!runner->vs_source) runner->vs_source = strdup(vs_source);

1 0

Francisco Casas : tests/shader_runner: Free runner->uniforms (valgrind).
by Alexandre Julliard 25 Jan '24

25 Jan '24

Module: vkd3d Branch: master Commit: 48e61fa32393cd1a098289df6898d35d23488bf1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/48e61fa32393cd1a098289df6898d… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Jan 24 18:53:35 2024 -0300 tests/shader_runner: Free runner->uniforms (valgrind). --- tests/shader_runner.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 214053ef..00f13fec 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -1610,6 +1610,7 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_o free(runner->input_elements); free(runner->vs_source); free(runner->ps_source); + free(runner->uniforms); for (i = 0; i < runner->resource_count; ++i) { if (runner->resources[i])

1 0

Francisco Casas : tests/shader_runner: Free extensions pointer on vulkan runner (valgrind).
by Alexandre Julliard 25 Jan '24

25 Jan '24

Module: vkd3d Branch: master Commit: 8379e5337cbbef6d468baafa2f42c8a6ce0bf074 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8379e5337cbbef6d468baafa2f42c… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Jan 24 19:01:36 2024 -0300 tests/shader_runner: Free extensions pointer on vulkan runner (valgrind). --- tests/shader_runner_vulkan.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/shader_runner_vulkan.c b/tests/shader_runner_vulkan.c index e1271e75..0aa61107 100644 --- a/tests/shader_runner_vulkan.c +++ b/tests/shader_runner_vulkan.c @@ -1252,10 +1252,12 @@ static bool check_device_extensions(struct vulkan_shader_runner *runner) if (!has_extension(extensions, count, required_device_extensions[i])) { skip("The selected Vulkan device does not support %s.\n", required_device_extensions[i]); + free(extensions); return false; } } + free(extensions); return true; }

1 0

Francisco Casas : tests/shader_runner: Free runner->input_elements in parse_test_directive() (valgrind).
by Alexandre Julliard 25 Jan '24

25 Jan '24

Module: vkd3d Branch: master Commit: 70e1924e6e0563d0cd81ad7a5a319424522610cd URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/70e1924e6e0563d0cd81ad7a5a319… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Jan 24 19:44:47 2024 -0300 tests/shader_runner: Free runner->input_elements in parse_test_directive() (valgrind). --- tests/shader_runner.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 00f13fec..5b141100 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -666,6 +666,7 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) { struct resource_params params; struct input_element *element; + unsigned int i; /* For simplicity, draw a large triangle instead. */ static const struct vec2 quad[] = @@ -696,6 +697,9 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) set_resource(runner, runner->ops->create_resource(runner, &params)); } + for (i = 0; i < runner->input_element_count; ++i) + free(runner->input_elements[i].name); + vkd3d_array_reserve((void **)&runner->input_elements, &runner->input_element_capacity, 1, sizeof(*runner->input_elements)); element = &runner->input_elements[0];

1 0

Francisco Casas : tests/shader_runner: Free runner->cs_source and runner->fx_source (valgrind).
by Alexandre Julliard 25 Jan '24

25 Jan '24

Module: vkd3d Branch: master Commit: d7ffdd7340f37b2bd429d6e4dff2eb75dc924880 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d7ffdd7340f37b2bd429d6e4dff2e… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Jan 24 20:21:49 2024 -0300 tests/shader_runner: Free runner->cs_source and runner->fx_source (valgrind). --- tests/shader_runner.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 5b141100..6c5c1dba 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -1614,6 +1614,8 @@ void run_shader_tests(struct shader_runner *runner, const struct shader_runner_o free(runner->input_elements); free(runner->vs_source); free(runner->ps_source); + free(runner->cs_source); + free(runner->fx_source); free(runner->uniforms); for (i = 0; i < runner->resource_count; ++i) {

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement DX intrinsics Cos and Sin.
by Alexandre Julliard 25 Jan '24

25 Jan '24

Module: vkd3d Branch: master Commit: 2a260b8d5660b3e2ffff77708a48719e86084ac0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2a260b8d5660b3e2ffff77708a487… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Jun 14 23:11:21 2023 +1000 vkd3d-shader/dxil: Implement DX intrinsics Cos and Sin. --- libs/vkd3d-shader/dxil.c | 26 ++++++++++++++++++++++++++ tests/hlsl/trigonometry.shader_test | 4 ++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index c089d132..de311d08 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -331,6 +331,8 @@ enum dx_intrinsic_opcode DX_ISNAN = 8, DX_ISINF = 9, DX_ISFINITE = 10, + DX_COS = 12, + DX_SIN = 13, DX_EXP = 21, DX_FRC = 22, DX_LOG = 23, @@ -3752,6 +3754,28 @@ static void sm6_parser_emit_dx_buffer_load(struct sm6_parser *sm6, enum dx_intri instruction_dst_param_init_ssa_vector(ins, VKD3D_VEC4_SIZE, sm6); } +static void sm6_parser_emit_dx_sincos(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, + const struct sm6_value **operands, struct function_emission_state *state) +{ + struct sm6_value *dst = sm6_parser_get_current_value(sm6); + struct vkd3d_shader_instruction *ins = state->ins; + struct vkd3d_shader_dst_param *dst_params; + struct vkd3d_shader_src_param *src_param; + unsigned int index; + + vsir_instruction_init(ins, &sm6->p.location, VKD3DSIH_SINCOS); + src_param = instruction_src_params_alloc(ins, 1, sm6); + src_param_init_from_value(src_param, operands[0]); + + index = op == DX_COS; + dst_params = instruction_dst_params_alloc(ins, 2, sm6); + dst_param_init(&dst_params[0]); + dst_param_init(&dst_params[1]); + register_init_ssa_scalar(&dst_params[index].reg, dst->type, sm6); + vsir_register_init(&dst_params[index ^ 1].reg, VKD3DSPR_NULL, VKD3D_DATA_UNUSED, 0); + dst->u.reg = dst_params[index].reg; +} + static void sm6_parser_emit_dx_store_output(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, const struct sm6_value **operands, struct function_emission_state *state) { @@ -3834,6 +3858,7 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_BFREV ] = {"m", "R", sm6_parser_emit_dx_unary}, [DX_BUFFER_LOAD ] = {"o", "Hii", sm6_parser_emit_dx_buffer_load}, [DX_CBUFFER_LOAD_LEGACY ] = {"o", "Hi", sm6_parser_emit_dx_cbuffer_load}, + [DX_COS ] = {"g", "R", sm6_parser_emit_dx_sincos}, [DX_COUNT_BITS ] = {"i", "m", sm6_parser_emit_dx_unary}, [DX_CREATE_HANDLE ] = {"H", "ccib", sm6_parser_emit_dx_create_handle}, [DX_DERIV_COARSEX ] = {"e", "R", sm6_parser_emit_dx_unary}, @@ -3861,6 +3886,7 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_ROUND_PI ] = {"g", "R", sm6_parser_emit_dx_unary}, [DX_ROUND_Z ] = {"g", "R", sm6_parser_emit_dx_unary}, [DX_RSQRT ] = {"g", "R", sm6_parser_emit_dx_unary}, + [DX_SIN ] = {"g", "R", sm6_parser_emit_dx_sincos}, [DX_SQRT ] = {"g", "R", sm6_parser_emit_dx_unary}, [DX_STORE_OUTPUT ] = {"v", "ii8o", sm6_parser_emit_dx_store_output}, [DX_UMAX ] = {"m", "RR", sm6_parser_emit_dx_binary}, diff --git a/tests/hlsl/trigonometry.shader_test b/tests/hlsl/trigonometry.shader_test index 5d230d7c..7f95a99f 100644 --- a/tests/hlsl/trigonometry.shader_test +++ b/tests/hlsl/trigonometry.shader_test @@ -42,7 +42,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.0 0.52359877 2.61799387 3.14159265 -todo(sm<4 | sm>=6) draw quad +todo(sm<4) draw quad probe all rgba (0.0, 500.0, 500.0, 0.0) @@ -56,7 +56,7 @@ float4 main() : sv_target [test] uniform 0 float4 0.0 0.78539816 1.57079632 2.35619449 -todo(sm<4 | sm>=6) draw quad +todo(sm<4) draw quad probe all rgba (1000.0, 707.0, -0.0, -707.0)

1 0

Conor McCarthy : vkd3d-shader/dxil: Handle DX intrinsic Tan in sm6_parser_emit_dx_unary().
by Alexandre Julliard 25 Jan '24

25 Jan '24

Module: vkd3d Branch: master Commit: 93d7c30395da1afd307b089430732d19146cf39c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/93d7c30395da1afd307b089430732… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Jan 22 15:32:22 2024 +1000 vkd3d-shader/dxil: Handle DX intrinsic Tan in sm6_parser_emit_dx_unary(). --- libs/vkd3d-shader/d3d_asm.c | 1 + libs/vkd3d-shader/dxil.c | 4 ++++ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 3 files changed, 6 insertions(+) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index 7f67be8c..af939396 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -285,6 +285,7 @@ static const char * const shader_opcode_names[] = [VKD3DSIH_SWITCH ] = "switch", [VKD3DSIH_SWITCH_MONOLITHIC ] = "switch", [VKD3DSIH_SYNC ] = "sync", + [VKD3DSIH_TAN ] = "tan", [VKD3DSIH_TEX ] = "texld", [VKD3DSIH_TEXBEM ] = "texbem", [VKD3DSIH_TEXBEML ] = "texbeml", diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index de311d08..8a31d03c 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -333,6 +333,7 @@ enum dx_intrinsic_opcode DX_ISFINITE = 10, DX_COS = 12, DX_SIN = 13, + DX_TAN = 14, DX_EXP = 21, DX_FRC = 22, DX_LOG = 23, @@ -3505,6 +3506,8 @@ static enum vkd3d_shader_opcode map_dx_unary_op(enum dx_intrinsic_opcode op) return VKD3DSIH_ISINF; case DX_ISFINITE: return VKD3DSIH_ISFINITE; + case DX_TAN: + return VKD3DSIH_TAN; case DX_EXP: return VKD3DSIH_EXP; case DX_FRC: @@ -3889,6 +3892,7 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_SIN ] = {"g", "R", sm6_parser_emit_dx_sincos}, [DX_SQRT ] = {"g", "R", sm6_parser_emit_dx_unary}, [DX_STORE_OUTPUT ] = {"v", "ii8o", sm6_parser_emit_dx_store_output}, + [DX_TAN ] = {"g", "R", sm6_parser_emit_dx_unary}, [DX_UMAX ] = {"m", "RR", sm6_parser_emit_dx_binary}, [DX_UMIN ] = {"m", "RR", sm6_parser_emit_dx_binary}, }; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index b16a69f0..28862884 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -480,6 +480,7 @@ enum vkd3d_shader_opcode VKD3DSIH_SWITCH, VKD3DSIH_SWITCH_MONOLITHIC, VKD3DSIH_SYNC, + VKD3DSIH_TAN, VKD3DSIH_TEX, VKD3DSIH_TEXBEM, VKD3DSIH_TEXBEML,

1 0