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: Leave the command queue op mutex locked after a partial flush.

Browse Source 
All return paths in d3d12_command_queue_flush_ops_locked() must
leave the op mutex locked.
This commit is contained in:
Conor McCarthy 2023-04-05 00:54:51 +10:00 committed by Alexandre Julliard
parent 57d92a15cf
commit 7b9b0179ec
Notes: Alexandre Julliard 2023-05-03 21:51:00 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/194
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libs/vkd3d/command.c
View File

@ -6781,16 +6781,16 @@ static bool d3d12_command_queue_op_array_append(struct d3d12_command_queue_op_ar
return true; return true;
} }
static HRESULT d3d12_command_queue_fixup_after_flush(struct d3d12_command_queue *queue, unsigned int done_count) static void d3d12_command_queue_delete_aux_ops(struct d3d12_command_queue *queue,
unsigned int done_count)
{ {
HRESULT hr;
queue->aux_op_queue.count -= done_count; queue->aux_op_queue.count -= done_count;
memmove(queue->aux_op_queue.ops, &queue->aux_op_queue.ops[done_count], memmove(queue->aux_op_queue.ops, &queue->aux_op_queue.ops[done_count],
queue->aux_op_queue.count * sizeof(*queue->aux_op_queue.ops)); queue->aux_op_queue.count * sizeof(*queue->aux_op_queue.ops));
}
vkd3d_mutex_lock(&queue->op_mutex); static HRESULT d3d12_command_queue_fixup_after_flush_locked(struct d3d12_command_queue *queue)
{
d3d12_command_queue_swap_queues(queue); d3d12_command_queue_swap_queues(queue);
d3d12_command_queue_op_array_append(&queue->op_queue, queue->aux_op_queue.count, queue->aux_op_queue.ops); d3d12_command_queue_op_array_append(&queue->op_queue, queue->aux_op_queue.count, queue->aux_op_queue.ops);
@ -6798,11 +6798,7 @@ static HRESULT d3d12_command_queue_fixup_after_flush(struct d3d12_command_queue
queue->aux_op_queue.count = 0; queue->aux_op_queue.count = 0;
queue->is_flushing = false; queue->is_flushing = false;
hr = d3d12_command_queue_record_as_blocked(queue); return d3d12_command_queue_record_as_blocked(queue);
vkd3d_mutex_unlock(&queue->op_mutex);
return hr;
} }
static HRESULT d3d12_command_queue_flush_ops(struct d3d12_command_queue *queue, bool *flushed_any) static HRESULT d3d12_command_queue_flush_ops(struct d3d12_command_queue *queue, bool *flushed_any)
@ -6855,7 +6851,9 @@ static HRESULT d3d12_command_queue_flush_ops_locked(struct d3d12_command_queue *
if (op->u.wait.value > fence->max_pending_value) if (op->u.wait.value > fence->max_pending_value)
{ {
vkd3d_mutex_unlock(&fence->mutex); vkd3d_mutex_unlock(&fence->mutex);
return d3d12_command_queue_fixup_after_flush(queue, i); d3d12_command_queue_delete_aux_ops(queue, i);
vkd3d_mutex_lock(&queue->op_mutex);
return d3d12_command_queue_fixup_after_flush_locked(queue);
} }
d3d12_command_queue_wait_locked(queue, fence, op->u.wait.value); d3d12_command_queue_wait_locked(queue, fence, op->u.wait.value);
d3d12_fence_decref(fence); d3d12_fence_decref(fence);