wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-04-13 05:43:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d: Always destroy created objects on d3d12_fence_init() failure.

Browse Source 
Signed-off-by: Conor McCarthy <cmccarthy@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Conor McCarthy 2022-05-13 01:11:05 +10:00 committed by Alexandre Julliard
parent 228f7ab5cd
commit a5c63dc4b9
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libs/vkd3d/command.c
View File

@ -1247,6 +1247,7 @@ static struct d3d12_fence *unsafe_impl_from_ID3D12Fence(ID3D12Fence *iface)
static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device *device, static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device *device,
UINT64 initial_value, D3D12_FENCE_FLAGS flags) UINT64 initial_value, D3D12_FENCE_FLAGS flags)
{ {
const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
VkResult vr; VkResult vr;
HRESULT hr; HRESULT hr;
int rc; int rc;
@ -1266,8 +1267,8 @@ static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device *
if ((rc = vkd3d_cond_init(&fence->null_event_cond))) if ((rc = vkd3d_cond_init(&fence->null_event_cond)))
{ {
ERR("Failed to initialize cond variable, error %d.\n", rc); ERR("Failed to initialize cond variable, error %d.\n", rc);
vkd3d_mutex_destroy(&fence->mutex); hr = hresult_from_errno(rc);
return hresult_from_errno(rc); goto fail_destroy_mutex;
} }
if (flags) if (flags)
@ -1282,7 +1283,8 @@ static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device *
&fence->timeline_semaphore)) < 0) &fence->timeline_semaphore)) < 0)
{ {
WARN("Failed to create timeline semaphore, vr %d.\n", vr); WARN("Failed to create timeline semaphore, vr %d.\n", vr);
return hresult_from_vk_result(vr); hr = hresult_from_vk_result(vr);
goto fail_destroy_null_cond;
} }
fence->pending_timeline_value = initial_value; fence->pending_timeline_value = initial_value;
fence->gpu_wait_count = 0; fence->gpu_wait_count = 0;
@ -1295,14 +1297,21 @@ static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device *
if (FAILED(hr = vkd3d_private_store_init(&fence->private_store))) if (FAILED(hr = vkd3d_private_store_init(&fence->private_store)))
{ {
vkd3d_mutex_destroy(&fence->mutex); goto fail_destroy_timeline_semaphore;
vkd3d_cond_destroy(&fence->null_event_cond);
return hr;
} }
d3d12_device_add_ref(fence->device = device); d3d12_device_add_ref(fence->device = device);
return S_OK; return S_OK;
fail_destroy_timeline_semaphore:
VK_CALL(vkDestroySemaphore(device->vk_device, fence->timeline_semaphore, NULL));
fail_destroy_null_cond:
vkd3d_cond_destroy(&fence->null_event_cond);
fail_destroy_mutex:
vkd3d_mutex_destroy(&fence->mutex);
return hr;
} }
HRESULT d3d12_fence_create(struct d3d12_device *device, HRESULT d3d12_fence_create(struct d3d12_device *device,