ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vk: Avoid use-after-free fence object

This commit is contained in:
kd-11 2018-06-03 10:26:41 +03:00 committed by kd-11
parent e9c3ab7ae6
commit 1c5667f0ce
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
rpcs3/Emu/RSX/VK/VKGSRender.h
View File

@ -94,14 +94,16 @@ struct command_buffer_chunk: public vk::command_buffer
bool poke()
{
reader_lock lock(guard_mutex);
if (vkGetFenceStatus(m_device, submit_fence) == VK_SUCCESS)
{
std::lock_guard<shared_mutex> lock(guard_mutex);
lock.upgrade();
if (pending)
{
vk::reset_fence(&submit_fence);
pending = false;
vk::reset_fence(&submit_fence);
}
}
@ -110,7 +112,7 @@ struct command_buffer_chunk: public vk::command_buffer
void wait()
{
std::lock_guard<shared_mutex> lock(guard_mutex);
reader_lock lock(guard_mutex);
if (!pending)
return;
@ -124,8 +126,13 @@ struct command_buffer_chunk: public vk::command_buffer
break;
}
vk::reset_fence(&submit_fence);
pending = false;
lock.upgrade();
if (pending)
{
vk::reset_fence(&submit_fence);
pending = false;
}
}
};