diff options
| author | 2019-05-09 19:13:14 -0400 | |
|---|---|---|
| committer | 2019-05-09 19:14:36 -0400 | |
| commit | 716fbaef743e46a063dc8b4e5e542e0c2ee2141e (patch) | |
| tree | 5ed53f3890245da07727ee0a7faa9b12447d1208 | |
| parent | video_core/memory_manager: Mark the constructor as explicit (diff) | |
| download | yuzu-716fbaef743e46a063dc8b4e5e542e0c2ee2141e.tar.gz yuzu-716fbaef743e46a063dc8b4e5e542e0c2ee2141e.tar.xz yuzu-716fbaef743e46a063dc8b4e5e542e0c2ee2141e.zip | |
video_core/memory_manager: Mark IsBlockContinuous() as a const member function
Corrects the typo in its name and marks the function as a const member
function, given it doesn't actually modify memory manager state.
| -rw-r--r-- | src/video_core/memory_manager.cpp | 4 | ||||
| -rw-r--r-- | src/video_core/memory_manager.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/video_core/memory_manager.cpp b/src/video_core/memory_manager.cpp index 2890ea947..5d8d126c1 100644 --- a/src/video_core/memory_manager.cpp +++ b/src/video_core/memory_manager.cpp | |||
| @@ -201,11 +201,11 @@ const u8* MemoryManager::GetPointer(GPUVAddr addr) const { | |||
| 201 | return {}; | 201 | return {}; |
| 202 | } | 202 | } |
| 203 | 203 | ||
| 204 | bool MemoryManager::IsBlockContinous(const GPUVAddr start, const std::size_t size) { | 204 | bool MemoryManager::IsBlockContinuous(const GPUVAddr start, const std::size_t size) const { |
| 205 | const GPUVAddr end = start + size; | 205 | const GPUVAddr end = start + size; |
| 206 | const auto host_ptr_start = reinterpret_cast<std::uintptr_t>(GetPointer(start)); | 206 | const auto host_ptr_start = reinterpret_cast<std::uintptr_t>(GetPointer(start)); |
| 207 | const auto host_ptr_end = reinterpret_cast<std::uintptr_t>(GetPointer(end)); | 207 | const auto host_ptr_end = reinterpret_cast<std::uintptr_t>(GetPointer(end)); |
| 208 | const std::size_t range = static_cast<std::size_t>(host_ptr_end - host_ptr_start); | 208 | const auto range = static_cast<std::size_t>(host_ptr_end - host_ptr_start); |
| 209 | return range == size; | 209 | return range == size; |
| 210 | } | 210 | } |
| 211 | 211 | ||
diff --git a/src/video_core/memory_manager.h b/src/video_core/memory_manager.h index f69a25706..113f9d8f3 100644 --- a/src/video_core/memory_manager.h +++ b/src/video_core/memory_manager.h | |||
| @@ -66,8 +66,8 @@ public: | |||
| 66 | u8* GetPointer(GPUVAddr addr); | 66 | u8* GetPointer(GPUVAddr addr); |
| 67 | const u8* GetPointer(GPUVAddr addr) const; | 67 | const u8* GetPointer(GPUVAddr addr) const; |
| 68 | 68 | ||
| 69 | // Returns true if the block is continuous in host memory, false otherwise | 69 | /// Returns true if the block is continuous in host memory, false otherwise |
| 70 | bool IsBlockContinous(GPUVAddr start, std::size_t size); | 70 | bool IsBlockContinuous(GPUVAddr start, std::size_t size) const; |
| 71 | 71 | ||
| 72 | /** | 72 | /** |
| 73 | * ReadBlock and WriteBlock are full read and write operations over virtual | 73 | * ReadBlock and WriteBlock are full read and write operations over virtual |