summaryrefslogtreecommitdiffstats
path: root/src/video_core
diff options
context:
space:
mode:
authorliamwhite <liamwhite@users.noreply.github.com>2023-03-27 18:16:40 +0200
committerGitHub <noreply@github.com>2023-03-27 18:16:40 +0200
commit0661f5ccd1704935dc9c49521a79cc26832db3b0 (patch)
treee0923dd40e8dd0f6ec92a2de7722f911bd26c514 /src/video_core
parentMerge pull request #9995 from german77/plain (diff)
parentmemory: rename global memory references to application memory (diff)
downloadyuzu-0661f5ccd1704935dc9c49521a79cc26832db3b0.tar
yuzu-0661f5ccd1704935dc9c49521a79cc26832db3b0.tar.gz
yuzu-0661f5ccd1704935dc9c49521a79cc26832db3b0.tar.bz2
yuzu-0661f5ccd1704935dc9c49521a79cc26832db3b0.tar.lz
yuzu-0661f5ccd1704935dc9c49521a79cc26832db3b0.tar.xz
yuzu-0661f5ccd1704935dc9c49521a79cc26832db3b0.tar.zst
yuzu-0661f5ccd1704935dc9c49521a79cc26832db3b0.zip
Diffstat (limited to 'src/video_core')
-rw-r--r--src/video_core/memory_manager.cpp2
-rw-r--r--src/video_core/video_core.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/video_core/memory_manager.cpp b/src/video_core/memory_manager.cpp
index 83924475b..015a7d3c1 100644
--- a/src/video_core/memory_manager.cpp
+++ b/src/video_core/memory_manager.cpp
@@ -22,7 +22,7 @@ std::atomic<size_t> MemoryManager::unique_identifier_generator{};
MemoryManager::MemoryManager(Core::System& system_, u64 address_space_bits_, u64 big_page_bits_,
u64 page_bits_)
- : system{system_}, memory{system.Memory()}, device_memory{system.DeviceMemory()},
+ : system{system_}, memory{system.ApplicationMemory()}, device_memory{system.DeviceMemory()},
address_space_bits{address_space_bits_}, page_bits{page_bits_}, big_page_bits{big_page_bits_},
entries{}, big_entries{}, page_table{address_space_bits, address_space_bits + page_bits - 38,
page_bits != big_page_bits ? page_bits : 0},
diff --git a/src/video_core/video_core.cpp b/src/video_core/video_core.cpp
index fedb4a7bb..b42d48416 100644
--- a/src/video_core/video_core.cpp
+++ b/src/video_core/video_core.cpp
@@ -18,7 +18,7 @@ std::unique_ptr<VideoCore::RendererBase> CreateRenderer(
Core::System& system, Core::Frontend::EmuWindow& emu_window, Tegra::GPU& gpu,
std::unique_ptr<Core::Frontend::GraphicsContext> context) {
auto& telemetry_session = system.TelemetrySession();
- auto& cpu_memory = system.Memory();
+ auto& cpu_memory = system.ApplicationMemory();
switch (Settings::values.renderer_backend.GetValue()) {
case Settings::RendererBackend::OpenGL: