Merge pull request #9707 from JosJuice/remove-atomic-header

Remove Atomic.h

1 files changed, 9 insertions, 7 deletions

diff --git a/Source/Core/VideoCommon/CommandProcessor.h b/Source/Core/VideoCommon/CommandProcessor.h
index c246d5651d..bc0a8ede49 100644
--- a/Source/Core/VideoCommon/CommandProcessor.h
+++ b/Source/Core/VideoCommon/CommandProcessor.h
@@ -4,6 +4,8 @@
 
 #pragma once
 
+#include <atomic>
+
 #include "Common/CommonTypes.h"
 
 class PointerWrap;
@@ -17,15 +19,15 @@ namespace CommandProcessor
 struct SCPFifoStruct
 {
   // fifo registers
-  volatile u32 CPBase;
-  volatile u32 CPEnd;
+  std::atomic<u32> CPBase;
+  std::atomic<u32> CPEnd;
   u32 CPHiWatermark;
   u32 CPLoWatermark;
-  volatile u32 CPReadWriteDistance;
-  volatile u32 CPWritePointer;
-  volatile u32 CPReadPointer;
-  volatile u32 CPBreakpoint;
-  volatile u32 SafeCPReadPointer;
+  std::atomic<u32> CPReadWriteDistance;
+  std::atomic<u32> CPWritePointer;
+  std::atomic<u32> CPReadPointer;
+  std::atomic<u32> CPBreakpoint;
+  std::atomic<u32> SafeCPReadPointer;
 
   volatile u32 bFF_GPLinkEnable;
   volatile u32 bFF_GPReadEnable;