diff options
author | Frederic L <frederic.laing.development@gmail.com> | 2018-10-30 05:03:25 +0100 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2018-10-30 05:03:25 +0100 |
commit | 7a5eda59146306dedaf3e6f07f97a8c6898543dd (patch) | |
tree | 78e07b43fb0113f95e1c8e9426d3b394b9524d4e /src/video_core/memory_manager.cpp | |
parent | Merge pull request #1621 from lioncash/ipc (diff) | |
download | yuzu-7a5eda59146306dedaf3e6f07f97a8c6898543dd.tar yuzu-7a5eda59146306dedaf3e6f07f97a8c6898543dd.tar.gz yuzu-7a5eda59146306dedaf3e6f07f97a8c6898543dd.tar.bz2 yuzu-7a5eda59146306dedaf3e6f07f97a8c6898543dd.tar.lz yuzu-7a5eda59146306dedaf3e6f07f97a8c6898543dd.tar.xz yuzu-7a5eda59146306dedaf3e6f07f97a8c6898543dd.tar.zst yuzu-7a5eda59146306dedaf3e6f07f97a8c6898543dd.zip |
Diffstat (limited to 'src/video_core/memory_manager.cpp')
-rw-r--r-- | src/video_core/memory_manager.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/video_core/memory_manager.cpp b/src/video_core/memory_manager.cpp index 022d4ab74..90a8e825d 100644 --- a/src/video_core/memory_manager.cpp +++ b/src/video_core/memory_manager.cpp @@ -9,7 +9,7 @@ namespace Tegra { GPUVAddr MemoryManager::AllocateSpace(u64 size, u64 align) { - boost::optional<GPUVAddr> gpu_addr = FindFreeBlock(size, align); + std::optional<GPUVAddr> gpu_addr = FindFreeBlock(size, align); ASSERT(gpu_addr); for (u64 offset = 0; offset < size; offset += PAGE_SIZE) { @@ -34,7 +34,7 @@ GPUVAddr MemoryManager::AllocateSpace(GPUVAddr gpu_addr, u64 size, u64 align) { } GPUVAddr MemoryManager::MapBufferEx(VAddr cpu_addr, u64 size) { - boost::optional<GPUVAddr> gpu_addr = FindFreeBlock(size, PAGE_SIZE); + std::optional<GPUVAddr> gpu_addr = FindFreeBlock(size, PAGE_SIZE); ASSERT(gpu_addr); for (u64 offset = 0; offset < size; offset += PAGE_SIZE) { @@ -97,7 +97,7 @@ GPUVAddr MemoryManager::GetRegionEnd(GPUVAddr region_start) const { return {}; } -boost::optional<GPUVAddr> MemoryManager::FindFreeBlock(u64 size, u64 align) { +std::optional<GPUVAddr> MemoryManager::FindFreeBlock(u64 size, u64 align) { GPUVAddr gpu_addr = 0; u64 free_space = 0; align = (align + PAGE_MASK) & ~PAGE_MASK; @@ -118,7 +118,7 @@ boost::optional<GPUVAddr> MemoryManager::FindFreeBlock(u64 size, u64 align) { return {}; } -boost::optional<VAddr> MemoryManager::GpuToCpuAddress(GPUVAddr gpu_addr) { +std::optional<VAddr> MemoryManager::GpuToCpuAddress(GPUVAddr gpu_addr) { VAddr base_addr = PageSlot(gpu_addr); if (base_addr == static_cast<u64>(PageStatus::Allocated) || |