wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-04-13 05:43:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d: Do not read max_pending_value without holding the fence's mutex.

Browse Source
This commit is contained in:
Giovanni Mascellani
2023-02-08 14:13:06 +01:00
committed by Alexandre Julliard
parent e076fd9c77
commit df36026633
Notes: Alexandre Julliard 2023-02-13 22:20:19 +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/87
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libs/vkd3d/command.c
View File

@ -6801,13 +6801,14 @@ static bool d3d12_command_queue_flush_ops(struct d3d12_command_queue *queue, boo
{ {
case VKD3D_CS_OP_WAIT: case VKD3D_CS_OP_WAIT:
fence = op->u.wait.fence; fence = op->u.wait.fence;
vkd3d_mutex_lock(&fence->mutex);
if (op->u.wait.value > fence->max_pending_value) if (op->u.wait.value > fence->max_pending_value)
{ {
vkd3d_mutex_unlock(&fence->mutex);
queue->ops_count -= i; queue->ops_count -= i;
memmove(queue->ops, op, queue->ops_count * sizeof(*op)); memmove(queue->ops, op, queue->ops_count * sizeof(*op));
goto done; goto done;
} }
vkd3d_mutex_lock(&fence->mutex);
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);
break; break;