diff options
author | Michael Scire <SciresM@gmail.com> | 2019-07-09 07:19:27 +0200 |
---|---|---|
committer | Michael Scire <SciresM@gmail.com> | 2019-07-09 07:52:05 +0200 |
commit | 697206092e8ac28c7dfe83eff0eea6613082740c (patch) | |
tree | 587b19d4fbf727a88524fefff496c2c12d9f7f97 /src/core | |
parent | Remove unused member function declaration (diff) | |
download | yuzu-697206092e8ac28c7dfe83eff0eea6613082740c.tar yuzu-697206092e8ac28c7dfe83eff0eea6613082740c.tar.gz yuzu-697206092e8ac28c7dfe83eff0eea6613082740c.tar.bz2 yuzu-697206092e8ac28c7dfe83eff0eea6613082740c.tar.lz yuzu-697206092e8ac28c7dfe83eff0eea6613082740c.tar.xz yuzu-697206092e8ac28c7dfe83eff0eea6613082740c.tar.zst yuzu-697206092e8ac28c7dfe83eff0eea6613082740c.zip |
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/hle/kernel/vm_manager.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/core/hle/kernel/vm_manager.cpp b/src/core/hle/kernel/vm_manager.cpp index 775d170bf..72a9d7717 100644 --- a/src/core/hle/kernel/vm_manager.cpp +++ b/src/core/hle/kernel/vm_manager.cpp @@ -51,6 +51,11 @@ bool VirtualMemoryArea::CanBeMergedWith(const VirtualMemoryArea& next) const { type != next.type) { return false; } + if ((attribute & MemoryAttribute::DeviceMapped) == MemoryAttribute::DeviceMapped) { + // TODO: Can device mapped memory be merged sanely? + // Not merging it may cause inaccuracies versus hardware when memory layout is queried. + return false; + } if (type == VMAType::AllocatedMemoryBlock) { return true; } |