Merge pull request #11320 from AdmiralCurtiss/globals-memory

HW/Memmap: Refactor Memory to class, move to Core::System.

1 files changed, 5 insertions, 1 deletions

diff --git a/Source/Core/VideoBackends/Software/TextureSampler.cpp b/Source/Core/VideoBackends/Software/TextureSampler.cpp
index 0ba340c33a..d5222384f0 100644
--- a/Source/Core/VideoBackends/Software/TextureSampler.cpp
+++ b/Source/Core/VideoBackends/Software/TextureSampler.cpp
@@ -9,6 +9,7 @@
 #include "Common/CommonTypes.h"
 #include "Common/MsgHandler.h"
 #include "Core/HW/Memmap.h"
+#include "Core/System.h"
 
 #include "VideoCommon/BPMemory.h"
 #include "VideoCommon/TextureDecoder.h"
@@ -132,8 +133,11 @@ void SampleMip(s32 s, s32 t, s32 mip, bool linear, u8 texmap, u8* sample)
   }
   else
   {
+    auto& system = Core::System::GetInstance();
+    auto& memory = system.GetMemory();
+
     const u32 imageBase = texUnit.texImage3.image_base << 5;
-    imageSrc = Memory::GetPointer(imageBase);
+    imageSrc = memory.GetPointer(imageBase);
   }
 
   int image_width_minus_1 = ti0.width;