mirror of
https://gitlab.winehq.org/wine/vkd3d.git
synced 2025-04-13 05:43:18 -07:00
vkd3d: Use list to store Vulkan semaphores.
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:
committed by
Alexandre Julliard
parent
6801c15330
commit
134f4d0081
@ -446,45 +446,35 @@ static void d3d12_fence_garbage_collect_vk_semaphores_locked(struct d3d12_fence
|
|||||||
{
|
{
|
||||||
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;
|
||||||
VkSemaphore vk_semaphore;
|
struct vkd3d_signaled_semaphore *current, *p;
|
||||||
size_t semaphore_count;
|
unsigned int semaphore_count;
|
||||||
unsigned int i, j;
|
|
||||||
|
|
||||||
semaphore_count = fence->semaphore_count;
|
semaphore_count = fence->semaphore_count;
|
||||||
if (!destroy_all && 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)
|
LIST_FOR_EACH_ENTRY_SAFE(current, p, &fence->semaphores, struct vkd3d_signaled_semaphore, entry)
|
||||||
{
|
{
|
||||||
if (!destroy_all && semaphore_count < VKD3D_MAX_VK_SYNC_OBJECTS_PER_D3D12_FENCE)
|
if (!destroy_all && fence->semaphore_count < VKD3D_MAX_VK_SYNC_OBJECTS_PER_D3D12_FENCE)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
/* The semaphore doesn't have a pending signal operation if the fence
|
/* The semaphore doesn't have a pending signal operation if the fence
|
||||||
* was signaled. */
|
* was signaled. */
|
||||||
if (!fence->semaphores[i].vk_fence || destroy_all)
|
if (current->vk_fence && !destroy_all)
|
||||||
{
|
continue;
|
||||||
vk_semaphore = fence->semaphores[i].vk_semaphore;
|
|
||||||
if (fence->semaphores[i].vk_fence)
|
if (current->vk_fence)
|
||||||
WARN("Destroying potentially pending semaphore.\n");
|
WARN("Destroying potentially pending semaphore.\n");
|
||||||
VK_CALL(vkDestroySemaphore(device->vk_device, vk_semaphore, NULL));
|
|
||||||
--semaphore_count;
|
VK_CALL(vkDestroySemaphore(device->vk_device, current->vk_semaphore, NULL));
|
||||||
}
|
list_remove(¤t->entry);
|
||||||
else
|
vkd3d_free(current);
|
||||||
{
|
|
||||||
if (i != j)
|
--fence->semaphore_count;
|
||||||
fence->semaphores[j] = fence->semaphores[i];
|
|
||||||
++j;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for (; i < fence->semaphore_count; ++i)
|
|
||||||
{
|
|
||||||
fence->semaphores[j++] = fence->semaphores[i];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (j != fence->semaphore_count)
|
if (semaphore_count != fence->semaphore_count)
|
||||||
TRACE("Destroyed %zu Vulkan semaphores.\n", fence->semaphore_count - j);
|
TRACE("Destroyed %u Vulkan semaphores.\n", semaphore_count - fence->semaphore_count);
|
||||||
|
|
||||||
fence->semaphore_count = j;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void d3d12_fence_destroy_vk_objects(struct d3d12_fence *fence)
|
static void d3d12_fence_destroy_vk_objects(struct d3d12_fence *fence)
|
||||||
@ -517,32 +507,33 @@ static void d3d12_fence_destroy_vk_objects(struct d3d12_fence *fence)
|
|||||||
static HRESULT d3d12_fence_add_vk_semaphore(struct d3d12_fence *fence,
|
static HRESULT d3d12_fence_add_vk_semaphore(struct d3d12_fence *fence,
|
||||||
VkSemaphore vk_semaphore, VkFence vk_fence, uint64_t value)
|
VkSemaphore vk_semaphore, VkFence vk_fence, uint64_t value)
|
||||||
{
|
{
|
||||||
|
struct vkd3d_signaled_semaphore *semaphore;
|
||||||
HRESULT hr = S_OK;
|
HRESULT hr = S_OK;
|
||||||
int rc;
|
int rc;
|
||||||
|
|
||||||
TRACE("fence %p, value %#"PRIx64".\n", fence, value);
|
TRACE("fence %p, value %#"PRIx64".\n", fence, value);
|
||||||
|
|
||||||
|
if (!(semaphore = vkd3d_malloc(sizeof(*semaphore))))
|
||||||
|
{
|
||||||
|
ERR("Failed to add semaphore.\n");
|
||||||
|
return E_OUTOFMEMORY;
|
||||||
|
}
|
||||||
|
|
||||||
if ((rc = pthread_mutex_lock(&fence->mutex)))
|
if ((rc = pthread_mutex_lock(&fence->mutex)))
|
||||||
{
|
{
|
||||||
ERR("Failed to lock mutex, error %d.\n", rc);
|
ERR("Failed to lock mutex, error %d.\n", rc);
|
||||||
|
vkd3d_free(semaphore);
|
||||||
return E_FAIL;
|
return E_FAIL;
|
||||||
}
|
}
|
||||||
|
|
||||||
d3d12_fence_garbage_collect_vk_semaphores_locked(fence, false);
|
d3d12_fence_garbage_collect_vk_semaphores_locked(fence, false);
|
||||||
|
|
||||||
if (vkd3d_array_reserve((void **)&fence->semaphores, &fence->semaphores_size,
|
semaphore->value = value;
|
||||||
fence->semaphore_count + 1, sizeof(*fence->semaphores)))
|
semaphore->vk_semaphore = vk_semaphore;
|
||||||
{
|
semaphore->vk_fence = vk_fence;
|
||||||
fence->semaphores[fence->semaphore_count].value = value;
|
|
||||||
fence->semaphores[fence->semaphore_count].vk_semaphore = vk_semaphore;
|
list_add_tail(&fence->semaphores, &semaphore->entry);
|
||||||
fence->semaphores[fence->semaphore_count].vk_fence = vk_fence;
|
|
||||||
++fence->semaphore_count;
|
++fence->semaphore_count;
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
ERR("Failed to add semaphore.\n");
|
|
||||||
hr = E_OUTOFMEMORY;
|
|
||||||
}
|
|
||||||
|
|
||||||
pthread_mutex_unlock(&fence->mutex);
|
pthread_mutex_unlock(&fence->mutex);
|
||||||
|
|
||||||
@ -552,6 +543,7 @@ static HRESULT d3d12_fence_add_vk_semaphore(struct d3d12_fence *fence,
|
|||||||
static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkFence vk_fence)
|
static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkFence vk_fence)
|
||||||
{
|
{
|
||||||
struct d3d12_device *device = fence->device;
|
struct d3d12_device *device = fence->device;
|
||||||
|
struct vkd3d_signaled_semaphore *current;
|
||||||
unsigned int i, j;
|
unsigned int i, j;
|
||||||
int rc;
|
int rc;
|
||||||
|
|
||||||
@ -584,10 +576,8 @@ static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkF
|
|||||||
{
|
{
|
||||||
const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
|
const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
|
||||||
|
|
||||||
for (i = 0; i < fence->semaphore_count; ++i)
|
LIST_FOR_EACH_ENTRY(current, &fence->semaphores, struct vkd3d_signaled_semaphore, entry)
|
||||||
{
|
{
|
||||||
struct vkd3d_signaled_semaphore *current = &fence->semaphores[i];
|
|
||||||
|
|
||||||
if (current->vk_fence == vk_fence)
|
if (current->vk_fence == vk_fence)
|
||||||
current->vk_fence = VK_NULL_HANDLE;
|
current->vk_fence = VK_NULL_HANDLE;
|
||||||
}
|
}
|
||||||
@ -661,7 +651,6 @@ static ULONG STDMETHODCALLTYPE d3d12_fence_Release(ID3D12Fence *iface)
|
|||||||
|
|
||||||
d3d12_fence_destroy_vk_objects(fence);
|
d3d12_fence_destroy_vk_objects(fence);
|
||||||
|
|
||||||
vkd3d_free(fence->semaphores);
|
|
||||||
vkd3d_free(fence->events);
|
vkd3d_free(fence->events);
|
||||||
if ((rc = pthread_mutex_destroy(&fence->mutex)))
|
if ((rc = pthread_mutex_destroy(&fence->mutex)))
|
||||||
ERR("Failed to destroy mutex, error %d.\n", rc);
|
ERR("Failed to destroy mutex, error %d.\n", rc);
|
||||||
@ -851,8 +840,8 @@ static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device *
|
|||||||
fence->events = NULL;
|
fence->events = NULL;
|
||||||
fence->events_size = 0;
|
fence->events_size = 0;
|
||||||
fence->event_count = 0;
|
fence->event_count = 0;
|
||||||
fence->semaphores = NULL;
|
|
||||||
fence->semaphores_size = 0;
|
list_init(&fence->semaphores);
|
||||||
fence->semaphore_count = 0;
|
fence->semaphore_count = 0;
|
||||||
|
|
||||||
memset(fence->old_vk_fences, 0, sizeof(fence->old_vk_fences));
|
memset(fence->old_vk_fences, 0, sizeof(fence->old_vk_fences));
|
||||||
|
@ -279,6 +279,14 @@ HRESULT vkd3d_set_private_data(struct vkd3d_private_store *store,
|
|||||||
HRESULT vkd3d_set_private_data_interface(struct vkd3d_private_store *store,
|
HRESULT vkd3d_set_private_data_interface(struct vkd3d_private_store *store,
|
||||||
const GUID *tag, const IUnknown *object) DECLSPEC_HIDDEN;
|
const GUID *tag, const IUnknown *object) DECLSPEC_HIDDEN;
|
||||||
|
|
||||||
|
struct vkd3d_signaled_semaphore
|
||||||
|
{
|
||||||
|
struct list entry;
|
||||||
|
uint64_t value;
|
||||||
|
VkSemaphore vk_semaphore;
|
||||||
|
VkFence vk_fence;
|
||||||
|
};
|
||||||
|
|
||||||
/* ID3D12Fence */
|
/* ID3D12Fence */
|
||||||
struct d3d12_fence
|
struct d3d12_fence
|
||||||
{
|
{
|
||||||
@ -296,14 +304,8 @@ struct d3d12_fence
|
|||||||
size_t events_size;
|
size_t events_size;
|
||||||
size_t event_count;
|
size_t event_count;
|
||||||
|
|
||||||
struct vkd3d_signaled_semaphore
|
struct list semaphores;
|
||||||
{
|
unsigned int semaphore_count;
|
||||||
uint64_t value;
|
|
||||||
VkSemaphore vk_semaphore;
|
|
||||||
VkFence vk_fence;
|
|
||||||
} *semaphores;
|
|
||||||
size_t semaphores_size;
|
|
||||||
size_t semaphore_count;
|
|
||||||
|
|
||||||
VkFence old_vk_fences[VKD3D_MAX_VK_SYNC_OBJECTS_PER_D3D12_FENCE];
|
VkFence old_vk_fences[VKD3D_MAX_VK_SYNC_OBJECTS_PER_D3D12_FENCE];
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user