summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Lioncash2020-08-24 00:37:54 -0400
committerGravatar Lioncash2020-08-24 00:37:57 -0400
commit5bce81c3d6940acab92701ca284f4be79ae2a689 (patch)
treeb8644e73f926f4d0f4a60a2ba3e6cd20028756fd /src
parentMerge pull request #4571 from lioncash/fence (diff)
downloadyuzu-5bce81c3d6940acab92701ca284f4be79ae2a689.tar.gz
yuzu-5bce81c3d6940acab92701ca284f4be79ae2a689.tar.xz
yuzu-5bce81c3d6940acab92701ca284f4be79ae2a689.zip
memory_manager: Mark IsGranularRange() as a const member function
This doesn't modify internal member state, so it can be marked as const.
Diffstat (limited to 'src')
-rw-r--r--src/video_core/memory_manager.cpp4
-rw-r--r--src/video_core/memory_manager.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/video_core/memory_manager.cpp b/src/video_core/memory_manager.cpp
index 844164645..7f97f889a 100644
--- a/src/video_core/memory_manager.cpp
+++ b/src/video_core/memory_manager.cpp
@@ -312,10 +312,10 @@ void MemoryManager::CopyBlockUnsafe(GPUVAddr gpu_dest_addr, GPUVAddr gpu_src_add
312 WriteBlockUnsafe(gpu_dest_addr, tmp_buffer.data(), size); 312 WriteBlockUnsafe(gpu_dest_addr, tmp_buffer.data(), size);
313} 313}
314 314
315bool MemoryManager::IsGranularRange(GPUVAddr gpu_addr, std::size_t size) { 315bool MemoryManager::IsGranularRange(GPUVAddr gpu_addr, std::size_t size) const {
316 const auto cpu_addr{GpuToCpuAddress(gpu_addr)}; 316 const auto cpu_addr{GpuToCpuAddress(gpu_addr)};
317 if (!cpu_addr) { 317 if (!cpu_addr) {
318 return {}; 318 return false;
319 } 319 }
320 const std::size_t page{(*cpu_addr & Core::Memory::PAGE_MASK) + size}; 320 const std::size_t page{(*cpu_addr & Core::Memory::PAGE_MASK) + size};
321 return page <= Core::Memory::PAGE_SIZE; 321 return page <= Core::Memory::PAGE_SIZE;
diff --git a/src/video_core/memory_manager.h b/src/video_core/memory_manager.h
index 681bd9588..dbd2dba52 100644
--- a/src/video_core/memory_manager.h
+++ b/src/video_core/memory_manager.h
@@ -109,7 +109,7 @@ public:
109 /** 109 /**
110 * IsGranularRange checks if a gpu region can be simply read with a pointer. 110 * IsGranularRange checks if a gpu region can be simply read with a pointer.
111 */ 111 */
112 bool IsGranularRange(GPUVAddr gpu_addr, std::size_t size); 112 bool IsGranularRange(GPUVAddr gpu_addr, std::size_t size) const;
113 113
114 GPUVAddr Map(VAddr cpu_addr, GPUVAddr gpu_addr, std::size_t size); 114 GPUVAddr Map(VAddr cpu_addr, GPUVAddr gpu_addr, std::size_t size);
115 GPUVAddr MapAllocate(VAddr cpu_addr, std::size_t size, std::size_t align); 115 GPUVAddr MapAllocate(VAddr cpu_addr, std::size_t size, std::size_t align);