diff options
| author | 2020-08-25 11:24:13 -0400 | |
|---|---|---|
| committer | 2020-08-25 11:24:13 -0400 | |
| commit | 902bf6d37dc6281d83970b298e5b3327cdaee651 (patch) | |
| tree | 36a15d2bd11b3b0e1e8505bea2cfc2b0725bfb05 /src | |
| parent | Merge pull request #4565 from lioncash/memset (diff) | |
| parent | memory_manager: Mark IsGranularRange() as a const member function (diff) | |
| download | yuzu-902bf6d37dc6281d83970b298e5b3327cdaee651.tar.gz yuzu-902bf6d37dc6281d83970b298e5b3327cdaee651.tar.xz yuzu-902bf6d37dc6281d83970b298e5b3327cdaee651.zip | |
Merge pull request #4574 from lioncash/const-fn
memory_manager: Mark IsGranularRange() as a const member function
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/memory_manager.cpp | 4 | ||||
| -rw-r--r-- | src/video_core/memory_manager.h | 2 |
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 | |||
| 316 | WriteBlockUnsafe(gpu_dest_addr, tmp_buffer.data(), size); | 316 | WriteBlockUnsafe(gpu_dest_addr, tmp_buffer.data(), size); |
| 317 | } | 317 | } |
| 318 | 318 | ||
| 319 | bool MemoryManager::IsGranularRange(GPUVAddr gpu_addr, std::size_t size) { | 319 | bool MemoryManager::IsGranularRange(GPUVAddr gpu_addr, std::size_t size) const { |
| 320 | const auto cpu_addr{GpuToCpuAddress(gpu_addr)}; | 320 | const auto cpu_addr{GpuToCpuAddress(gpu_addr)}; |
| 321 | if (!cpu_addr) { | 321 | if (!cpu_addr) { |
| 322 | return {}; | 322 | return false; |
| 323 | } | 323 | } |
| 324 | const std::size_t page{(*cpu_addr & Core::Memory::PAGE_MASK) + size}; | 324 | const std::size_t page{(*cpu_addr & Core::Memory::PAGE_MASK) + size}; |
| 325 | return page <= Core::Memory::PAGE_SIZE; | 325 | 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: | |||
| 112 | /** | 112 | /** |
| 113 | * IsGranularRange checks if a gpu region can be simply read with a pointer. | 113 | * IsGranularRange checks if a gpu region can be simply read with a pointer. |
| 114 | */ | 114 | */ |
| 115 | bool IsGranularRange(GPUVAddr gpu_addr, std::size_t size); | 115 | bool IsGranularRange(GPUVAddr gpu_addr, std::size_t size) const; |
| 116 | 116 | ||
| 117 | GPUVAddr Map(VAddr cpu_addr, GPUVAddr gpu_addr, std::size_t size); | 117 | GPUVAddr Map(VAddr cpu_addr, GPUVAddr gpu_addr, std::size_t size); |
| 118 | GPUVAddr MapAllocate(VAddr cpu_addr, std::size_t size, std::size_t align); | 118 | GPUVAddr MapAllocate(VAddr cpu_addr, std::size_t size, std::size_t align); |