diff options
| author | bunnei <bunneidev@gmail.com> | 2018-04-21 17:16:21 +0200 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2018-04-24 23:40:43 +0200 |
| commit | 9e11a76e926a7190880063d8fc8c3d97003b9938 (patch) | |
| tree | 13d1749f110f5517ef506e10f575693ea2aa63ca /src/video_core/memory_manager.h | |
| parent | Merge pull request #386 from Subv/gpu_query (diff) | |
| download | yuzu-9e11a76e926a7190880063d8fc8c3d97003b9938.tar yuzu-9e11a76e926a7190880063d8fc8c3d97003b9938.tar.gz yuzu-9e11a76e926a7190880063d8fc8c3d97003b9938.tar.bz2 yuzu-9e11a76e926a7190880063d8fc8c3d97003b9938.tar.lz yuzu-9e11a76e926a7190880063d8fc8c3d97003b9938.tar.xz yuzu-9e11a76e926a7190880063d8fc8c3d97003b9938.tar.zst yuzu-9e11a76e926a7190880063d8fc8c3d97003b9938.zip | |
Diffstat (limited to 'src/video_core/memory_manager.h')
| -rw-r--r-- | src/video_core/memory_manager.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/video_core/memory_manager.h b/src/video_core/memory_manager.h index b73e283f8..4710cb21f 100644 --- a/src/video_core/memory_manager.h +++ b/src/video_core/memory_manager.h @@ -18,20 +18,20 @@ class MemoryManager final { public: MemoryManager() = default; - PAddr AllocateSpace(u64 size, u64 align); - PAddr AllocateSpace(PAddr paddr, u64 size, u64 align); - PAddr MapBufferEx(VAddr vaddr, u64 size); - PAddr MapBufferEx(VAddr vaddr, PAddr paddr, u64 size); - VAddr PhysicalToVirtualAddress(PAddr paddr); + GPUVAddr AllocateSpace(u64 size, u64 align); + GPUVAddr AllocateSpace(GPUVAddr gpu_addr, u64 size, u64 align); + GPUVAddr MapBufferEx(VAddr cpu_addr, u64 size); + GPUVAddr MapBufferEx(VAddr cpu_addr, GPUVAddr gpu_addr, u64 size); + VAddr GpuToCpuAddress(GPUVAddr gpu_addr); static constexpr u64 PAGE_BITS = 16; static constexpr u64 PAGE_SIZE = 1 << PAGE_BITS; static constexpr u64 PAGE_MASK = PAGE_SIZE - 1; private: - boost::optional<PAddr> FindFreeBlock(u64 size, u64 align = 1); - bool IsPageMapped(PAddr paddr); - VAddr& PageSlot(PAddr paddr); + boost::optional<GPUVAddr> FindFreeBlock(u64 size, u64 align = 1); + bool IsPageMapped(GPUVAddr gpu_addr); + VAddr& PageSlot(GPUVAddr gpu_addr); enum class PageStatus : u64 { Unmapped = 0xFFFFFFFFFFFFFFFFULL, |