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

Fix conflicts.

Browse source
This commit is contained in:
Sacha 2014-07-12 17:02:39 +10:00
parent c09b0f511e
commit 9816ec3aa0
35 changed files with 99 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

6
rpcs3/Emu/GS/RSXThread.cpp
View file

@ -2409,7 +2409,7 @@ void RSXThread::Task()
continue;
}
Sleep(1);
std::this_thread::sleep_for(std::chrono::milliseconds(1));
}
is_vblank_stopped = true;
@ -2446,7 +2446,7 @@ void RSXThread::Task()
m_sem_flush.post_and_wait();
}
Sleep(1);
std::this_thread::sleep_for(std::chrono::milliseconds(1));
continue;
}
@ -2510,7 +2510,7 @@ void RSXThread::Task()
while (!is_vblank_stopped)
{
Sleep(1);
std::this_thread::sleep_for(std::chrono::milliseconds(1));
}
LOG_NOTICE(RSX, "RSX thread ended");