summaryrefslogtreecommitdiff
path: root/Source/Core/VideoCommon/Fifo.cpp
diff options
context:
space:
mode:
authorJules Blok <jules.blok@gmail.com>2016-11-10 17:55:21 +0100
committerJules Blok <jules.blok@gmail.com>2016-11-11 13:37:02 +0100
commit8203ea929b5981b8413c342e6bbfb7467f3c2a0d (patch)
treea019d29c96705917cf695ef3fd1d1db5b25e6f79 /Source/Core/VideoCommon/Fifo.cpp
parente8af48adfca6e6fb291c5c715af1562569dc1bd3 (diff)
BlockingLoop: Yield to UI message pump while waiting.
Diffstat (limited to 'Source/Core/VideoCommon/Fifo.cpp')
-rw-r--r--Source/Core/VideoCommon/Fifo.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/Source/Core/VideoCommon/Fifo.cpp b/Source/Core/VideoCommon/Fifo.cpp
index 374ddb07f3..678dc77687 100644
--- a/Source/Core/VideoCommon/Fifo.cpp
+++ b/Source/Core/VideoCommon/Fifo.cpp
@@ -18,6 +18,7 @@
#include "Core/CoreTiming.h"
#include "Core/HW/Memmap.h"
#include "Core/HW/SystemTimers.h"
+#include "Core/Host.h"
#include "Core/NetPlayProto.h"
#include "VideoCommon/AsyncRequests.h"
@@ -94,7 +95,13 @@ void PauseAndLock(bool doLock, bool unpauseOnUnlock)
{
SyncGPU(SyncGPUReason::Other);
EmulatorState(false);
- FlushGpu();
+
+ const SConfig& param = SConfig::GetInstance();
+
+ if (!param.bCPUThread || s_use_deterministic_gpu_thread)
+ return;
+
+ s_gpu_mainloop.WaitYield(std::chrono::milliseconds(100), Host_YieldToUI);
}
else
{