archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-09 00:11:24 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

rsx: fix potential hang during thread close

Browse source
This commit is contained in:
Jake 2018-01-16 21:51:58 -06:00 • committed by Ani
parent cc0d7c5985
commit 2f414f96bf
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
rpcs3/Emu/RSX/RSXThread.cpp
View file

@ -368,7 +368,7 @@ namespace rsx
vblank_count = 0;
// TODO: exit condition
while (!Emu.IsStopped())
while (!Emu.IsStopped() && !m_rsx_thread_exiting)
{
if (get_system_time() - start_time > vblank_count * 1000000 / 60)
{
@ -389,7 +389,7 @@ namespace rsx
continue;
}
while (Emu.IsPaused())
while (Emu.IsPaused() && !m_rsx_thread_exiting)
std::this_thread::sleep_for(10ms);
std::this_thread::sleep_for(1ms); // hack
@ -772,6 +772,7 @@ namespace rsx
void thread::on_exit()
{
m_rsx_thread_exiting = true;
if (m_vblank_thread)
{
m_vblank_thread->join();
@ -1618,7 +1619,7 @@ namespace rsx
memset(display_buffers, 0, sizeof(display_buffers));
m_used_gcm_commands.clear();
m_rsx_thread_exiting = false;
on_init_rsx();
start_thread(fxm::get<GSRender>());