mirrors
/
vkd3d-proton
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vkd3d: Create semaphores for sparse binding operations. 

Signed-off-by: Philip Rebohle <philip.rebohle@tu-dortmund.de>
This commit is contained in:
Philip Rebohle 2020-05-06 14:49:06 +02:00 committed by Hans-Kristian Arntzen
parent 902ab95ba6
commit 73bcd3e79d
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libs/vkd3d/command.c
View File

@ -6450,6 +6450,7 @@ static ULONG STDMETHODCALLTYPE d3d12_command_queue_Release(ID3D12CommandQueue *i
if (!refcount)
{
struct d3d12_device *device = command_queue->device;
const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
vkd3d_private_store_destroy(&command_queue->private_store);
@ -6458,6 +6459,9 @@ static ULONG STDMETHODCALLTYPE d3d12_command_queue_Release(ID3D12CommandQueue *i
pthread_mutex_destroy(&command_queue->queue_lock);
pthread_cond_destroy(&command_queue->queue_cond);
VK_CALL(vkDestroySemaphore(device->vk_device, command_queue->sparse_binding_signal.vk_semaphore, NULL));
VK_CALL(vkDestroySemaphore(device->vk_device, command_queue->sparse_binding_wait.vk_semaphore, NULL));
vkd3d_free(command_queue->submissions);
vkd3d_free(command_queue);
@ -7380,6 +7384,7 @@ static void *d3d12_command_queue_submission_worker_main(void *userdata)
static HRESULT d3d12_command_queue_init(struct d3d12_command_queue *queue,
struct d3d12_device *device, const D3D12_COMMAND_QUEUE_DESC *desc)
{
const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs;
HRESULT hr;
int rc;
@ -7402,10 +7407,19 @@ static HRESULT d3d12_command_queue_init(struct d3d12_command_queue *queue,
queue->drain_count = 0;
queue->queue_drain_count = 0;
if (FAILED(hr = vkd3d_create_timeline_semaphore(device, 0, &queue->sparse_binding_wait.vk_semaphore)))
goto fail;
if (FAILED(hr = vkd3d_create_timeline_semaphore(device, 0, &queue->sparse_binding_signal.vk_semaphore)))
goto fail_signal_semaphore;
queue->sparse_binding_wait.last_signaled = 0;
queue->sparse_binding_signal.last_signaled = 0;
if ((rc = pthread_mutex_init(&queue->queue_lock, NULL)) < 0)
{
hr = hresult_from_errno(rc);
goto fail;
goto fail_pthread_mutex;
}
if ((rc = pthread_cond_init(&queue->queue_cond, NULL)) < 0)
@ -7441,6 +7455,10 @@ fail_pthread_create:
pthread_cond_destroy(&queue->queue_cond);
fail_pthread_cond:
pthread_mutex_destroy(&queue->queue_lock);
fail_pthread_mutex:
VK_CALL(vkDestroySemaphore(device->vk_device, queue->sparse_binding_signal.vk_semaphore, NULL));
fail_signal_semaphore:
VK_CALL(vkDestroySemaphore(device->vk_device, queue->sparse_binding_wait.vk_semaphore, NULL));
fail:
return hr;
}

9
libs/vkd3d/vkd3d_private.h
View File

@ -1314,6 +1314,12 @@ struct d3d12_command_queue_submission
} u;
};
struct vkd3d_timeline_semaphore
{
VkSemaphore vk_semaphore;
uint64_t last_signaled;
};
/* ID3D12CommandQueue */
struct d3d12_command_queue
{
@ -1336,6 +1342,9 @@ struct d3d12_command_queue
uint64_t drain_count;
uint64_t queue_drain_count;
struct vkd3d_timeline_semaphore sparse_binding_wait;
struct vkd3d_timeline_semaphore sparse_binding_signal;
struct vkd3d_private_store private_store;
};