January 2024 - Wine-Commits

Henri Verbeet : vkd3d: Use vkd3d_atomic_increment_u32() in d3d12_command_allocator_AddRef().
by Alexandre Julliard Jan. 25, 2024

Jan. 25, 2024

Module: vkd3d Branch: master Commit: 315fce8ac5f13db7d9c0e36c89d2a51be26931ca URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/315fce8ac5f13db7d9c0e36c89d2a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 11 20:50:07 2024 +0100 vkd3d: Use vkd3d_atomic_increment_u32() in d3d12_command_allocator_AddRef(). --- libs/vkd3d/command.c | 4 ++-- libs/vkd3d/vkd3d_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index d4af9d01..f6d405f8 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1635,7 +1635,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_allocator_QueryInterface(ID3D12Co static ULONG STDMETHODCALLTYPE d3d12_command_allocator_AddRef(ID3D12CommandAllocator *iface) { struct d3d12_command_allocator *allocator = impl_from_ID3D12CommandAllocator(iface); - ULONG refcount = InterlockedIncrement(&allocator->refcount); + unsigned int refcount = vkd3d_atomic_increment_u32(&allocator->refcount); TRACE("%p increasing refcount to %u.\n", allocator, refcount); @@ -1645,7 +1645,7 @@ static ULONG STDMETHODCALLTYPE d3d12_command_allocator_AddRef(ID3D12CommandAlloc static ULONG STDMETHODCALLTYPE d3d12_command_allocator_Release(ID3D12CommandAllocator *iface) { struct d3d12_command_allocator *allocator = impl_from_ID3D12CommandAllocator(iface); - ULONG refcount = InterlockedDecrement(&allocator->refcount); + unsigned int refcount = InterlockedDecrement((LONG *)&allocator->refcount); TRACE("%p decreasing refcount to %u.\n", allocator, refcount); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 56b43052..709b969f 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1365,7 +1365,7 @@ struct vkd3d_buffer struct d3d12_command_allocator { ID3D12CommandAllocator ID3D12CommandAllocator_iface; - LONG refcount; + unsigned int refcount; D3D12_COMMAND_LIST_TYPE type; VkQueueFlags vk_queue_flags;

1 0

Henri Verbeet : vkd3d: Use vkd3d_atomic_decrement_u32() in d3d12_fence_Release().
by Alexandre Julliard Jan. 25, 2024

Jan. 25, 2024

Module: vkd3d Branch: master Commit: 1b4f1ac8a05765512d29d692746d690d4a11bfc4 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1b4f1ac8a05765512d29d692746d6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 11 20:24:17 2024 +0100 vkd3d: Use vkd3d_atomic_decrement_u32() in d3d12_fence_Release(). --- libs/vkd3d/command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 77621009..5df15b64 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -941,7 +941,7 @@ static void d3d12_fence_incref(struct d3d12_fence *fence) static ULONG STDMETHODCALLTYPE d3d12_fence_Release(ID3D12Fence1 *iface) { struct d3d12_fence *fence = impl_from_ID3D12Fence1(iface); - ULONG refcount = InterlockedDecrement((LONG *)&fence->refcount); + unsigned int refcount = vkd3d_atomic_decrement_u32(&fence->refcount); TRACE("%p decreasing refcount to %u.\n", fence, refcount);

1 0

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

Jan. 25, 2024

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

Henri Verbeet : vkd3d-shader: Start an if-block on VKD3DSIH_IFC in vkd3d_shader_scan_instruction().
by Alexandre Julliard Jan. 25, 2024

Jan. 25, 2024

Module: vkd3d Branch: master Commit: fee3b94563eb549426829c5c685089dad4328a56 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fee3b94563eb549426829c5c68508… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 23 19:18:28 2024 +0100 vkd3d-shader: Start an if-block on VKD3DSIH_IFC in vkd3d_shader_scan_instruction(). --- libs/vkd3d-shader/vkd3d_shader_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 9b7d5d22..ac13be89 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1137,6 +1137,7 @@ static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *conte instruction->declaration.structured_resource.byte_stride, false, instruction->flags); break; case VKD3DSIH_IF: + case VKD3DSIH_IFC: cf_info = vkd3d_shader_scan_push_cf_info(context); cf_info->type = VKD3D_SHADER_BLOCK_IF; cf_info->inside_block = true;

1 0

Conor McCarthy : vkd3d-shader/spirv: Handle the TAN instruction in spirv_compiler_emit_ext_glsl_instruction().
by Alexandre Julliard Jan. 25, 2024

Jan. 25, 2024

Module: vkd3d Branch: master Commit: f954724870e5e7e5329f69772b779f21a3d56a43 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f954724870e5e7e5329f69772b779… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Jan 22 16:03:02 2024 +1000 vkd3d-shader/spirv: Handle the TAN instruction in spirv_compiler_emit_ext_glsl_instruction(). --- libs/vkd3d-shader/spirv.c | 2 ++ tests/hlsl/trigonometry.shader_test | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 185b93c0..6821a78f 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6982,6 +6982,7 @@ static enum GLSLstd450 spirv_compiler_map_ext_glsl_instruction( {VKD3DSIH_ROUND_Z, GLSLstd450Trunc}, {VKD3DSIH_RSQ, GLSLstd450InverseSqrt}, {VKD3DSIH_SQRT, GLSLstd450Sqrt}, + {VKD3DSIH_TAN, GLSLstd450Tan}, {VKD3DSIH_UMAX, GLSLstd450UMax}, {VKD3DSIH_UMIN, GLSLstd450UMin}, }; @@ -9555,6 +9556,7 @@ static int spirv_compiler_handle_instruction(struct spirv_compiler *compiler, case VKD3DSIH_ROUND_Z: case VKD3DSIH_RSQ: case VKD3DSIH_SQRT: + case VKD3DSIH_TAN: case VKD3DSIH_UMAX: case VKD3DSIH_UMIN: spirv_compiler_emit_ext_glsl_instruction(compiler, instruction); diff --git a/tests/hlsl/trigonometry.shader_test b/tests/hlsl/trigonometry.shader_test index 7f95a99f..90eac333 100644 --- a/tests/hlsl/trigonometry.shader_test +++ b/tests/hlsl/trigonometry.shader_test @@ -13,7 +13,7 @@ float4 main(float tex : texcoord) : sv_target } [test] -todo(sm<4 | sm>=6) draw quad +todo(sm<4) draw quad probe ( 0, 0) rgba ( 0.00000000, 1.00000000, 0.00000000, 0.0) probe ( 1, 0) rgba ( 0.84147098, 0.54030231, 1.55740772, 0.0) 1024 probe ( 2, 0) rgba ( 0.90929743, -0.41614684, -2.18503986, 0.0) 1024 @@ -72,5 +72,5 @@ float4 main() : sv_target % tan(pi/2) is an asymtote and therefore undefined % so check 0, pi/4, 3pi/4, pi uniform 0 float4 0.0 0.78539816 2.35619449 3.14159265 -todo(sm<4 | sm>=6) draw quad +todo(sm<4) draw quad probe all rgba (0, 1000, -1000.0, 0)

1 0

Henri Verbeet : vkd3d: Use vkd3d_atomic_increment_u32() in d3d12_fence_AddRef().
by Alexandre Julliard Jan. 25, 2024

Jan. 25, 2024

Module: vkd3d Branch: master Commit: 5a2b82fbd5ca6f7a338425b36e4986670655561c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5a2b82fbd5ca6f7a338425b36e498… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 11 20:22:57 2024 +0100 vkd3d: Use vkd3d_atomic_increment_u32() in d3d12_fence_AddRef(). --- libs/vkd3d/command.c | 4 ++-- libs/vkd3d/vkd3d_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index d146e322..77621009 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -926,7 +926,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_fence_QueryInterface(ID3D12Fence1 *iface, static ULONG STDMETHODCALLTYPE d3d12_fence_AddRef(ID3D12Fence1 *iface) { struct d3d12_fence *fence = impl_from_ID3D12Fence1(iface); - ULONG refcount = InterlockedIncrement(&fence->refcount); + unsigned int refcount = vkd3d_atomic_increment_u32(&fence->refcount); TRACE("%p increasing refcount to %u.\n", fence, refcount); @@ -941,7 +941,7 @@ static void d3d12_fence_incref(struct d3d12_fence *fence) static ULONG STDMETHODCALLTYPE d3d12_fence_Release(ID3D12Fence1 *iface) { struct d3d12_fence *fence = impl_from_ID3D12Fence1(iface); - ULONG refcount = InterlockedDecrement(&fence->refcount); + ULONG refcount = InterlockedDecrement((LONG *)&fence->refcount); TRACE("%p decreasing refcount to %u.\n", fence, refcount); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 2841122a..763606fd 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -622,7 +622,7 @@ struct d3d12_fence { ID3D12Fence1 ID3D12Fence1_iface; LONG internal_refcount; - LONG refcount; + unsigned int refcount; D3D12_FENCE_FLAGS flags;

1 0

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

Jan. 25, 2024

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 Jan. 25, 2024

Jan. 25, 2024

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

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

Jan. 25, 2024

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 Jan. 25, 2024

Jan. 25, 2024

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