summaryrefslogtreecommitdiff
path: root/Source/Core/VideoCommon/PixelEngine.cpp
diff options
context:
space:
mode:
authorPierre Bourdon <delroth@gmail.com>2016-08-11 16:18:14 +0200
committerGitHub <noreply@github.com>2016-08-11 16:18:14 +0200
commitcef71afc2758702ed9bc03daac27b7e811ca9a50 (patch)
treeb10fb11abb93b724bff082e69e449e3c514c340e /Source/Core/VideoCommon/PixelEngine.cpp
parentc6fed0565df2d4a1fad2db7c537fbfab4491a924 (diff)
parent3443a1003089459029bf42ead4c5aabc9898be90 (diff)
Merge pull request #3987 from JosJuice/scheduleevent-cleanup
CoreTiming: ScheduleEvent cleanup
Diffstat (limited to 'Source/Core/VideoCommon/PixelEngine.cpp')
-rw-r--r--Source/Core/VideoCommon/PixelEngine.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/Core/VideoCommon/PixelEngine.cpp b/Source/Core/VideoCommon/PixelEngine.cpp
index f774b54064..f5c0dea0a4 100644
--- a/Source/Core/VideoCommon/PixelEngine.cpp
+++ b/Source/Core/VideoCommon/PixelEngine.cpp
@@ -277,10 +277,11 @@ static void RaiseEvent()
return;
s_event_raised = true;
+
+ CoreTiming::FromThread from = CoreTiming::FromThread::NON_CPU;
if (!SConfig::GetInstance().bCPUThread || Fifo::UseDeterministicGPUThread())
- CoreTiming::ScheduleEvent(0, et_SetTokenFinishOnMainThread, 0);
- else
- CoreTiming::ScheduleEvent_Threadsafe(0, et_SetTokenFinishOnMainThread, 0);
+ from = CoreTiming::FromThread::CPU;
+ CoreTiming::ScheduleEvent(0, et_SetTokenFinishOnMainThread, 0, from);
}
// SetToken