diff options
author | bunnei <bunneidev@gmail.com> | 2019-03-21 04:12:28 +0100 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2019-03-21 04:12:28 +0100 |
commit | 2117edd0f848cd7bc35bdbb1495ca10649715625 (patch) | |
tree | 6befcf08e4457543fc3fab9b9fc1deb2a76d6783 /src/video_core/memory_manager.cpp | |
parent | memory_manager: Use Common::AlignUp in public interface as needed. (diff) | |
download | yuzu-2117edd0f848cd7bc35bdbb1495ca10649715625.tar yuzu-2117edd0f848cd7bc35bdbb1495ca10649715625.tar.gz yuzu-2117edd0f848cd7bc35bdbb1495ca10649715625.tar.bz2 yuzu-2117edd0f848cd7bc35bdbb1495ca10649715625.tar.lz yuzu-2117edd0f848cd7bc35bdbb1495ca10649715625.tar.xz yuzu-2117edd0f848cd7bc35bdbb1495ca10649715625.tar.zst yuzu-2117edd0f848cd7bc35bdbb1495ca10649715625.zip |
Diffstat (limited to '')
-rw-r--r-- | src/video_core/memory_manager.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/video_core/memory_manager.cpp b/src/video_core/memory_manager.cpp index 6dc133c93..e76b59842 100644 --- a/src/video_core/memory_manager.cpp +++ b/src/video_core/memory_manager.cpp @@ -30,8 +30,7 @@ MemoryManager::MemoryManager() { GPUVAddr MemoryManager::AllocateSpace(u64 size, u64 align) { const u64 aligned_size{Common::AlignUp(size, page_size)}; - const GPUVAddr gpu_addr{ - FindFreeRegion(address_space_base, aligned_size, align, VirtualMemoryArea::Type::Unmapped)}; + const GPUVAddr gpu_addr{FindFreeRegion(address_space_base, aligned_size)}; AllocateMemory(gpu_addr, 0, aligned_size); @@ -48,8 +47,7 @@ GPUVAddr MemoryManager::AllocateSpace(GPUVAddr gpu_addr, u64 size, u64 align) { GPUVAddr MemoryManager::MapBufferEx(VAddr cpu_addr, u64 size) { const u64 aligned_size{Common::AlignUp(size, page_size)}; - const GPUVAddr gpu_addr{FindFreeRegion(address_space_base, aligned_size, page_size, - VirtualMemoryArea::Type::Unmapped)}; + const GPUVAddr gpu_addr{FindFreeRegion(address_space_base, aligned_size)}; MapBackingMemory(gpu_addr, Memory::GetPointer(cpu_addr), aligned_size, cpu_addr); @@ -79,14 +77,10 @@ GPUVAddr MemoryManager::UnmapBuffer(GPUVAddr gpu_addr, u64 size) { return gpu_addr; } -GPUVAddr MemoryManager::FindFreeRegion(GPUVAddr region_start, u64 size, u64 align, - VirtualMemoryArea::Type vma_type) { - - align = (align + page_mask) & ~page_mask; - +GPUVAddr MemoryManager::FindFreeRegion(GPUVAddr region_start, u64 size) { // Find the first Free VMA. const VMAHandle vma_handle{std::find_if(vma_map.begin(), vma_map.end(), [&](const auto& vma) { - if (vma.second.type != vma_type) { + if (vma.second.type != VirtualMemoryArea::Type::Unmapped) { return false; } |