diff options
| author | 2019-04-05 20:27:57 -0400 | |
|---|---|---|
| committer | 2019-04-05 20:28:44 -0400 | |
| commit | 76ef6e5c2be2d3d31fdc7bf16c499c1f257b9e97 (patch) | |
| tree | 6728e1d39d4657f4a5fd97cea28e688383e01d22 /src | |
| parent | video_core/memory_manager: Add a const qualified variant of GetPointer() (diff) | |
| download | yuzu-76ef6e5c2be2d3d31fdc7bf16c499c1f257b9e97.tar.gz yuzu-76ef6e5c2be2d3d31fdc7bf16c499c1f257b9e97.tar.xz yuzu-76ef6e5c2be2d3d31fdc7bf16c499c1f257b9e97.zip | |
video_core/memory_manager: Make ReadBlock() a const qualifier member function
Now, since we have a const qualified variant of GetPointer(), we can put
it to use in ReadBlock() to retrieve the source pointer that is passed
into memcpy.
Now block reading may be done from a const context.
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/memory_manager.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/memory_manager.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/video_core/memory_manager.cpp b/src/video_core/memory_manager.cpp index bb7e21e7d..2b3651f20 100644 --- a/src/video_core/memory_manager.cpp +++ b/src/video_core/memory_manager.cpp | |||
| @@ -203,7 +203,7 @@ const u8* MemoryManager::GetPointer(GPUVAddr addr) const { | |||
| 203 | return {}; | 203 | return {}; |
| 204 | } | 204 | } |
| 205 | 205 | ||
| 206 | void MemoryManager::ReadBlock(GPUVAddr src_addr, void* dest_buffer, std::size_t size) { | 206 | void MemoryManager::ReadBlock(GPUVAddr src_addr, void* dest_buffer, std::size_t size) const { |
| 207 | std::memcpy(dest_buffer, GetPointer(src_addr), size); | 207 | std::memcpy(dest_buffer, GetPointer(src_addr), size); |
| 208 | } | 208 | } |
| 209 | void MemoryManager::WriteBlock(GPUVAddr dest_addr, const void* src_buffer, std::size_t size) { | 209 | void MemoryManager::WriteBlock(GPUVAddr dest_addr, const void* src_buffer, std::size_t size) { |
diff --git a/src/video_core/memory_manager.h b/src/video_core/memory_manager.h index 4309bfce7..273d538b8 100644 --- a/src/video_core/memory_manager.h +++ b/src/video_core/memory_manager.h | |||
| @@ -61,7 +61,7 @@ public: | |||
| 61 | u8* GetPointer(GPUVAddr addr); | 61 | u8* GetPointer(GPUVAddr addr); |
| 62 | const u8* GetPointer(GPUVAddr addr) const; | 62 | const u8* GetPointer(GPUVAddr addr) const; |
| 63 | 63 | ||
| 64 | void ReadBlock(GPUVAddr src_addr, void* dest_buffer, std::size_t size); | 64 | void ReadBlock(GPUVAddr src_addr, void* dest_buffer, std::size_t size) const; |
| 65 | void WriteBlock(GPUVAddr dest_addr, const void* src_buffer, std::size_t size); | 65 | void WriteBlock(GPUVAddr dest_addr, const void* src_buffer, std::size_t size); |
| 66 | void CopyBlock(GPUVAddr dest_addr, GPUVAddr src_addr, std::size_t size); | 66 | void CopyBlock(GPUVAddr dest_addr, GPUVAddr src_addr, std::size_t size); |
| 67 | 67 | ||