From 8a0f5ea04a276afcf3f76a038b0d3d88415ecad9 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Thu, 13 May 2021 19:30:30 +0200 Subject: Remove all remaining volatile qualifiers --- Source/Core/VideoCommon/Fifo.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'Source/Core/VideoCommon/Fifo.cpp') diff --git a/Source/Core/VideoCommon/Fifo.cpp b/Source/Core/VideoCommon/Fifo.cpp index f12776449c..cfc126cfc1 100644 --- a/Source/Core/VideoCommon/Fifo.cpp +++ b/Source/Core/VideoCommon/Fifo.cpp @@ -139,7 +139,7 @@ void Shutdown() void ExitGpuLoop() { // This should break the wait loop in CPU thread - CommandProcessor::fifo.bFF_GPReadEnable = false; + CommandProcessor::fifo.bFF_GPReadEnable.store(0, std::memory_order_relaxed); FlushGpu(); // Terminate GPU thread loop @@ -327,7 +327,8 @@ void RunGpuLoop() CommandProcessor::SetCPStatusFromGPU(); // check if we are able to run this buffer - while (!CommandProcessor::IsInterruptWaiting() && fifo.bFF_GPReadEnable && + while (!CommandProcessor::IsInterruptWaiting() && + fifo.bFF_GPReadEnable.load(std::memory_order_relaxed) && fifo.CPReadWriteDistance.load(std::memory_order_relaxed) && !AtBreakpoint()) { if (param.bSyncGPU && s_sync_ticks.load() < param.iSyncGpuMinDistance) @@ -415,8 +416,9 @@ void GpuMaySleep() bool AtBreakpoint() { CommandProcessor::SCPFifoStruct& fifo = CommandProcessor::fifo; - return fifo.bFF_BPEnable && (fifo.CPReadPointer.load(std::memory_order_relaxed) == - fifo.CPBreakpoint.load(std::memory_order_relaxed)); + return fifo.bFF_BPEnable.load(std::memory_order_relaxed) && + (fifo.CPReadPointer.load(std::memory_order_relaxed) == + fifo.CPBreakpoint.load(std::memory_order_relaxed)); } void RunGpu() @@ -446,8 +448,9 @@ static int RunGpuOnCpu(int ticks) CommandProcessor::SCPFifoStruct& fifo = CommandProcessor::fifo; bool reset_simd_state = false; int available_ticks = int(ticks * SConfig::GetInstance().fSyncGpuOverclock) + s_sync_ticks.load(); - while (fifo.bFF_GPReadEnable && fifo.CPReadWriteDistance.load(std::memory_order_relaxed) && - !AtBreakpoint() && available_ticks >= 0) + while (fifo.bFF_GPReadEnable.load(std::memory_order_relaxed) && + fifo.CPReadWriteDistance.load(std::memory_order_relaxed) && !AtBreakpoint() && + available_ticks >= 0) { if (s_use_deterministic_gpu_thread) { -- cgit v1.2.3