wine-commits April 2019

wine-commits@winehq.org

1 participants
803 discussions

Józef Kucia : tests: Add test for ID3D12CommandQueue_Wait().
by Alexandre Julliard 18 Apr '19

18 Apr '19

Module: vkd3d Branch: master Commit: a00ae0025f814a6c08471d9818a20c36f2e6a82f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a00ae0025f814a6c08471d9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 17 17:26:40 2019 +0200 tests: Add test for ID3D12CommandQueue_Wait(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 252 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 251 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=a00ae0025f814a6c084…

1 0

Józef Kucia : vkd3d: Return S_OK from d3d12_command_queue_Wait().
by Alexandre Julliard 18 Apr '19

18 Apr '19

Module: vkd3d Branch: master Commit: f886aecdc06c2d64ca7f24e5e543c22ee1603d0a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f886aecdc06c2d64ca7f24e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 17 17:26:39 2019 +0200 vkd3d: Return S_OK from d3d12_command_queue_Wait(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 6410dd2..7b4daa4 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -5217,7 +5217,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Wait(ID3D12CommandQueue *if { FIXME("iface %p, fence %p, value %#"PRIx64" stub!\n", iface, fence, value); - return E_NOTIMPL; + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d12_command_queue_GetTimestampFrequency(ID3D12CommandQueue *iface,

1 0

Józef Kucia : tests: Add simple test for fence values.
by Alexandre Julliard 18 Apr '19

18 Apr '19

Module: vkd3d Branch: master Commit: fd53b967fc080eb63863ebd15cbbb1a82fd5c9c0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=fd53b967fc080eb63863ebd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 17 17:26:38 2019 +0200 tests: Add simple test for fence values. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 148989b..d44fff0 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -3922,6 +3922,87 @@ static void test_multithread_fence_wait(void) ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } +static void test_fence_values(void) +{ + ID3D12CommandQueue *queue; + UINT64 value, next_value; + ID3D12Device *device; + ID3D12Fence *fence; + ULONG refcount; + unsigned int i; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + queue = create_command_queue(device, D3D12_COMMAND_LIST_TYPE_DIRECT, D3D12_COMMAND_QUEUE_PRIORITY_NORMAL); + + next_value = (uint64_t)1 << 60; + hr = ID3D12Device_CreateFence(device, next_value, D3D12_FENCE_FLAG_NONE, &IID_ID3D12Fence, (void **)&fence); + ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); + + value = ID3D12Fence_GetCompletedValue(fence); + ok(value == next_value, "Got value %#"PRIx64", expected %#"PRIx64".\n", value, next_value); + + for (i = 0; i < 100; ++i) + { + ++next_value; + hr = ID3D12CommandQueue_Signal(queue, fence, next_value); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + wait_queue_idle(device, queue); + value = ID3D12Fence_GetCompletedValue(fence); + ok(value == next_value, "Got value %#"PRIx64", expected %#"PRIx64".\n", value, next_value); + } + + for (i = 0; i < 100; ++i) + { + next_value += 10000; + hr = ID3D12Fence_Signal(fence, next_value); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + value = ID3D12Fence_GetCompletedValue(fence); + ok(value == next_value, "Got value %#"PRIx64", expected %#"PRIx64".\n", value, next_value); + } + + ID3D12Fence_Release(fence); + + hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, &IID_ID3D12Fence, (void **)&fence); + ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); + next_value = (uint64_t)1 << 60; + hr = ID3D12Fence_Signal(fence, next_value); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + value = ID3D12Fence_GetCompletedValue(fence); + ok(value == next_value, "Got value %#"PRIx64", expected %#"PRIx64".\n", value, next_value); + next_value = 0; + hr = ID3D12Fence_Signal(fence, next_value); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + value = ID3D12Fence_GetCompletedValue(fence); + ok(value == next_value, "Got value %#"PRIx64", expected %#"PRIx64".\n", value, next_value); + ID3D12Fence_Release(fence); + + hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, &IID_ID3D12Fence, (void **)&fence); + ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); + next_value = (uint64_t)1 << 60; + hr = ID3D12CommandQueue_Signal(queue, fence, next_value); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + wait_queue_idle(device, queue); + value = ID3D12Fence_GetCompletedValue(fence); + ok(value == next_value, "Got value %#"PRIx64", expected %#"PRIx64".\n", value, next_value); + next_value = 0; + hr = ID3D12CommandQueue_Signal(queue, fence, next_value); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + wait_queue_idle(device, queue); + value = ID3D12Fence_GetCompletedValue(fence); + ok(value == next_value, "Got value %#"PRIx64", expected %#"PRIx64".\n", value, next_value); + ID3D12Fence_Release(fence); + + ID3D12CommandQueue_Release(queue); + refcount = ID3D12Device_Release(device); + ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); +} + static void test_clear_depth_stencil_view(void) { static const float expected_values[] = {0.5f, 0.1f, 0.1f, 0.6, 1.0f, 0.5f}; @@ -27532,6 +27613,7 @@ START_TEST(d3d12) run_test(test_cpu_signal_fence); run_test(test_gpu_signal_fence); run_test(test_multithread_fence_wait); + run_test(test_fence_values); run_test(test_clear_depth_stencil_view); run_test(test_clear_render_target_view); run_test(test_clear_unordered_access_view);

1 0

Józef Kucia : tests: Introduce universal create_command_queue() helper.
by Alexandre Julliard 18 Apr '19

18 Apr '19

Module: vkd3d Branch: master Commit: a81f21004fccc1c018524e0cf2b02f13329d524c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a81f21004fccc1c018524e0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 17 17:26:37 2019 +0200 tests: Introduce universal create_command_queue() helper. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 123 ++++++++++++++++---------------------------- tests/d3d12_invalid_usage.c | 9 +--- tests/d3d12_test_utils.h | 27 +++++++--- tests/vkd3d_api.c | 23 ++------- 4 files changed, 68 insertions(+), 114 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=a81f21004fccc1c0185…

1 0

Józef Kucia : vkd3d: Reuse Vulkan fences.
by Alexandre Julliard 18 Apr '19

18 Apr '19

Module: vkd3d Branch: master Commit: 3c4419520621851ecbee2425d4f485007ea0c858 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3c4419520621851ecbee242… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 17 17:26:36 2019 +0200 vkd3d: Reuse Vulkan fences. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 98 ++++++++++++++++++++++++++++++++++++---------- libs/vkd3d/vkd3d_private.h | 3 ++ 2 files changed, 80 insertions(+), 21 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 0d30f43..6410dd2 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -400,7 +400,46 @@ static struct d3d12_fence *impl_from_ID3D12Fence(ID3D12Fence *iface) return CONTAINING_RECORD(iface, struct d3d12_fence, ID3D12Fence_iface); } -#define VKD3D_MAX_VK_SEMAPHORE_COUNT_PER_D3D12_FENCE 4 +static VkResult d3d12_fence_create_vk_fence(struct d3d12_fence *fence, VkFence *vk_fence) +{ + const struct vkd3d_vk_device_procs *vk_procs; + struct d3d12_device *device = fence->device; + VkFenceCreateInfo fence_info; + unsigned int i; + VkResult vr; + int rc; + + if ((rc = pthread_mutex_lock(&fence->mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); + goto create_fence; + } + + for (i = 0; i < ARRAY_SIZE(fence->old_vk_fences); ++i) + { + if ((*vk_fence = fence->old_vk_fences[i])) + { + fence->old_vk_fences[i] = VK_NULL_HANDLE; + break; + } + } + + pthread_mutex_unlock(&fence->mutex); + + if (*vk_fence) + return VK_SUCCESS; + +create_fence: + vk_procs = &device->vk_procs; + + fence_info.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO; + fence_info.pNext = NULL; + fence_info.flags = 0; + if ((vr = VK_CALL(vkCreateFence(device->vk_device, &fence_info, NULL, vk_fence))) < 0) + *vk_fence = VK_NULL_HANDLE; + + return vr; +} static void d3d12_fence_destroy_vk_semaphores_locked(struct d3d12_fence *fence, bool destroy_all) { @@ -411,12 +450,12 @@ static void d3d12_fence_destroy_vk_semaphores_locked(struct d3d12_fence *fence, unsigned int i, j; semaphore_count = fence->semaphore_count; - if (!destroy_all && fence->semaphore_count < VKD3D_MAX_VK_SEMAPHORE_COUNT_PER_D3D12_FENCE) + if (!destroy_all && fence->semaphore_count < VKD3D_MAX_VK_SYNC_OBJECTS_PER_D3D12_FENCE) return; for (i = 0, j = 0; i < fence->semaphore_count; ++i) { - if (!destroy_all && semaphore_count < VKD3D_MAX_VK_SEMAPHORE_COUNT_PER_D3D12_FENCE) + if (!destroy_all && semaphore_count < VKD3D_MAX_VK_SYNC_OBJECTS_PER_D3D12_FENCE) break; /* The semaphore doesn't have a pending signal operation if the fence @@ -447,8 +486,12 @@ static void d3d12_fence_destroy_vk_semaphores_locked(struct d3d12_fence *fence, fence->semaphore_count = j; } -static void d3d12_fence_destroy_vk_semaphores(struct d3d12_fence *fence) +static void d3d12_fence_destroy_vk_objects(struct d3d12_fence *fence) { + const struct vkd3d_vk_device_procs *vk_procs; + struct d3d12_device *device = fence->device; + unsigned int i; + int rc; if ((rc = pthread_mutex_lock(&fence->mutex))) @@ -457,6 +500,15 @@ static void d3d12_fence_destroy_vk_semaphores(struct d3d12_fence *fence) return; } + vk_procs = &device->vk_procs; + + for (i = 0; i < ARRAY_SIZE(fence->old_vk_fences); ++i) + { + if (fence->old_vk_fences[i]) + VK_CALL(vkDestroyFence(device->vk_device, fence->old_vk_fences[i], NULL)); + fence->old_vk_fences[i] = VK_NULL_HANDLE; + } + d3d12_fence_destroy_vk_semaphores_locked(fence, true); pthread_mutex_unlock(&fence->mutex); @@ -504,12 +556,6 @@ static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkF unsigned int i, j; int rc; - if (vk_fence) - { - const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; - VK_CALL(vkDestroyFence(device->vk_device, vk_fence, NULL)); - } - if ((rc = pthread_mutex_lock(&fence->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); @@ -537,6 +583,8 @@ static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkF if (vk_fence) { + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + for (i = 0; i < fence->semaphore_count; ++i) { struct vkd3d_signaled_semaphore *current = &fence->semaphores[i]; @@ -544,6 +592,19 @@ static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkF if (current->vk_fence == vk_fence) current->vk_fence = VK_NULL_HANDLE; } + + for (i = 0; i < ARRAY_SIZE(fence->old_vk_fences); ++i) + { + if (fence->old_vk_fences[i] == VK_NULL_HANDLE) + { + fence->old_vk_fences[i] = vk_fence; + VK_CALL(vkResetFences(device->vk_device, 1, &vk_fence)); + vk_fence = VK_NULL_HANDLE; + break; + } + } + if (vk_fence) + VK_CALL(vkDestroyFence(device->vk_device, vk_fence, NULL)); } pthread_mutex_unlock(&fence->mutex); @@ -599,10 +660,9 @@ static ULONG STDMETHODCALLTYPE d3d12_fence_Release(ID3D12Fence *iface) vkd3d_fence_worker_remove_fence(&device->fence_worker, fence); - /* Destroy all Vulkan semaphores associated with this fence. */ - d3d12_fence_destroy_vk_semaphores(fence); - vkd3d_free(fence->semaphores); + d3d12_fence_destroy_vk_objects(fence); + vkd3d_free(fence->semaphores); vkd3d_free(fence->events); if ((rc = pthread_mutex_destroy(&fence->mutex))) ERR("Failed to destroy mutex, error %d.\n", rc); @@ -796,6 +856,8 @@ static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device * fence->semaphores_size = 0; fence->semaphore_count = 0; + memset(fence->old_vk_fences, 0, sizeof(fence->old_vk_fences)); + if (FAILED(hr = vkd3d_private_store_init(&fence->private_store))) { pthread_mutex_destroy(&fence->mutex); @@ -5057,7 +5119,6 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Signal(ID3D12CommandQueue * VkSemaphore vk_semaphore = VK_NULL_HANDLE; VkSemaphoreCreateInfo semaphore_info; VkFence vk_fence = VK_NULL_HANDLE; - VkFenceCreateInfo fence_info; struct d3d12_device *device; struct d3d12_fence *fence; VkSubmitInfo submit_info; @@ -5070,20 +5131,15 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Signal(ID3D12CommandQueue * device = command_queue->device; vk_procs = &device->vk_procs; - /* XXX: It may be a good idea to re-use Vulkan fences/semaphores. */ - fence = unsafe_impl_from_ID3D12Fence(fence_iface); - fence_info.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO; - fence_info.pNext = NULL; - fence_info.flags = 0; - if ((vr = VK_CALL(vkCreateFence(device->vk_device, &fence_info, NULL, &vk_fence))) < 0) + if ((vr = d3d12_fence_create_vk_fence(fence, &vk_fence)) < 0) { WARN("Failed to create Vulkan fence, vr %d.\n", vr); - vk_fence = VK_NULL_HANDLE; goto fail_vkresult; } + /* XXX: It may be a good idea to re-use Vulkan semaphores. */ semaphore_info.sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO; semaphore_info.pNext = NULL; semaphore_info.flags = 0; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 3ca80c0..be0ef2e 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -49,6 +49,7 @@ #define VKD3D_DESCRIPTOR_MAGIC_RTV 0x00565452u #define VKD3D_MAX_SHADER_STAGES 5u +#define VKD3D_MAX_VK_SYNC_OBJECTS_PER_D3D12_FENCE 4 struct d3d12_command_list; struct d3d12_device; @@ -269,6 +270,8 @@ struct d3d12_fence size_t semaphores_size; size_t semaphore_count; + VkFence old_vk_fences[VKD3D_MAX_VK_SYNC_OBJECTS_PER_D3D12_FENCE]; + struct d3d12_device *device; struct vkd3d_private_store private_store;

1 0

Józef Kucia : vkd3d: Signal Vulkan semaphore in d3d12_command_queue_Signal().
by Alexandre Julliard 18 Apr '19

18 Apr '19

Module: vkd3d Branch: master Commit: cf1faaf873b097b4f74b5c25595c7d733f7a76a8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=cf1faaf873b097b4f74b5c2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 17 17:26:35 2019 +0200 vkd3d: Signal Vulkan semaphore in d3d12_command_queue_Signal(). For d3d12_command_queue_Wait(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 219 +++++++++++++++++++++++++++++++++++++++++---- libs/vkd3d/vkd3d_private.h | 9 ++ 2 files changed, 212 insertions(+), 16 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=cf1faaf873b097b4f74…

1 0

Józef Kucia : vkd3d: Differentiate GPU and CPU fence signal operations.
by Alexandre Julliard 18 Apr '19

18 Apr '19

Module: vkd3d Branch: master Commit: 81b33e7129d7b47f6ae6d01eabee1dabdbe00511 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=81b33e7129d7b47f6ae6d01… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 17 17:26:34 2019 +0200 vkd3d: Differentiate GPU and CPU fence signal operations. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 109 ++++++++++++++++++++++++++++----------------- libs/vkd3d/vkd3d_private.h | 6 +-- 2 files changed, 71 insertions(+), 44 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index b9deffe..6c9b145 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -19,6 +19,8 @@ #include "vkd3d_private.h" +static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkFence vk_fence); + HRESULT vkd3d_queue_create(struct d3d12_device *device, uint32_t family_index, const VkQueueFamilyProperties *properties, struct vkd3d_queue **queue) { @@ -80,7 +82,7 @@ void vkd3d_queue_release(struct vkd3d_queue *queue) /* Fence worker thread */ static HRESULT vkd3d_enqueue_gpu_fence(struct vkd3d_fence_worker *worker, - VkFence vk_fence, ID3D12Fence *fence, UINT64 value) + VkFence vk_fence, struct d3d12_fence *fence, uint64_t value) { int rc; @@ -118,7 +120,7 @@ static HRESULT vkd3d_enqueue_gpu_fence(struct vkd3d_fence_worker *worker, return S_OK; } -static void vkd3d_fence_worker_remove_fence(struct vkd3d_fence_worker *worker, ID3D12Fence *fence) +static void vkd3d_fence_worker_remove_fence(struct vkd3d_fence_worker *worker, struct d3d12_fence *fence) { struct d3d12_device *device = worker->device; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; @@ -156,6 +158,7 @@ static void vkd3d_wait_for_gpu_fences(struct vkd3d_fence_worker *worker) struct d3d12_device *device = worker->device; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; unsigned int i, j; + VkFence vk_fence; HRESULT hr; int vr; @@ -174,12 +177,13 @@ static void vkd3d_wait_for_gpu_fences(struct vkd3d_fence_worker *worker) for (i = 0, j = 0; i < worker->fence_count; ++i) { - if (!(vr = VK_CALL(vkGetFenceStatus(device->vk_device, worker->vk_fences[i])))) + vk_fence = worker->vk_fences[i]; + if (!(vr = VK_CALL(vkGetFenceStatus(device->vk_device, vk_fence)))) { struct vkd3d_waiting_fence *current = &worker->fences[i]; - if (FAILED(hr = ID3D12Fence_Signal(current->fence, current->value))) - ERR("Failed to signal D3D12 fence, hr %d.\n", hr); - VK_CALL(vkDestroyFence(device->vk_device, worker->vk_fences[i], NULL)); + TRACE("Signaling fence %p value %#"PRIx64".\n", current->fence, current->value); + if (FAILED(hr = d3d12_fence_signal(current->fence, current->value, vk_fence))) + ERR("Failed to signal D3D12 fence, hr %#x.\n", hr); continue; } @@ -373,6 +377,48 @@ static struct d3d12_fence *impl_from_ID3D12Fence(ID3D12Fence *iface) return CONTAINING_RECORD(iface, struct d3d12_fence, ID3D12Fence_iface); } +static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkFence vk_fence) +{ + struct d3d12_device *device = fence->device; + unsigned int i, j; + int rc; + + if (vk_fence) + { + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + VK_CALL(vkDestroyFence(device->vk_device, vk_fence, NULL)); + } + + if ((rc = pthread_mutex_lock(&fence->mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); + return hresult_from_errno(rc); + } + + fence->value = value; + + for (i = 0, j = 0; i < fence->event_count; ++i) + { + struct vkd3d_waiting_event *current = &fence->events[i]; + + if (current->value <= value) + { + fence->device->signal_event(current->event); + } + else + { + if (i != j) + fence->events[j] = *current; + ++j; + } + } + fence->event_count = j; + + pthread_mutex_unlock(&fence->mutex); + + return S_OK; +} + static HRESULT STDMETHODCALLTYPE d3d12_fence_QueryInterface(ID3D12Fence *iface, REFIID riid, void **object) { @@ -419,7 +465,7 @@ static ULONG STDMETHODCALLTYPE d3d12_fence_Release(ID3D12Fence *iface) vkd3d_private_store_destroy(&fence->private_store); - vkd3d_fence_worker_remove_fence(&device->fence_worker, iface); + vkd3d_fence_worker_remove_fence(&device->fence_worker, fence); vkd3d_free(fence->events); if ((rc = pthread_mutex_destroy(&fence->mutex))) @@ -554,39 +600,10 @@ static HRESULT STDMETHODCALLTYPE d3d12_fence_SetEventOnCompletion(ID3D12Fence *i static HRESULT STDMETHODCALLTYPE d3d12_fence_Signal(ID3D12Fence *iface, UINT64 value) { struct d3d12_fence *fence = impl_from_ID3D12Fence(iface); - unsigned int i, j; - int rc; TRACE("iface %p, value %#"PRIx64".\n", iface, value); - if ((rc = pthread_mutex_lock(&fence->mutex))) - { - ERR("Failed to lock mutex, error %d.\n", rc); - return hresult_from_errno(rc); - } - - fence->value = value; - - for (i = 0, j = 0; i < fence->event_count; ++i) - { - struct vkd3d_waiting_event *current = &fence->events[i]; - - if (current->value <= value) - { - fence->device->signal_event(current->event); - } - else - { - if (i != j) - fence->events[j] = *current; - ++j; - } - } - fence->event_count = j; - - pthread_mutex_unlock(&fence->mutex); - - return S_OK; + return d3d12_fence_signal(fence, value, VK_NULL_HANDLE); } static const struct ID3D12FenceVtbl d3d12_fence_vtbl = @@ -608,6 +625,14 @@ static const struct ID3D12FenceVtbl d3d12_fence_vtbl = d3d12_fence_Signal, }; +static struct d3d12_fence *unsafe_impl_from_ID3D12Fence(ID3D12Fence *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d12_fence_vtbl); + return impl_from_ID3D12Fence(iface); +} + static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device *device, UINT64 initial_value, D3D12_FENCE_FLAGS flags) { @@ -4886,21 +4911,24 @@ static void STDMETHODCALLTYPE d3d12_command_queue_EndEvent(ID3D12CommandQueue *i } static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Signal(ID3D12CommandQueue *iface, - ID3D12Fence *fence, UINT64 value) + ID3D12Fence *fence_iface, UINT64 value) { struct d3d12_command_queue *command_queue = impl_from_ID3D12CommandQueue(iface); const struct vkd3d_vk_device_procs *vk_procs; VkFenceCreateInfo fence_info; struct d3d12_device *device; + struct d3d12_fence *fence; VkFence vk_fence; VkQueue vk_queue; VkResult vr; - TRACE("iface %p, fence %p, value %#"PRIx64".\n", iface, fence, value); + TRACE("iface %p, fence %p, value %#"PRIx64".\n", iface, fence_iface, value); device = command_queue->device; vk_procs = &device->vk_procs; + fence = unsafe_impl_from_ID3D12Fence(fence_iface); + fence_info.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO; fence_info.pNext = NULL; fence_info.flags = 0; @@ -4929,8 +4957,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Signal(ID3D12CommandQueue * vr = VK_CALL(vkGetFenceStatus(device->vk_device, vk_fence)); if (vr == VK_SUCCESS) { - VK_CALL(vkDestroyFence(device->vk_device, vk_fence, NULL)); - return d3d12_fence_Signal(fence, value); + return d3d12_fence_signal(fence, value, vk_fence); } if (vr != VK_NOT_READY) { diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 76fec70..68a51c0 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -147,7 +147,7 @@ struct vkd3d_fence_worker size_t vk_fences_size; struct vkd3d_waiting_fence { - ID3D12Fence *fence; + struct d3d12_fence *fence; UINT64 value; } *fences; size_t fences_size; @@ -249,12 +249,12 @@ struct d3d12_fence ID3D12Fence ID3D12Fence_iface; LONG refcount; - UINT64 value; + uint64_t value; pthread_mutex_t mutex; struct vkd3d_waiting_event { - UINT64 value; + uint64_t value; HANDLE event; } *events; size_t events_size;

1 0

Nikolay Sivov : ntdll/tests: Add some tests for thread suspend/resume.
by Alexandre Julliard 15 Apr '19

15 Apr '19

Module: wine Branch: master Commit: f9301c2b66450a1cdd986e9052fcaa76535ba8b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9301c2b66450a1cdd986e90… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 12 10:51:21 2019 +0300 ntdll/tests: Add some tests for thread suspend/resume. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 57 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index accb5d8..b7bf274 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -3135,6 +3135,61 @@ static void test_vectored_continue_handler(void) } #endif /* defined(__i386__) || defined(__x86_64__) */ +static DWORD WINAPI suspend_thread_test( void *arg ) +{ + HANDLE event = arg; + WaitForSingleObject(event, INFINITE); + return 0; +} + +static void test_suspend_thread(void) +{ + HANDLE thread, event; + NTSTATUS status; + ULONG count; + DWORD ret; + + status = NtSuspendThread(0, NULL); + ok(status == STATUS_INVALID_HANDLE, "Unexpected return value %#x.\n", status); + + status = NtResumeThread(0, NULL); + ok(status == STATUS_INVALID_HANDLE, "Unexpected return value %#x.\n", status); + + event = CreateEventW(NULL, FALSE, FALSE, NULL); + + thread = CreateThread(NULL, 0, suspend_thread_test, event, 0, NULL); + ok(thread != NULL, "Failed to create a thread.\n"); + + ret = WaitForSingleObject(thread, 0); + ok(ret == WAIT_TIMEOUT, "Unexpected status %d.\n", ret); + + status = NtResumeThread(thread, NULL); + ok(!status, "Unexpected status %#x.\n", status); + + status = NtResumeThread(thread, &count); + ok(!status, "Unexpected status %#x.\n", status); + ok(count == 0, "Unexpected suspended count %u.\n", count); + + status = NtSuspendThread(thread, NULL); + ok(!status, "Failed to suspend a thread, status %#x.\n", status); + + status = NtSuspendThread(thread, &count); + ok(!status, "Failed to suspend a thread, status %#x.\n", status); + ok(count == 1, "Unexpected suspended count %u.\n", count); + + status = NtResumeThread(thread, &count); + ok(!status, "Failed to resume a thread, status %#x.\n", status); + ok(count == 2, "Unexpected suspended count %u.\n", count); + + status = NtResumeThread(thread, NULL); + ok(!status, "Failed to resume a thread, status %#x.\n", status); + + SetEvent(event); + WaitForSingleObject(thread, INFINITE); + + CloseHandle(thread); +} + START_TEST(exception) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -3253,6 +3308,7 @@ START_TEST(exception) test_dpe_exceptions(); test_prot_fault(); test_thread_context(); + test_suspend_thread(); #elif defined(__x86_64__) pRtlAddFunctionTable = (void *)GetProcAddress( hntdll, @@ -3294,6 +3350,7 @@ START_TEST(exception) test_prot_fault(); test_dpe_exceptions(); test_wow64_context(); + test_suspend_thread(); if (pRtlAddFunctionTable && pRtlDeleteFunctionTable && pRtlInstallFunctionTableCallback && pRtlLookupFunctionEntry) test_dynamic_unwind();

1 0

Józef Kucia : d3d9: Fix memory leak in device_init() (Coverity).
by Alexandre Julliard 15 Apr '19

15 Apr '19

Module: wine Branch: master Commit: a4f547a6a97afa4ba6717d2df977a7381261c298 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4f547a6a97afa4ba6717d2d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 15 14:37:44 2019 +0200 d3d9: Fix memory leak in device_init() (Coverity). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 9999691..bef01a4 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -4547,6 +4547,7 @@ HRESULT device_init(struct d3d9_device *device, struct d3d9 *parent, struct wine wined3d_swapchain_decref(d3d_swapchain->wined3d_swapchain); wined3d_device_release_focus_window(device->wined3d_device); wined3d_device_decref(device->wined3d_device); + heap_free(swapchain_desc); wined3d_mutex_unlock(); return E_OUTOFMEMORY; }

1 0

Nikolay Sivov : dwrite/layout: Fix invalid index access to cluster array.
by Alexandre Julliard 15 Apr '19

15 Apr '19

Module: wine Branch: master Commit: 571ffaf380f3d80da60ff8bca4031baceefa7811 URL: https://source.winehq.org/git/wine.git/?a=commit;h=571ffaf380f3d80da60ff8bc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 15 18:22:46 2019 +0300 dwrite/layout: Fix invalid index access to cluster array. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45543 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 4cd5ce4..d101a5a 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1853,6 +1853,9 @@ static void layout_add_line(struct dwrite_textlayout *layout, UINT32 first_clust metrics.trailingWhitespaceLength += cluster->length; trailingspacewidth += cluster->width; + + if (index == 0) + break; } /* Line metrics length includes trailing whitespace length too */

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
81
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2019