diff options
author | bunnei <bunneidev@gmail.com> | 2019-03-09 20:06:51 +0100 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2019-03-21 03:36:03 +0100 |
commit | 197dcf0b5e426993f760374353cafb07126d45b2 (patch) | |
tree | 058086bf8b9a529617ba7c3466f0b14071242402 /src/video_core/memory_manager.h | |
parent | gl_rasterizer_cache: Check that backing memory is valid before creating a surface. (diff) | |
download | yuzu-197dcf0b5e426993f760374353cafb07126d45b2.tar yuzu-197dcf0b5e426993f760374353cafb07126d45b2.tar.gz yuzu-197dcf0b5e426993f760374353cafb07126d45b2.tar.bz2 yuzu-197dcf0b5e426993f760374353cafb07126d45b2.tar.lz yuzu-197dcf0b5e426993f760374353cafb07126d45b2.tar.xz yuzu-197dcf0b5e426993f760374353cafb07126d45b2.tar.zst yuzu-197dcf0b5e426993f760374353cafb07126d45b2.zip |
Diffstat (limited to 'src/video_core/memory_manager.h')
-rw-r--r-- | src/video_core/memory_manager.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/video_core/memory_manager.h b/src/video_core/memory_manager.h index ac1b42936..76fa3d916 100644 --- a/src/video_core/memory_manager.h +++ b/src/video_core/memory_manager.h @@ -46,19 +46,19 @@ public: MemoryManager(); GPUVAddr AllocateSpace(u64 size, u64 align); - GPUVAddr AllocateSpace(GPUVAddr gpu_addr, u64 size, u64 align); + GPUVAddr AllocateSpace(GPUVAddr addr, u64 size, u64 align); GPUVAddr MapBufferEx(GPUVAddr cpu_addr, u64 size); - GPUVAddr MapBufferEx(GPUVAddr cpu_addr, GPUVAddr gpu_addr, u64 size); - GPUVAddr UnmapBuffer(GPUVAddr gpu_addr, u64 size); - std::optional<VAddr> GpuToCpuAddress(GPUVAddr gpu_addr); + GPUVAddr MapBufferEx(GPUVAddr cpu_addr, GPUVAddr addr, u64 size); + GPUVAddr UnmapBuffer(GPUVAddr addr, u64 size); + std::optional<VAddr> GpuToCpuAddress(GPUVAddr addr); template <typename T> - T Read(GPUVAddr vaddr); + T Read(GPUVAddr addr); template <typename T> - void Write(GPUVAddr vaddr, T data); + void Write(GPUVAddr addr, T data); - u8* GetPointer(GPUVAddr vaddr); + u8* GetPointer(GPUVAddr addr); void ReadBlock(GPUVAddr src_addr, void* dest_buffer, std::size_t size); void WriteBlock(GPUVAddr dest_addr, const void* src_buffer, std::size_t size); @@ -69,6 +69,7 @@ private: using VMAHandle = VMAMap::const_iterator; using VMAIter = VMAMap::iterator; + bool IsAddressValid(GPUVAddr addr) const; void MapPages(GPUVAddr base, u64 size, u8* memory, Common::PageType type, VAddr backing_addr = 0); void MapMemoryRegion(GPUVAddr base, u64 size, u8* target, VAddr backing_addr); |