summaryrefslogtreecommitdiffstats
path: root/src/core/memory.cpp
diff options
context:
space:
mode:
authorFernandoS27 <fsahmkow27@gmail.com>2021-06-06 09:57:24 +0200
committerMarkus Wick <markus@selfnet.de>2021-06-11 17:27:17 +0200
commit5ba28325b262d44fcd7721aa00074955bd794015 (patch)
tree1c388684ccc0ef52b124145cf3dfe98d5d427980 /src/core/memory.cpp
parentcommon/host_memory: Optimize for huge tables. (diff)
downloadyuzu-5ba28325b262d44fcd7721aa00074955bd794015.tar
yuzu-5ba28325b262d44fcd7721aa00074955bd794015.tar.gz
yuzu-5ba28325b262d44fcd7721aa00074955bd794015.tar.bz2
yuzu-5ba28325b262d44fcd7721aa00074955bd794015.tar.lz
yuzu-5ba28325b262d44fcd7721aa00074955bd794015.tar.xz
yuzu-5ba28325b262d44fcd7721aa00074955bd794015.tar.zst
yuzu-5ba28325b262d44fcd7721aa00074955bd794015.zip
Diffstat (limited to 'src/core/memory.cpp')
-rw-r--r--src/core/memory.cpp14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/core/memory.cpp b/src/core/memory.cpp
index 79468e4dc..f285c6f63 100644
--- a/src/core/memory.cpp
+++ b/src/core/memory.cpp
@@ -47,7 +47,9 @@ struct Memory::Impl {
"Out of bounds target: {:016X}", target);
MapPages(page_table, base / PAGE_SIZE, size / PAGE_SIZE, target, Common::PageType::Memory);
- system.DeviceMemory().buffer.Map(base, target - DramMemoryMap::Base, size);
+ if (Settings::IsFastmemEnabled()) {
+ system.DeviceMemory().buffer.Map(base, target - DramMemoryMap::Base, size);
+ }
}
void UnmapRegion(Common::PageTable& page_table, VAddr base, u64 size) {
@@ -55,7 +57,9 @@ struct Memory::Impl {
ASSERT_MSG((base & PAGE_MASK) == 0, "non-page aligned base: {:016X}", base);
MapPages(page_table, base / PAGE_SIZE, size / PAGE_SIZE, 0, Common::PageType::Unmapped);
- system.DeviceMemory().buffer.Unmap(base, size);
+ if (Settings::IsFastmemEnabled()) {
+ system.DeviceMemory().buffer.Unmap(base, size);
+ }
}
bool IsValidVirtualAddress(const Kernel::KProcess& process, const VAddr vaddr) const {
@@ -475,8 +479,10 @@ struct Memory::Impl {
return;
}
- const bool is_read_enable = Settings::IsGPULevelHigh() || !cached;
- system.DeviceMemory().buffer.Protect(vaddr, size, is_read_enable, !cached);
+ if (Settings::IsFastmemEnabled()) {
+ const bool is_read_enable = Settings::IsGPULevelHigh() || !cached;
+ system.DeviceMemory().buffer.Protect(vaddr, size, is_read_enable, !cached);
+ }
// Iterate over a contiguous CPU address space, which corresponds to the specified GPU
// address space, marking the region as un/cached. The region is marked un/cached at a