From fd12788967729dc3712c23723957ab6b15d36822 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 9 May 2019 19:04:41 -0400 Subject: video_core/memory_manager: Default the destructor within the cpp file Makes the class less surprising when it comes to forward declaring the type, and also prevents inlining the destruction code of the class, given it contains non-trivial types. --- src/video_core/memory_manager.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/video_core/memory_manager.cpp') diff --git a/src/video_core/memory_manager.cpp b/src/video_core/memory_manager.cpp index 6c98c6701..2890ea947 100644 --- a/src/video_core/memory_manager.cpp +++ b/src/video_core/memory_manager.cpp @@ -25,6 +25,8 @@ MemoryManager::MemoryManager(VideoCore::RasterizerInterface& rasterizer) : raste UpdatePageTableForVMA(initial_vma); } +MemoryManager::~MemoryManager() = default; + GPUVAddr MemoryManager::AllocateSpace(u64 size, u64 align) { const u64 aligned_size{Common::AlignUp(size, page_size)}; const GPUVAddr gpu_addr{FindFreeRegion(address_space_base, aligned_size)}; -- cgit v1.2.3 From 716fbaef743e46a063dc8b4e5e542e0c2ee2141e Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 9 May 2019 19:13:14 -0400 Subject: video_core/memory_manager: Mark IsBlockContinuous() as a const member function Corrects the typo in its name and marks the function as a const member function, given it doesn't actually modify memory manager state. --- src/video_core/memory_manager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/video_core/memory_manager.cpp') diff --git a/src/video_core/memory_manager.cpp b/src/video_core/memory_manager.cpp index 2890ea947..5d8d126c1 100644 --- a/src/video_core/memory_manager.cpp +++ b/src/video_core/memory_manager.cpp @@ -201,11 +201,11 @@ const u8* MemoryManager::GetPointer(GPUVAddr addr) const { return {}; } -bool MemoryManager::IsBlockContinous(const GPUVAddr start, const std::size_t size) { +bool MemoryManager::IsBlockContinuous(const GPUVAddr start, const std::size_t size) const { const GPUVAddr end = start + size; const auto host_ptr_start = reinterpret_cast(GetPointer(start)); const auto host_ptr_end = reinterpret_cast(GetPointer(end)); - const std::size_t range = static_cast(host_ptr_end - host_ptr_start); + const auto range = static_cast(host_ptr_end - host_ptr_start); return range == size; } -- cgit v1.2.3