franklinblanco/yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4574 from lioncash/const-fn

Browse Source 
memory_manager: Mark IsGranularRange() as a const member function
This commit is contained in:
bunnei 2020-08-25 11:24:13 -04:00 committed by GitHub
commit 902bf6d37d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/video_core/memory_manager.cpp
View File

@ -316,10 +316,10 @@ void MemoryManager::CopyBlockUnsafe(GPUVAddr gpu_dest_addr, GPUVAddr gpu_src_add
WriteBlockUnsafe(gpu_dest_addr, tmp_buffer.data(), size); 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)}; const auto cpu_addr{GpuToCpuAddress(gpu_addr)};
if (!cpu_addr) { if (!cpu_addr) {
return {}; return false;
} }
const std::size_t page{(*cpu_addr & Core::Memory::PAGE_MASK) + size}; const std::size_t page{(*cpu_addr & Core::Memory::PAGE_MASK) + size};
return page <= Core::Memory::PAGE_SIZE; return page <= Core::Memory::PAGE_SIZE;

2
src/video_core/memory_manager.h
View File

@ -112,7 +112,7 @@ public:
/** /**
* IsGranularRange checks if a gpu region can be simply read with a pointer. * 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 Map(VAddr cpu_addr, GPUVAddr gpu_addr, std::size_t size);
GPUVAddr MapAllocate(VAddr cpu_addr, std::size_t size, std::size_t align); GPUVAddr MapAllocate(VAddr cpu_addr, std::size_t size, std::size_t align);