wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d: Do not store the latch bit in an object that could be overwritten.

Browse Source 
Once a event is signaled, the corresponding struct vkd3d_waiting_event
entry is considered dead and could be overwritten, so it's not safe to
keep a pointer to it in d3d12_fence_SetEventOnCompletion(). Instead,
keep the latch bit in d3d12_fence_SetEventOnCompletion() and put a
pointer to it in struct vkd3d_waiting_event.
This commit is contained in:
Giovanni Mascellani 2022-08-09 14:05:24 +02:00 committed by Alexandre Julliard
parent 4afe69d04a
commit 4112c36076
Notes: Alexandre Julliard 2022-10-18 00:13:00 +02:00 
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/6
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libs/vkd3d/command.c
View File

@ -851,7 +851,7 @@ static void d3d12_fence_signal_external_events_locked(struct d3d12_fence *fence)
} }
else else
{ {
current->latch = true; *current->latch = true;
signal_null_event_cond = true; signal_null_event_cond = true;
} }
} }
@ -1155,7 +1155,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_fence_SetEventOnCompletion(ID3D12Fence *i
{ {
struct d3d12_fence *fence = impl_from_ID3D12Fence(iface); struct d3d12_fence *fence = impl_from_ID3D12Fence(iface);
unsigned int i; unsigned int i;
bool *latch; bool latch = false;
int rc; int rc;
TRACE("iface %p, value %#"PRIx64", event %p.\n", iface, value, event); TRACE("iface %p, value %#"PRIx64", event %p.\n", iface, value, event);
@ -1196,8 +1196,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_fence_SetEventOnCompletion(ID3D12Fence *i
fence->events[fence->event_count].value = value; fence->events[fence->event_count].value = value;
fence->events[fence->event_count].event = event; fence->events[fence->event_count].event = event;
fence->events[fence->event_count].latch = false; fence->events[fence->event_count].latch = &latch;
latch = &fence->events[fence->event_count].latch;
++fence->event_count; ++fence->event_count;
/* If event is NULL, we need to block until the fence value completes. /* If event is NULL, we need to block until the fence value completes.
@ -1206,7 +1205,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_fence_SetEventOnCompletion(ID3D12Fence *i
* and signal a condition variable instead of calling external signal_event callback. */ * and signal a condition variable instead of calling external signal_event callback. */
if (!event) if (!event)
{ {
while (!*latch) while (!latch)
vkd3d_cond_wait(&fence->null_event_cond, &fence->mutex); vkd3d_cond_wait(&fence->null_event_cond, &fence->mutex);
} }

2
libs/vkd3d/vkd3d_private.h
View File

@ -530,7 +530,7 @@ struct d3d12_fence
{ {
uint64_t value; uint64_t value;
HANDLE event; HANDLE event;
bool latch; bool *latch;
} *events; } *events;
size_t events_size; size_t events_size;
size_t event_count; size_t event_count;