diff options
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 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 | ||
| 315 | bool MemoryManager::IsGranularRange(GPUVAddr gpu_addr, std::size_t size) { | 315 | bool 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); |