From 3443a1003089459029bf42ead4c5aabc9898be90 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Thu, 7 Jul 2016 15:52:08 +0200 Subject: 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. --- Source/Core/VideoCommon/PixelEngine.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Source/Core/VideoCommon/PixelEngine.cpp') 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 -- cgit v1.2.3