diff options
| author | bunnei <bunneidev@gmail.com> | 2018-04-21 18:31:30 +0200 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2018-04-24 23:49:19 +0200 |
| commit | 239ac8abe228b9080741ba7d50d9e13cc4a1ceae (patch) | |
| tree | 14b6df493ec5ff15faf2c7b71e45fe7d8ebb53df /src/video_core/memory_manager.h | |
| parent | memory_manager: Use GPUVAdddr, not PAddr, for GPU addresses. (diff) | |
| download | yuzu-239ac8abe228b9080741ba7d50d9e13cc4a1ceae.tar yuzu-239ac8abe228b9080741ba7d50d9e13cc4a1ceae.tar.gz yuzu-239ac8abe228b9080741ba7d50d9e13cc4a1ceae.tar.bz2 yuzu-239ac8abe228b9080741ba7d50d9e13cc4a1ceae.tar.lz yuzu-239ac8abe228b9080741ba7d50d9e13cc4a1ceae.tar.xz yuzu-239ac8abe228b9080741ba7d50d9e13cc4a1ceae.tar.zst yuzu-239ac8abe228b9080741ba7d50d9e13cc4a1ceae.zip | |
Diffstat (limited to 'src/video_core/memory_manager.h')
| -rw-r--r-- | src/video_core/memory_manager.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/video_core/memory_manager.h b/src/video_core/memory_manager.h index 4710cb21f..246c8fb7e 100644 --- a/src/video_core/memory_manager.h +++ b/src/video_core/memory_manager.h @@ -6,6 +6,9 @@ #include <array> #include <memory> + +#include <boost/optional.hpp> + #include "common/common_types.h" #include "core/memory.h" @@ -22,7 +25,7 @@ public: 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); + boost::optional<VAddr> GpuToCpuAddress(GPUVAddr gpu_addr); static constexpr u64 PAGE_BITS = 16; static constexpr u64 PAGE_SIZE = 1 << PAGE_BITS; |