Merge pull request #9984 from liamwhite/global-memory

memory: rename global memory references to application memory
This commit is contained in:
liamwhite 2023-03-27 12:16:40 -04:00 committed by GitHub
commit 0661f5ccd1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
44 changed files with 186 additions and 227 deletions

View file

@ -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},

View file

@ -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: