diff options
author | Liam <byteslice@airmail.cc> | 2023-03-24 00:58:48 +0100 |
---|---|---|
committer | Liam <byteslice@airmail.cc> | 2023-03-24 01:28:47 +0100 |
commit | 41d99aa89db7ee483112e49baa6c86e14adbd168 (patch) | |
tree | 085ba1f2eb6a75c2b93d70834cc20d4b14f4d10f /src/video_core | |
parent | Merge pull request #9971 from Morph1984/q (diff) | |
download | yuzu-41d99aa89db7ee483112e49baa6c86e14adbd168.tar yuzu-41d99aa89db7ee483112e49baa6c86e14adbd168.tar.gz yuzu-41d99aa89db7ee483112e49baa6c86e14adbd168.tar.bz2 yuzu-41d99aa89db7ee483112e49baa6c86e14adbd168.tar.lz yuzu-41d99aa89db7ee483112e49baa6c86e14adbd168.tar.xz yuzu-41d99aa89db7ee483112e49baa6c86e14adbd168.tar.zst yuzu-41d99aa89db7ee483112e49baa6c86e14adbd168.zip |
Diffstat (limited to 'src/video_core')
-rw-r--r-- | src/video_core/memory_manager.cpp | 2 | ||||
-rw-r--r-- | src/video_core/video_core.cpp | 2 |
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: |