diff options
author | Lioncash <mathew1800@gmail.com> | 2020-05-03 19:29:06 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2020-05-03 19:29:42 +0200 |
commit | dfa582169bfeec61f0e4c01545a7e3c290210d0d (patch) | |
tree | 6cf19daa9407ac65f22a4a2e6ca3725776047fe2 /src/core/hle/kernel/memory | |
parent | settings: Add anisotropic filtering level to the yuzu configuration log (#3875) (diff) | |
download | yuzu-dfa582169bfeec61f0e4c01545a7e3c290210d0d.tar yuzu-dfa582169bfeec61f0e4c01545a7e3c290210d0d.tar.gz yuzu-dfa582169bfeec61f0e4c01545a7e3c290210d0d.tar.bz2 yuzu-dfa582169bfeec61f0e4c01545a7e3c290210d0d.tar.lz yuzu-dfa582169bfeec61f0e4c01545a7e3c290210d0d.tar.xz yuzu-dfa582169bfeec61f0e4c01545a7e3c290210d0d.tar.zst yuzu-dfa582169bfeec61f0e4c01545a7e3c290210d0d.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/kernel/memory/memory_manager.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/kernel/memory/memory_manager.cpp b/src/core/hle/kernel/memory/memory_manager.cpp index 3cd4f9e85..6b432e1b2 100644 --- a/src/core/hle/kernel/memory/memory_manager.cpp +++ b/src/core/hle/kernel/memory/memory_manager.cpp @@ -104,9 +104,9 @@ ResultCode MemoryManager::Allocate(PageLinkedList& page_list, std::size_t num_pa // Ensure that we don't leave anything un-freed auto group_guard = detail::ScopeExit([&] { for (const auto& it : page_list.Nodes()) { - const auto num_pages{std::min( + const auto min_num_pages{std::min( it.GetNumPages(), (chosen_manager.GetEndAddress() - it.GetAddress()) / PageSize)}; - chosen_manager.Free(it.GetAddress(), num_pages); + chosen_manager.Free(it.GetAddress(), min_num_pages); } }); @@ -165,9 +165,9 @@ ResultCode MemoryManager::Free(PageLinkedList& page_list, std::size_t num_pages, // Free all of the pages for (const auto& it : page_list.Nodes()) { - const auto num_pages{std::min( + const auto min_num_pages{std::min( it.GetNumPages(), (chosen_manager.GetEndAddress() - it.GetAddress()) / PageSize)}; - chosen_manager.Free(it.GetAddress(), num_pages); + chosen_manager.Free(it.GetAddress(), min_num_pages); } return RESULT_SUCCESS; |