summaryrefslogtreecommitdiff
path: root/Source/Core/VideoCommon/PixelEngine.cpp
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2016-07-07 15:52:08 +0200
committerJosJuice <josjuice@gmail.com>2016-08-11 12:45:57 +0200
commit3443a1003089459029bf42ead4c5aabc9898be90 (patch)
treed1c42bb2fdad98ab2cc9ca53cc60537a8fb0edd3 /Source/Core/VideoCommon/PixelEngine.cpp
parent088f7eaa3d3719d99a1c40ec6aa0a5a2ea8e585b (diff)
CoreTiming: Merge ScheduleEvent variants into one function
Now Core::IsCPUThread() only gets called once when using the AnyThread variant. Also, I think the enum approach makes calling code clearer.
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