From 1ba3b4e7ac9d53710454c46ac5384ee44a096b70 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 27 May 2015 03:08:48 -0400 Subject: CommandProcessor: Replace volatile usages with atomics Also remove said variables from being globals. --- Source/Core/VideoCommon/PixelEngine.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'Source/Core/VideoCommon/PixelEngine.cpp') diff --git a/Source/Core/VideoCommon/PixelEngine.cpp b/Source/Core/VideoCommon/PixelEngine.cpp index 9b2c48876b..45db963d23 100644 --- a/Source/Core/VideoCommon/PixelEngine.cpp +++ b/Source/Core/VideoCommon/PixelEngine.cpp @@ -274,14 +274,14 @@ void SetToken_OnMainThread(u64 userdata, int cyclesLate) s_signal_token_interrupt.store(1); UpdateInterrupts(); } - CommandProcessor::interruptTokenWaiting = false; + CommandProcessor::SetInterruptTokenWaiting(false); } void SetFinish_OnMainThread(u64 userdata, int cyclesLate) { s_signal_finish_interrupt.store(1); UpdateInterrupts(); - CommandProcessor::interruptFinishWaiting = false; + CommandProcessor::SetInterruptFinishWaiting(false); } // SetToken @@ -293,7 +293,8 @@ void SetToken(const u16 _token, const int _bSetTokenAcknowledge) s_signal_token_interrupt.store(1); } - CommandProcessor::interruptTokenWaiting = true; + CommandProcessor::SetInterruptTokenWaiting(true); + if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread || g_use_deterministic_gpu_thread) CoreTiming::ScheduleEvent(0, et_SetTokenOnMainThread, _token | (_bSetTokenAcknowledge << 16)); else @@ -304,11 +305,13 @@ void SetToken(const u16 _token, const int _bSetTokenAcknowledge) // THIS IS EXECUTED FROM VIDEO THREAD (BPStructs.cpp) when a new frame has been drawn void SetFinish() { - CommandProcessor::interruptFinishWaiting = true; + CommandProcessor::SetInterruptFinishWaiting(true); + if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread || g_use_deterministic_gpu_thread) CoreTiming::ScheduleEvent(0, et_SetFinishOnMainThread, 0); else CoreTiming::ScheduleEvent_Threadsafe(0, et_SetFinishOnMainThread, 0); + INFO_LOG(PIXELENGINE, "VIDEO Set Finish"); } -- cgit v1.2.3