Merge pull request #11320 from AdmiralCurtiss/globals-memory

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

1 files changed, 4 insertions, 1 deletions

diff --git a/Source/Core/VideoCommon/TextureInfo.cpp b/Source/Core/VideoCommon/TextureInfo.cpp
index 1d3371f7fc..35441d4d36 100644
--- a/Source/Core/VideoCommon/TextureInfo.cpp
+++ b/Source/Core/VideoCommon/TextureInfo.cpp
@@ -8,6 +8,7 @@
 
 #include "Common/Align.h"
 #include "Core/HW/Memmap.h"
+#include "Core/System.h"
 #include "VideoCommon/BPMemory.h"
 #include "VideoCommon/TextureDecoder.h"
 
@@ -44,7 +45,9 @@ TextureInfo TextureInfo::FromStage(u32 stage)
                        &texMem[tmem_address_even], mip_count);
   }
 
-  return TextureInfo(stage, Memory::GetPointer(address), tlut_ptr, address, texture_format,
+  auto& system = Core::System::GetInstance();
+  auto& memory = system.GetMemory();
+  return TextureInfo(stage, memory.GetPointer(address), tlut_ptr, address, texture_format,
                      tlut_format, width, height, false, nullptr, nullptr, mip_count);
 }