summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2020-08-25 17:24:13 +0200
committerGitHub <noreply@github.com>2020-08-25 17:24:13 +0200
commit902bf6d37dc6281d83970b298e5b3327cdaee651 (patch)
tree36a15d2bd11b3b0e1e8505bea2cfc2b0725bfb05
parentMerge pull request #4565 from lioncash/memset (diff)
parentmemory_manager: Mark IsGranularRange() as a const member function (diff)
downloadyuzu-902bf6d37dc6281d83970b298e5b3327cdaee651.tar
yuzu-902bf6d37dc6281d83970b298e5b3327cdaee651.tar.gz
yuzu-902bf6d37dc6281d83970b298e5b3327cdaee651.tar.bz2
yuzu-902bf6d37dc6281d83970b298e5b3327cdaee651.tar.lz
yuzu-902bf6d37dc6281d83970b298e5b3327cdaee651.tar.xz
yuzu-902bf6d37dc6281d83970b298e5b3327cdaee651.tar.zst
yuzu-902bf6d37dc6281d83970b298e5b3327cdaee651.zip
-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 c217f5bb2..16b2aaa27 100644
--- a/src/video_core/memory_manager.cpp
+++ b/src/video_core/memory_manager.cpp
@@ -316,10 +316,10 @@ void MemoryManager::CopyBlockUnsafe(GPUVAddr gpu_dest_addr, GPUVAddr gpu_src_add
WriteBlockUnsafe(gpu_dest_addr, tmp_buffer.data(), size);
}
-bool MemoryManager::IsGranularRange(GPUVAddr gpu_addr, std::size_t size) {
+bool MemoryManager::IsGranularRange(GPUVAddr gpu_addr, std::size_t size) const {
const auto cpu_addr{GpuToCpuAddress(gpu_addr)};
if (!cpu_addr) {
- return {};
+ return false;
}
const std::size_t page{(*cpu_addr & Core::Memory::PAGE_MASK) + size};
return page <= Core::Memory::PAGE_SIZE;
diff --git a/src/video_core/memory_manager.h b/src/video_core/memory_manager.h
index 8953fcb53..533b415e9 100644
--- a/src/video_core/memory_manager.h
+++ b/src/video_core/memory_manager.h
@@ -112,7 +112,7 @@ public:
/**
* IsGranularRange checks if a gpu region can be simply read with a pointer.
*/
- bool IsGranularRange(GPUVAddr gpu_addr, std::size_t size);
+ bool IsGranularRange(GPUVAddr gpu_addr, std::size_t size) const;
GPUVAddr Map(VAddr cpu_addr, GPUVAddr gpu_addr, std::size_t size);
GPUVAddr MapAllocate(VAddr cpu_addr, std::size_t size, std::size_t align);