January 2024 - Wine-Commits

Giovanni Mascellani : tests: Mark a test related to instanced draws as buggy on MoltenVK.
by Alexandre Julliard Jan. 25, 2024

Jan. 25, 2024

Module: vkd3d Branch: master Commit: 17f3f2914ea95f0801b08a3fe7b40fb8643ea994 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/17f3f2914ea95f0801b08a3fe7b40… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sat Dec 30 22:05:48 2023 +0100 tests: Mark a test related to instanced draws as buggy on MoltenVK. I haven't been able to understand what's happening here exactly, but it doesn't look like we're generating bad Vulkan calls. --- tests/d3d12.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 73253f54..c75e112f 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -25877,7 +25877,13 @@ static void test_instance_id(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); get_resource_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); for (j = 0; j < ARRAY_SIZE(expected_results); ++j) + { + /* MoltenVK seems to have a bug with instanced draws when + * the instance data step rate is zero: in some cases + * StartVertexLocation seems to be ignored. */ + bug_if(is_mvk_device(context.device) && i == 0 && 8 <= j && j < 12) check_readback_data_uint(&rb.rb, &expected_results[j].box, tests[i].expected_colors[j], 1); + } release_resource_readback(&rb); reset_command_list(command_list, context.allocator); transition_resource_state(command_list, render_target,

1 0

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

Jan. 25, 2024

Module: vkd3d Branch: master Commit: 0ff20e6b8dfbdf8b11169b4f339ef2d10a39f558 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0ff20e6b8dfbdf8b11169b4f339ef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 24 20:26:56 2024 +0100 vkd3d: Use vkd3d_atomic_decrement_u32() in d3d12_command_queue_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 69516663..840bc1a8 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -6272,7 +6272,7 @@ static void d3d12_command_queue_op_array_destroy(struct d3d12_command_queue_op_a static ULONG STDMETHODCALLTYPE d3d12_command_queue_Release(ID3D12CommandQueue *iface) { struct d3d12_command_queue *command_queue = impl_from_ID3D12CommandQueue(iface); - unsigned int refcount = InterlockedDecrement((LONG *)&command_queue->refcount); + unsigned int refcount = vkd3d_atomic_decrement_u32(&command_queue->refcount); TRACE("%p decreasing refcount to %u.\n", command_queue, refcount);

1 0

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

Jan. 25, 2024

Module: vkd3d Branch: master Commit: 13ba36bb43b0448abebc0cb477559984066cf23e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/13ba36bb43b0448abebc0cb477559… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 24 20:29:14 2024 +0100 vkd3d: Use vkd3d_atomic_increment_u32() in d3d12_command_signature_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 840bc1a8..b5a46a1d 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -7442,7 +7442,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_signature_QueryInterface(ID3D12Co static ULONG STDMETHODCALLTYPE d3d12_command_signature_AddRef(ID3D12CommandSignature *iface) { struct d3d12_command_signature *signature = impl_from_ID3D12CommandSignature(iface); - ULONG refcount = InterlockedIncrement(&signature->refcount); + unsigned int refcount = vkd3d_atomic_increment_u32(&signature->refcount); TRACE("%p increasing refcount to %u.\n", signature, refcount); @@ -7452,7 +7452,7 @@ static ULONG STDMETHODCALLTYPE d3d12_command_signature_AddRef(ID3D12CommandSigna static ULONG STDMETHODCALLTYPE d3d12_command_signature_Release(ID3D12CommandSignature *iface) { struct d3d12_command_signature *signature = impl_from_ID3D12CommandSignature(iface); - ULONG refcount = InterlockedDecrement(&signature->refcount); + unsigned int refcount = InterlockedDecrement((LONG *)&signature->refcount); TRACE("%p decreasing refcount to %u.\n", signature, refcount); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index a6e8c0a7..64a01c41 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1657,7 +1657,7 @@ HRESULT d3d12_command_queue_create(struct d3d12_device *device, struct d3d12_command_signature { ID3D12CommandSignature ID3D12CommandSignature_iface; - LONG refcount; + unsigned int refcount; unsigned int internal_refcount; D3D12_COMMAND_SIGNATURE_DESC desc;

1 0

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

Jan. 25, 2024

Module: vkd3d Branch: master Commit: 3295f0d16eeb834c0165703198fa1038629ad805 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3295f0d16eeb834c0165703198fa1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 24 20:30:16 2024 +0100 vkd3d: Use vkd3d_atomic_decrement_u32() in d3d12_command_signature_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 b5a46a1d..3cf58e06 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -7452,7 +7452,7 @@ static ULONG STDMETHODCALLTYPE d3d12_command_signature_AddRef(ID3D12CommandSigna static ULONG STDMETHODCALLTYPE d3d12_command_signature_Release(ID3D12CommandSignature *iface) { struct d3d12_command_signature *signature = impl_from_ID3D12CommandSignature(iface); - unsigned int refcount = InterlockedDecrement((LONG *)&signature->refcount); + unsigned int refcount = vkd3d_atomic_decrement_u32(&signature->refcount); TRACE("%p decreasing refcount to %u.\n", signature, refcount);

1 0

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

Jan. 25, 2024

Module: vkd3d Branch: master Commit: cdb559c39d5380caff91535969d91abbd57bc935 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/cdb559c39d5380caff91535969d91… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 24 20:25:46 2024 +0100 vkd3d: Use vkd3d_atomic_increment_u32() in d3d12_command_queue_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 2307659d..69516663 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -6230,7 +6230,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_QueryInterface(ID3D12Comman static ULONG STDMETHODCALLTYPE d3d12_command_queue_AddRef(ID3D12CommandQueue *iface) { struct d3d12_command_queue *command_queue = impl_from_ID3D12CommandQueue(iface); - ULONG refcount = InterlockedIncrement(&command_queue->refcount); + unsigned int refcount = vkd3d_atomic_increment_u32(&command_queue->refcount); TRACE("%p increasing refcount to %u.\n", command_queue, refcount); @@ -6272,7 +6272,7 @@ static void d3d12_command_queue_op_array_destroy(struct d3d12_command_queue_op_a static ULONG STDMETHODCALLTYPE d3d12_command_queue_Release(ID3D12CommandQueue *iface) { struct d3d12_command_queue *command_queue = impl_from_ID3D12CommandQueue(iface); - ULONG refcount = InterlockedDecrement(&command_queue->refcount); + unsigned int refcount = InterlockedDecrement((LONG *)&command_queue->refcount); TRACE("%p decreasing refcount to %u.\n", command_queue, refcount); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index de7a129a..a6e8c0a7 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1622,7 +1622,7 @@ struct d3d12_command_queue_op_array struct d3d12_command_queue { ID3D12CommandQueue ID3D12CommandQueue_iface; - LONG refcount; + unsigned int refcount; D3D12_COMMAND_QUEUE_DESC desc;

1 0

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

Jan. 25, 2024

Module: vkd3d Branch: master Commit: 298dce541db1c6ce0f97baa9a33565fb4f1e110b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/298dce541db1c6ce0f97baa9a3356… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 23 18:28:06 2024 +0100 vkd3d: Use vkd3d_atomic_decrement_u32() in d3d12_command_list_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 9648a9f4..2307659d 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2335,7 +2335,7 @@ static void vkd3d_pipeline_bindings_cleanup(struct vkd3d_pipeline_bindings *bind static ULONG STDMETHODCALLTYPE d3d12_command_list_Release(ID3D12GraphicsCommandList5 *iface) { struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList5(iface); - unsigned int refcount = InterlockedDecrement((LONG *)&list->refcount); + unsigned int refcount = vkd3d_atomic_decrement_u32(&list->refcount); TRACE("%p decreasing refcount to %u.\n", list, refcount);

1 0

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

Jan. 25, 2024

Module: vkd3d Branch: master Commit: 87f3a606d7d409263fa4709577ca76416b7c3de6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/87f3a606d7d409263fa4709577ca7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 23 18:27:21 2024 +0100 vkd3d: Use vkd3d_atomic_increment_u32() in d3d12_command_list_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 a0e88382..9648a9f4 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2320,7 +2320,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_list_QueryInterface(ID3D12Graphic static ULONG STDMETHODCALLTYPE d3d12_command_list_AddRef(ID3D12GraphicsCommandList5 *iface) { struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList5(iface); - ULONG refcount = InterlockedIncrement(&list->refcount); + unsigned int refcount = vkd3d_atomic_increment_u32(&list->refcount); TRACE("%p increasing refcount to %u.\n", list, refcount); @@ -2335,7 +2335,7 @@ static void vkd3d_pipeline_bindings_cleanup(struct vkd3d_pipeline_bindings *bind static ULONG STDMETHODCALLTYPE d3d12_command_list_Release(ID3D12GraphicsCommandList5 *iface) { struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList5(iface); - ULONG refcount = InterlockedDecrement(&list->refcount); + unsigned int refcount = InterlockedDecrement((LONG *)&list->refcount); TRACE("%p decreasing refcount to %u.\n", list, refcount); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 709b969f..de7a129a 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1466,7 +1466,7 @@ enum vkd3d_pipeline_bind_point struct d3d12_command_list { ID3D12GraphicsCommandList5 ID3D12GraphicsCommandList5_iface; - LONG refcount; + unsigned int refcount; D3D12_COMMAND_LIST_TYPE type; VkQueueFlags vk_queue_flags;

1 0

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

Jan. 25, 2024

Module: vkd3d Branch: master Commit: c8122ff47eefb58d9b2e9d3c437b435acd1008fd URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c8122ff47eefb58d9b2e9d3c437b4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 11 20:26:16 2024 +0100 vkd3d: Use vkd3d_atomic_increment_u32() in d3d12_fence_incref(). --- 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 5df15b64..f7880ab2 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -935,7 +935,7 @@ static ULONG STDMETHODCALLTYPE d3d12_fence_AddRef(ID3D12Fence1 *iface) static void d3d12_fence_incref(struct d3d12_fence *fence) { - InterlockedIncrement(&fence->internal_refcount); + vkd3d_atomic_increment_u32(&fence->internal_refcount); } static ULONG STDMETHODCALLTYPE d3d12_fence_Release(ID3D12Fence1 *iface) @@ -953,7 +953,7 @@ static ULONG STDMETHODCALLTYPE d3d12_fence_Release(ID3D12Fence1 *iface) static void d3d12_fence_decref(struct d3d12_fence *fence) { - ULONG internal_refcount = InterlockedDecrement(&fence->internal_refcount); + ULONG internal_refcount = InterlockedDecrement((LONG *)&fence->internal_refcount); if (!internal_refcount) { diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 763606fd..56b43052 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -621,7 +621,7 @@ struct vkd3d_signaled_semaphore struct d3d12_fence { ID3D12Fence1 ID3D12Fence1_iface; - LONG internal_refcount; + unsigned int internal_refcount; unsigned int refcount; D3D12_FENCE_FLAGS flags;

1 0

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

Jan. 25, 2024

Module: vkd3d Branch: master Commit: d891e5c2a0f9f80ac087dc3207305db1ff105c94 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d891e5c2a0f9f80ac087dc3207305… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 11 20:51:07 2024 +0100 vkd3d: Use vkd3d_atomic_decrement_u32() in d3d12_command_allocator_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 f6d405f8..a0e88382 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -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); - unsigned int refcount = InterlockedDecrement((LONG *)&allocator->refcount); + unsigned int refcount = vkd3d_atomic_decrement_u32(&allocator->refcount); TRACE("%p decreasing refcount to %u.\n", allocator, refcount);

1 0

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

Jan. 25, 2024

Module: vkd3d Branch: master Commit: 78bb7b67600817061eac388e87698adc9217a886 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/78bb7b67600817061eac388e87698… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 11 20:30:55 2024 +0100 vkd3d: Use vkd3d_atomic_decrement_u32() in d3d12_fence_decref(). --- libs/vkd3d/command.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index f7880ab2..d4af9d01 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -953,24 +953,24 @@ static ULONG STDMETHODCALLTYPE d3d12_fence_Release(ID3D12Fence1 *iface) static void d3d12_fence_decref(struct d3d12_fence *fence) { - ULONG internal_refcount = InterlockedDecrement((LONG *)&fence->internal_refcount); + struct d3d12_device *device; - if (!internal_refcount) - { - struct d3d12_device *device = fence->device; + if (vkd3d_atomic_decrement_u32(&fence->internal_refcount)) + return; - vkd3d_private_store_destroy(&fence->private_store); + device = fence->device; - d3d12_fence_destroy_vk_objects(fence); + vkd3d_private_store_destroy(&fence->private_store); - vkd3d_free(fence->events); - vkd3d_free(fence->semaphores); - vkd3d_mutex_destroy(&fence->mutex); - vkd3d_cond_destroy(&fence->null_event_cond); - vkd3d_free(fence); + d3d12_fence_destroy_vk_objects(fence); - d3d12_device_release(device); - } + vkd3d_free(fence->events); + vkd3d_free(fence->semaphores); + vkd3d_mutex_destroy(&fence->mutex); + vkd3d_cond_destroy(&fence->null_event_cond); + vkd3d_free(fence); + + d3d12_device_release(device); } static HRESULT STDMETHODCALLTYPE d3d12_fence_GetPrivateData(ID3D12Fence1 *iface,

1 0