Merge pull request #11334 from AdmiralCurtiss/globals-fifo

VideoCommon/Fifo: Refactor to class, move to Core::System.

1 files changed, 6 insertions, 5 deletions

diff --git a/Source/Core/VideoCommon/OpcodeDecoding.cpp b/Source/Core/VideoCommon/OpcodeDecoding.cpp
index d14bb46e6c..3cf16eb8ad 100644
--- a/Source/Core/VideoCommon/OpcodeDecoding.cpp
+++ b/Source/Core/VideoCommon/OpcodeDecoding.cpp
@@ -151,13 +151,14 @@ public:
     {
       m_in_display_list = true;
 
+      auto& system = Core::System::GetInstance();
+
       if constexpr (is_preprocess)
       {
-        auto& system = Core::System::GetInstance();
         auto& memory = system.GetMemory();
         const u8* const start_address = memory.GetPointer(address);
 
-        Fifo::PushFifoAuxBuffer(start_address, size);
+        system.GetFifo().PushFifoAuxBuffer(start_address, size);
 
         if (start_address != nullptr)
         {
@@ -168,13 +169,13 @@ public:
       {
         const u8* start_address;
 
-        if (Fifo::UseDeterministicGPUThread())
+        auto& fifo = system.GetFifo();
+        if (fifo.UseDeterministicGPUThread())
         {
-          start_address = static_cast<u8*>(Fifo::PopFifoAuxBuffer(size));
+          start_address = static_cast<u8*>(fifo.PopFifoAuxBuffer(size));
         }
         else
         {
-          auto& system = Core::System::GetInstance();
           auto& memory = system.GetMemory();
           start_address = memory.GetPointer(address);
         }