wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d: Rename d3d12_fence_destroy_vk_semaphores_locked().

Browse Source 
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2019-04-22 10:58:36 +02:00 committed by Alexandre Julliard
parent 21ab63c4d6
commit 14f9f03fd6
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libs/vkd3d/command.c
View File

@ -441,7 +441,8 @@ create_fence:
return vr; return vr;
} }
static void d3d12_fence_destroy_vk_semaphores_locked(struct d3d12_fence *fence, bool destroy_all) static void d3d12_fence_garbage_collect_vk_semaphores_locked(struct d3d12_fence *fence,
bool destroy_all)
{ {
struct d3d12_device *device = fence->device; struct d3d12_device *device = fence->device;
const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
@ -450,7 +451,7 @@ static void d3d12_fence_destroy_vk_semaphores_locked(struct d3d12_fence *fence,
unsigned int i, j; unsigned int i, j;
semaphore_count = fence->semaphore_count; semaphore_count = fence->semaphore_count;
if (!destroy_all && fence->semaphore_count < VKD3D_MAX_VK_SYNC_OBJECTS_PER_D3D12_FENCE) if (!destroy_all && semaphore_count < VKD3D_MAX_VK_SYNC_OBJECTS_PER_D3D12_FENCE)
return; return;
for (i = 0, j = 0; i < fence->semaphore_count; ++i) for (i = 0, j = 0; i < fence->semaphore_count; ++i)
@ -491,7 +492,6 @@ static void d3d12_fence_destroy_vk_objects(struct d3d12_fence *fence)
const struct vkd3d_vk_device_procs *vk_procs; const struct vkd3d_vk_device_procs *vk_procs;
struct d3d12_device *device = fence->device; struct d3d12_device *device = fence->device;
unsigned int i; unsigned int i;
int rc; int rc;
if ((rc = pthread_mutex_lock(&fence->mutex))) if ((rc = pthread_mutex_lock(&fence->mutex)))
@ -509,7 +509,7 @@ static void d3d12_fence_destroy_vk_objects(struct d3d12_fence *fence)
fence->old_vk_fences[i] = VK_NULL_HANDLE; fence->old_vk_fences[i] = VK_NULL_HANDLE;
} }
d3d12_fence_destroy_vk_semaphores_locked(fence, true); d3d12_fence_garbage_collect_vk_semaphores_locked(fence, true);
pthread_mutex_unlock(&fence->mutex); pthread_mutex_unlock(&fence->mutex);
} }
@ -528,8 +528,7 @@ static HRESULT d3d12_fence_add_vk_semaphore(struct d3d12_fence *fence,
return E_FAIL; return E_FAIL;
} }
/* Destroy old Vulkan semaphores. */ d3d12_fence_garbage_collect_vk_semaphores_locked(fence, false);
d3d12_fence_destroy_vk_semaphores_locked(fence, false);
if (vkd3d_array_reserve((void **)&fence->semaphores, &fence->semaphores_size, if (vkd3d_array_reserve((void **)&fence->semaphores, &fence->semaphores_size,
fence->semaphore_count + 1, sizeof(*fence->semaphores))) fence->semaphore_count + 1, sizeof(*fence->semaphores)))