January 2024 - Wine-commits

Henri Verbeet : vkd3d-shader/ir: Pass a struct vsir_program to shader_parser_get_dst_params().
by Alexandre Julliard 31 Jan '24

31 Jan '24

Module: vkd3d Branch: master Commit: 47ec24ebada14bc19ddb8ee49a88f37b2721ca75 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/47ec24ebada14bc19ddb8ee49a88f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 24 14:07:20 2024 +0100 vkd3d-shader/ir: Pass a struct vsir_program to shader_parser_get_dst_params(). --- libs/vkd3d-shader/d3dbc.c | 5 +++-- libs/vkd3d-shader/dxil.c | 9 +++++---- libs/vkd3d-shader/ir.c | 2 +- libs/vkd3d-shader/tpf.c | 2 +- libs/vkd3d-shader/vkd3d_shader_private.h | 12 ++++++------ 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index a4ca7aa2..6499a59e 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -1089,6 +1089,7 @@ static void shader_sm1_read_instruction(struct vkd3d_shader_sm1_parser *sm1, str { struct vkd3d_shader_src_param *src_params, *predicate; const struct vkd3d_sm1_opcode_info *opcode_info; + struct vsir_program *program = &sm1->p.program; struct vkd3d_shader_dst_param *dst_param; const uint32_t **ptr = &sm1->ptr; uint32_t opcode_token; @@ -1111,7 +1112,7 @@ static void shader_sm1_read_instruction(struct vkd3d_shader_sm1_parser *sm1, str vkd3d_shader_parser_error(&sm1->p, VKD3D_SHADER_ERROR_D3DBC_INVALID_OPCODE, "Invalid opcode %#x (token 0x%08x, shader version %u.%u).", opcode_token & VKD3D_SM1_OPCODE_MASK, opcode_token, - sm1->p.program.shader_version.major, sm1->p.program.shader_version.minor); + program->shader_version.major, program->shader_version.minor); goto fail; } @@ -1123,7 +1124,7 @@ static void shader_sm1_read_instruction(struct vkd3d_shader_sm1_parser *sm1, str predicated = !!(opcode_token & VKD3D_SM1_INSTRUCTION_PREDICATED); ins->predicate = predicate = predicated ? shader_parser_get_src_params(&sm1->p, 1) : NULL; ins->dst_count = opcode_info->dst_count; - ins->dst = dst_param = shader_parser_get_dst_params(&sm1->p, ins->dst_count); + ins->dst = dst_param = vsir_program_get_dst_params(program, ins->dst_count); ins->src_count = opcode_info->src_count; ins->src = src_params = shader_parser_get_src_params(&sm1->p, ins->src_count); if ((!predicate && predicated) || (!src_params && ins->src_count) || (!dst_param && ins->dst_count)) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 3e1ba391..2718f94f 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -2108,8 +2108,9 @@ static struct vkd3d_shader_src_param *instruction_src_params_alloc(struct vkd3d_ static struct vkd3d_shader_dst_param *instruction_dst_params_alloc(struct vkd3d_shader_instruction *ins, unsigned int count, struct sm6_parser *sm6) { - struct vkd3d_shader_dst_param *params = shader_parser_get_dst_params(&sm6->p, count); - if (!params) + struct vkd3d_shader_dst_param *params; + + if (!(params = vsir_program_get_dst_params(&sm6->p.program, count))) { ERR("Failed to allocate dst params.\n"); vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_OUT_OF_MEMORY, @@ -7311,8 +7312,8 @@ static enum vkd3d_result sm6_parser_init(struct sm6_parser *sm6, const uint32_t return ret; } - if (!(sm6->output_params = shader_parser_get_dst_params(&sm6->p, output_signature->element_count)) - || !(sm6->input_params = shader_parser_get_dst_params(&sm6->p, input_signature->element_count))) + if (!(sm6->output_params = vsir_program_get_dst_params(&sm6->p.program, output_signature->element_count)) + || !(sm6->input_params = vsir_program_get_dst_params(&sm6->p.program, input_signature->element_count))) { ERR("Failed to allocate input/output parameters.\n"); vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_OUT_OF_MEMORY, diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 56e8d974..2d388b85 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -74,7 +74,7 @@ static bool vsir_instruction_init_with_params(struct vkd3d_shader_parser *parser ins->dst_count = dst_count; ins->src_count = src_count; - if (!(ins->dst = shader_parser_get_dst_params(parser, ins->dst_count))) + if (!(ins->dst = vsir_program_get_dst_params(&parser->program, ins->dst_count))) { ERR("Failed to allocate %u destination parameters.\n", dst_count); return false; diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index e9fd39b8..ed56a347 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -2444,7 +2444,7 @@ static void shader_sm4_read_instruction(struct vkd3d_shader_sm4_parser *sm4, str precise = (opcode_token & VKD3D_SM5_PRECISE_MASK) >> VKD3D_SM5_PRECISE_SHIFT; ins->flags |= precise << VKD3DSI_PRECISE_SHIFT; - ins->dst = dst_params = shader_parser_get_dst_params(&sm4->p, ins->dst_count); + ins->dst = dst_params = vsir_program_get_dst_params(&sm4->p.program, ins->dst_count); if (!dst_params && ins->dst_count) { ERR("Failed to allocate dst parameters.\n"); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index e5f706e9..55dc499d 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1287,6 +1287,12 @@ struct vsir_program bool vsir_program_init(struct vsir_program *program, const struct vkd3d_shader_version *version, unsigned int reserve); void vsir_program_cleanup(struct vsir_program *program); +static inline struct vkd3d_shader_dst_param *vsir_program_get_dst_params( + struct vsir_program *program, unsigned int count) +{ + return shader_dst_param_allocator_get(&program->instructions.dst_params, count); +} + struct vkd3d_shader_parser { struct vkd3d_shader_message_context *message_context; @@ -1314,12 +1320,6 @@ bool vkd3d_shader_parser_init(struct vkd3d_shader_parser *parser, void vkd3d_shader_parser_warning(struct vkd3d_shader_parser *parser, enum vkd3d_shader_error error, const char *format, ...) VKD3D_PRINTF_FUNC(3, 4); -static inline struct vkd3d_shader_dst_param *shader_parser_get_dst_params( - struct vkd3d_shader_parser *parser, unsigned int count) -{ - return shader_dst_param_allocator_get(&parser->program.instructions.dst_params, count); -} - static inline struct vkd3d_shader_src_param *shader_parser_get_src_params( struct vkd3d_shader_parser *parser, unsigned int count) {

1 0

Henri Verbeet : vkd3d-shader/ir: Pass a struct vsir_program to shader_parser_get_src_params().
by Alexandre Julliard 31 Jan '24

31 Jan '24

Module: vkd3d Branch: master Commit: d38221bd6860fc8083bf72bf4ea5e4c1ff92b131 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d38221bd6860fc8083bf72bf4ea5e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 24 14:26:35 2024 +0100 vkd3d-shader/ir: Pass a struct vsir_program to shader_parser_get_src_params(). --- libs/vkd3d-shader/d3dbc.c | 8 ++-- libs/vkd3d-shader/dxil.c | 7 ++-- libs/vkd3d-shader/ir.c | 63 +++++++++++++++++--------------- libs/vkd3d-shader/tpf.c | 7 ++-- libs/vkd3d-shader/vkd3d_shader_private.h | 12 +++--- 5 files changed, 52 insertions(+), 45 deletions(-)

1 0

Giovanni Mascellani : vkd3d-compiler: Exit the main function through a common code path.
by Alexandre Julliard 31 Jan '24

31 Jan '24

Module: vkd3d Branch: master Commit: 896fc0c2ce9cc5f004e8c457eeeb7025020e887f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/896fc0c2ce9cc5f004e8c457eeeb7… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Jan 30 16:45:18 2024 +0100 vkd3d-compiler: Exit the main function through a common code path. --- programs/vkd3d-compiler/main.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 4aa368b0..f55eff6a 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -717,12 +717,13 @@ int main(int argc, char **argv) int ret; if (!parse_command_line(argc, argv, &options)) - return 1; + goto done; if (options.print_help) { print_usage(argv[0]); - return 0; + fail = 0; + goto done; } if (options.print_version) @@ -730,13 +731,15 @@ int main(int argc, char **argv) const char *version = vkd3d_shader_get_version(NULL, NULL); fprintf(stdout, "vkd3d shader compiler version " PACKAGE_VERSION " using %s\n", version); - return 0; + fail = 0; + goto done; } if (options.print_source_types) { print_source_types(); - return 0; + fail = 0; + goto done; } if (options.print_target_types) @@ -744,11 +747,12 @@ int main(int argc, char **argv) if (options.source_type == VKD3D_SHADER_SOURCE_NONE) { fprintf(stderr, "--print-target-types requires an explicitly specified source type.\n"); - return 1; + goto done; } print_target_types(options.source_type); - return 0; + fail = 0; + goto done; } if (!(input = open_input(options.filename, &close_input))) @@ -774,7 +778,7 @@ int main(int argc, char **argv) if (token == TAG_DXBC) { if (!parse_dxbc_source_type(&info.source, &options.source_type)) - return 1; + goto done; } else if ((token & 0xfffe0000) == 0xfffe0000) options.source_type = VKD3D_SHADER_SOURCE_D3D_BYTECODE; @@ -791,13 +795,13 @@ int main(int argc, char **argv) fprintf(stderr, "Target type '%s' is invalid for source type '%s'.\n", get_target_type_info(options.target_type)->name, get_source_type_info(options.source_type)->name); - return 1; + goto done; } if (!options.preprocess_only && options.source_type == VKD3D_SHADER_SOURCE_HLSL && !options.profile) { fprintf(stderr, "You need to specify a profile when compiling from HLSL source.\n"); - return 1; + goto done; } if (!options.filename && get_source_type_info(options.source_type)->is_binary && isatty(fileno(input)))

1 0

Giovanni Mascellani : vkd3d-compiler: Free compilation options (Valgrind).
by Alexandre Julliard 31 Jan '24

31 Jan '24

Module: vkd3d Branch: master Commit: 8b11b4b37a22ad8257d3caed87f3a6bc72b75804 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8b11b4b37a22ad8257d3caed87f3a… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Jan 30 16:46:37 2024 +0100 vkd3d-compiler: Free compilation options (Valgrind). --- programs/vkd3d-compiler/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index f55eff6a..3fa54aad 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -879,6 +879,7 @@ int main(int argc, char **argv) fail = 0; vkd3d_shader_free_shader_code(&output_code); done: + free(options.compile_options); if (close_output) fclose(output); if (close_input)

1 0

Giovanni Mascellani : vkd3d-shader/spirv: Free binary SPIR-V code (Valgrind).
by Alexandre Julliard 31 Jan '24

31 Jan '24

Module: vkd3d Branch: master Commit: cc72a8d3115f9d2d230e6cbac40124dbb9958037 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/cc72a8d3115f9d2d230e6cbac4012… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Jan 30 16:56:47 2024 +0100 vkd3d-shader/spirv: Free binary SPIR-V code (Valgrind). --- libs/vkd3d-shader/spirv.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 298ad31d..70046d98 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -9981,6 +9981,7 @@ static int spirv_compiler_generate_spirv(struct spirv_compiler *compiler, enum vkd3d_shader_spirv_environment environment = spirv_compiler_get_target_environment(compiler); if (vkd3d_spirv_binary_to_text(spirv, environment, compiler->formatting, &text) != VKD3D_OK) return VKD3D_ERROR; + vkd3d_shader_free_shader_code(spirv); *spirv = text; }

1 0

Henri Verbeet : vkd3d: Use vkd3d_atomic_increment_u32() in d3d12_heap_AddRef().
by Alexandre Julliard 31 Jan '24

31 Jan '24

Module: vkd3d Branch: master Commit: fd385ab994611a8c32014dd3bc96f029e66436bb URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fd385ab994611a8c32014dd3bc96f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 24 20:52:39 2024 +0100 vkd3d: Use vkd3d_atomic_increment_u32() in d3d12_heap_AddRef(). --- libs/vkd3d/resource.c | 4 ++-- libs/vkd3d/vkd3d_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index a360b0ef..7739e678 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -308,7 +308,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_heap_QueryInterface(ID3D12Heap *iface, static ULONG STDMETHODCALLTYPE d3d12_heap_AddRef(ID3D12Heap *iface) { struct d3d12_heap *heap = impl_from_ID3D12Heap(iface); - ULONG refcount = InterlockedIncrement(&heap->refcount); + unsigned int refcount = vkd3d_atomic_increment_u32(&heap->refcount); TRACE("%p increasing refcount to %u.\n", heap, refcount); @@ -345,7 +345,7 @@ static void d3d12_heap_destroy(struct d3d12_heap *heap) static ULONG STDMETHODCALLTYPE d3d12_heap_Release(ID3D12Heap *iface) { struct d3d12_heap *heap = impl_from_ID3D12Heap(iface); - ULONG refcount = InterlockedDecrement(&heap->refcount); + unsigned int refcount = InterlockedDecrement((LONG *)&heap->refcount); TRACE("%p decreasing refcount to %u.\n", heap, refcount); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index ec83d350..5b5ef9b0 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -665,7 +665,7 @@ VkResult vkd3d_create_timeline_semaphore(const struct d3d12_device *device, uint struct d3d12_heap { ID3D12Heap ID3D12Heap_iface; - LONG refcount; + unsigned int refcount; LONG resource_count; bool is_private;

1 0

Henri Verbeet : vkd3d: Use vkd3d_atomic_decrement_u32() in d3d12_heap_Release().
by Alexandre Julliard 31 Jan '24

31 Jan '24

Module: vkd3d Branch: master Commit: 06eb8e5f8c5e8f28908fc5e3ad4636702add666b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/06eb8e5f8c5e8f28908fc5e3ad463… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 24 20:54:26 2024 +0100 vkd3d: Use vkd3d_atomic_decrement_u32() in d3d12_heap_Release(). --- libs/vkd3d/resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 7739e678..05463cb3 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -345,7 +345,7 @@ static void d3d12_heap_destroy(struct d3d12_heap *heap) static ULONG STDMETHODCALLTYPE d3d12_heap_Release(ID3D12Heap *iface) { struct d3d12_heap *heap = impl_from_ID3D12Heap(iface); - unsigned int refcount = InterlockedDecrement((LONG *)&heap->refcount); + unsigned int refcount = vkd3d_atomic_decrement_u32(&heap->refcount); TRACE("%p decreasing refcount to %u.\n", heap, refcount);

1 0

Henri Verbeet : vkd3d: Use vkd3d_atomic_increment_u32() in vkd3d_bind_heap_memory().
by Alexandre Julliard 31 Jan '24

31 Jan '24

Module: vkd3d Branch: master Commit: 30a00160e2a75e2d5996035f9056912510a42fd8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/30a00160e2a75e2d5996035f90569… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 24 20:57:35 2024 +0100 vkd3d: Use vkd3d_atomic_increment_u32() in vkd3d_bind_heap_memory(). --- libs/vkd3d/resource.c | 4 ++-- libs/vkd3d/vkd3d_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 05463cb3..e5f743f5 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -358,7 +358,7 @@ static ULONG STDMETHODCALLTYPE d3d12_heap_Release(ID3D12Heap *iface) static void d3d12_heap_resource_destroyed(struct d3d12_heap *heap) { - if (!InterlockedDecrement(&heap->resource_count) && (!heap->refcount || heap->is_private)) + if (!InterlockedDecrement((LONG *)&heap->resource_count) && (!heap->refcount || heap->is_private)) d3d12_heap_destroy(heap); } @@ -2174,7 +2174,7 @@ static HRESULT vkd3d_bind_heap_memory(struct d3d12_device *device, { resource->heap = heap; resource->heap_offset = heap_offset; - InterlockedIncrement(&heap->resource_count); + vkd3d_atomic_increment_u32(&heap->resource_count); } else { diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 5b5ef9b0..4b4daa53 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -666,7 +666,7 @@ struct d3d12_heap { ID3D12Heap ID3D12Heap_iface; unsigned int refcount; - LONG resource_count; + unsigned int resource_count; bool is_private; D3D12_HEAP_DESC desc;

1 0

Henri Verbeet : vkd3d: Use vkd3d_atomic_decrement_u32() in d3d12_heap_resource_destroyed().
by Alexandre Julliard 31 Jan '24

31 Jan '24

Module: vkd3d Branch: master Commit: 6f7aec58ea6e53334c306c7c342be011651a30ea URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6f7aec58ea6e53334c306c7c342be… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 24 20:58:30 2024 +0100 vkd3d: Use vkd3d_atomic_decrement_u32() in d3d12_heap_resource_destroyed(). --- libs/vkd3d/resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index e5f743f5..53978e65 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -358,7 +358,7 @@ static ULONG STDMETHODCALLTYPE d3d12_heap_Release(ID3D12Heap *iface) static void d3d12_heap_resource_destroyed(struct d3d12_heap *heap) { - if (!InterlockedDecrement((LONG *)&heap->resource_count) && (!heap->refcount || heap->is_private)) + if (!vkd3d_atomic_decrement_u32(&heap->resource_count) && (!heap->refcount || heap->is_private)) d3d12_heap_destroy(heap); }

1 0

Henri Verbeet : vkd3d: Use vkd3d_atomic_increment_u32() in d3d12_resource_incref().
by Alexandre Julliard 31 Jan '24

31 Jan '24

Module: vkd3d Branch: master Commit: a9582a7355ec02441394885a4b4a468bee1254ce URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a9582a7355ec02441394885a4b4a4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 29 17:17:51 2024 +0100 vkd3d: Use vkd3d_atomic_increment_u32() in d3d12_resource_incref(). --- libs/vkd3d/resource.c | 4 ++-- libs/vkd3d/vkd3d_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 53978e65..f607b178 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1003,7 +1003,7 @@ static void d3d12_resource_destroy(struct d3d12_resource *resource, struct d3d12 static ULONG d3d12_resource_incref(struct d3d12_resource *resource) { - ULONG refcount = InterlockedIncrement(&resource->internal_refcount); + unsigned int refcount = vkd3d_atomic_increment_u32(&resource->internal_refcount); TRACE("%p increasing refcount to %u.\n", resource, refcount); @@ -1012,7 +1012,7 @@ static ULONG d3d12_resource_incref(struct d3d12_resource *resource) static ULONG d3d12_resource_decref(struct d3d12_resource *resource) { - ULONG refcount = InterlockedDecrement(&resource->internal_refcount); + unsigned int refcount = InterlockedDecrement((LONG *)&resource->internal_refcount); TRACE("%p decreasing refcount to %u.\n", resource, refcount); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 4b4daa53..68941537 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -722,7 +722,7 @@ struct d3d12_resource { ID3D12Resource1 ID3D12Resource1_iface; LONG refcount; - LONG internal_refcount; + unsigned int internal_refcount; D3D12_RESOURCE_DESC desc; const struct vkd3d_format *format;

1 0