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: Always enqueue execute operations, even when they can be executed right away.

Browse Source 
The goal is to simplify the CS queue handling: with this and the following
changes operations are always started by d3d12_command_queue_flush_ops(),
in order to make further refactoring easier.

Notice that while with this change executing an operation on an empty CS
queue is a bit less efficient, it doesn't require more locking. On the other
hand, this change paves the road for executing CS operations without holding
the queue lock.
This commit is contained in:
Giovanni Mascellani 2023-02-08 17:08:50 +01:00 committed by Alexandre Julliard
parent 0c6df49560
commit 0d329ba168
Notes: Alexandre Julliard 2023-03-08 21:51:20 +01:00 
Approved-by: Conor McCarthy (@cmccarthy)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/94
1 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
libs/vkd3d/command.c
View File

@ -27,6 +27,7 @@ static void d3d12_fence_signal_timeline_semaphore(struct d3d12_fence *fence, uin
static HRESULT d3d12_command_queue_signal(struct d3d12_command_queue *command_queue,
struct d3d12_fence *fence, uint64_t value);
static HRESULT d3d12_command_queue_flush_ops(struct d3d12_command_queue *queue, bool *flushed_any);
static HRESULT d3d12_command_queue_flush_ops_locked(struct d3d12_command_queue *queue, bool *flushed_any);
HRESULT vkd3d_queue_create(struct d3d12_device *device,
uint32_t family_index, const VkQueueFamilyProperties *properties, struct vkd3d_queue **queue)
@ -6147,6 +6148,18 @@ static void d3d12_command_queue_execute(struct d3d12_command_queue *command_queu
vkd3d_free(buffers);
}
static void d3d12_command_queue_submit_locked(struct d3d12_command_queue *queue)
{
bool flushed_any = false;
HRESULT hr;
if (queue->ops_count == 1)
{
if (FAILED(hr = d3d12_command_queue_flush_ops_locked(queue, &flushed_any)))
ERR("Cannot flush queue, hr %#x.\n", hr);
}
}
static void STDMETHODCALLTYPE d3d12_command_queue_ExecuteCommandLists(ID3D12CommandQueue *iface,
UINT command_list_count, ID3D12CommandList * const *command_lists)
{
@ -6185,13 +6198,6 @@ static void STDMETHODCALLTYPE d3d12_command_queue_ExecuteCommandLists(ID3D12Comm
vkd3d_mutex_lock(&command_queue->op_mutex);
if (!command_queue->ops_count)
{
d3d12_command_queue_execute(command_queue, buffers, command_list_count);
vkd3d_mutex_unlock(&command_queue->op_mutex);
return;
}
if (!(op = d3d12_command_queue_require_space_locked(command_queue)))
{
ERR("Failed to add op.\n");
@ -6201,6 +6207,8 @@ static void STDMETHODCALLTYPE d3d12_command_queue_ExecuteCommandLists(ID3D12Comm
op->u.execute.buffers = buffers;
op->u.execute.buffer_count = command_list_count;
d3d12_command_queue_submit_locked(command_queue);
vkd3d_mutex_unlock(&command_queue->op_mutex);
return;
}
@ -6769,13 +6777,9 @@ static const struct ID3D12CommandQueueVtbl d3d12_command_queue_vtbl =
d3d12_command_queue_GetDesc,
};
/* flushed_any is initialised by the caller. */
static HRESULT d3d12_command_queue_flush_ops(struct d3d12_command_queue *queue, bool *flushed_any)
{
struct vkd3d_cs_op_data *op;
struct d3d12_fence *fence;
HRESULT hr = S_OK;
unsigned int i;
HRESULT hr;
if (!queue->ops_count)
return S_OK;
@ -6788,6 +6792,21 @@ static HRESULT d3d12_command_queue_flush_ops(struct d3d12_command_queue *queue,
vkd3d_mutex_lock(&queue->op_mutex);
hr = d3d12_command_queue_flush_ops_locked(queue, flushed_any);
vkd3d_mutex_unlock(&queue->op_mutex);
return hr;
}
/* flushed_any is initialised by the caller. */
static HRESULT d3d12_command_queue_flush_ops_locked(struct d3d12_command_queue *queue, bool *flushed_any)
{
struct vkd3d_cs_op_data *op;
struct d3d12_fence *fence;
HRESULT hr = S_OK;
unsigned int i;
/* Currently only required for d3d12_command_queue_signal(), but set it here anyway. */
queue->is_flushing = true;
@ -6832,7 +6851,6 @@ static HRESULT d3d12_command_queue_flush_ops(struct d3d12_command_queue *queue,
done:
queue->is_flushing = false;
vkd3d_mutex_unlock(&queue->op_mutex);
return hr;
}