diff options
| author | Lioncash <mathew1800@gmail.com> | 2018-07-24 17:19:51 +0200 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2018-07-24 17:19:54 +0200 |
| commit | d71e19fd753b58981c7b28af887f0fe1166d2973 (patch) | |
| tree | 48d16ad0e00fdd9999b194244263b8914b493a55 | |
| parent | Merge pull request #798 from lioncash/const (diff) | |
| download | yuzu-d71e19fd753b58981c7b28af887f0fe1166d2973.tar yuzu-d71e19fd753b58981c7b28af887f0fe1166d2973.tar.gz yuzu-d71e19fd753b58981c7b28af887f0fe1166d2973.tar.bz2 yuzu-d71e19fd753b58981c7b28af887f0fe1166d2973.tar.lz yuzu-d71e19fd753b58981c7b28af887f0fe1166d2973.tar.xz yuzu-d71e19fd753b58981c7b28af887f0fe1166d2973.tar.zst yuzu-d71e19fd753b58981c7b28af887f0fe1166d2973.zip | |
| -rw-r--r-- | src/video_core/memory_manager.cpp | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/src/video_core/memory_manager.cpp b/src/video_core/memory_manager.cpp index 2f814a184..98a6ca040 100644 --- a/src/video_core/memory_manager.cpp +++ b/src/video_core/memory_manager.cpp @@ -13,8 +13,10 @@ GPUVAddr MemoryManager::AllocateSpace(u64 size, u64 align) { ASSERT(gpu_addr); for (u64 offset = 0; offset < size; offset += PAGE_SIZE) { - ASSERT(PageSlot(*gpu_addr + offset) == static_cast<u64>(PageStatus::Unmapped)); - PageSlot(*gpu_addr + offset) = static_cast<u64>(PageStatus::Allocated); + VAddr& slot = PageSlot(*gpu_addr + offset); + + ASSERT(slot == static_cast<u64>(PageStatus::Unmapped)); + slot = static_cast<u64>(PageStatus::Allocated); } return *gpu_addr; @@ -22,8 +24,10 @@ GPUVAddr MemoryManager::AllocateSpace(u64 size, u64 align) { GPUVAddr MemoryManager::AllocateSpace(GPUVAddr gpu_addr, u64 size, u64 align) { for (u64 offset = 0; offset < size; offset += PAGE_SIZE) { - ASSERT(PageSlot(gpu_addr + offset) == static_cast<u64>(PageStatus::Unmapped)); - PageSlot(gpu_addr + offset) = static_cast<u64>(PageStatus::Allocated); + VAddr& slot = PageSlot(gpu_addr + offset); + + ASSERT(slot == static_cast<u64>(PageStatus::Unmapped)); + slot = static_cast<u64>(PageStatus::Allocated); } return gpu_addr; @@ -34,8 +38,10 @@ GPUVAddr MemoryManager::MapBufferEx(VAddr cpu_addr, u64 size) { ASSERT(gpu_addr); for (u64 offset = 0; offset < size; offset += PAGE_SIZE) { - ASSERT(PageSlot(*gpu_addr + offset) == static_cast<u64>(PageStatus::Unmapped)); - PageSlot(*gpu_addr + offset) = cpu_addr + offset; + VAddr& slot = PageSlot(*gpu_addr + offset); + + ASSERT(slot == static_cast<u64>(PageStatus::Unmapped)); + slot = cpu_addr + offset; } MappedRegion region{cpu_addr, *gpu_addr, size}; @@ -48,8 +54,10 @@ GPUVAddr MemoryManager::MapBufferEx(VAddr cpu_addr, GPUVAddr gpu_addr, u64 size) ASSERT((gpu_addr & PAGE_MASK) == 0); for (u64 offset = 0; offset < size; offset += PAGE_SIZE) { - ASSERT(PageSlot(gpu_addr + offset) == static_cast<u64>(PageStatus::Allocated)); - PageSlot(gpu_addr + offset) = cpu_addr + offset; + VAddr& slot = PageSlot(gpu_addr + offset); + + ASSERT(slot == static_cast<u64>(PageStatus::Allocated)); + slot = cpu_addr + offset; } MappedRegion region{cpu_addr, gpu_addr, size}; @@ -62,9 +70,11 @@ GPUVAddr MemoryManager::UnmapBuffer(GPUVAddr gpu_addr, u64 size) { ASSERT((gpu_addr & PAGE_MASK) == 0); for (u64 offset = 0; offset < size; offset += PAGE_SIZE) { - ASSERT(PageSlot(gpu_addr + offset) != static_cast<u64>(PageStatus::Allocated) && - PageSlot(gpu_addr + offset) != static_cast<u64>(PageStatus::Unmapped)); - PageSlot(gpu_addr + offset) = static_cast<u64>(PageStatus::Unmapped); + VAddr& slot = PageSlot(gpu_addr + offset); + + ASSERT(slot != static_cast<u64>(PageStatus::Allocated) && + slot != static_cast<u64>(PageStatus::Unmapped)); + slot = static_cast<u64>(PageStatus::Unmapped); } // Delete the region mappings that are contained within the unmapped region |