diff options
author | bunnei <bunneidev@gmail.com> | 2020-06-22 04:38:04 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-22 04:38:04 +0200 |
commit | 14a1181a97e096de6ac8fb4f4b80f01e092aae9d (patch) | |
tree | 798af67b758500927791cbbb148f60e32de6bc90 /src/video_core/memory_manager.h | |
parent | Merge pull request #4126 from lioncash/noexcept (diff) | |
parent | memory_manager: Eliminate variable shadowing (diff) | |
download | yuzu-14a1181a97e096de6ac8fb4f4b80f01e092aae9d.tar yuzu-14a1181a97e096de6ac8fb4f4b80f01e092aae9d.tar.gz yuzu-14a1181a97e096de6ac8fb4f4b80f01e092aae9d.tar.bz2 yuzu-14a1181a97e096de6ac8fb4f4b80f01e092aae9d.tar.lz yuzu-14a1181a97e096de6ac8fb4f4b80f01e092aae9d.tar.xz yuzu-14a1181a97e096de6ac8fb4f4b80f01e092aae9d.tar.zst yuzu-14a1181a97e096de6ac8fb4f4b80f01e092aae9d.zip |
Diffstat (limited to 'src/video_core/memory_manager.h')
-rw-r--r-- | src/video_core/memory_manager.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/video_core/memory_manager.h b/src/video_core/memory_manager.h index 0ddd52d5a..87658e87a 100644 --- a/src/video_core/memory_manager.h +++ b/src/video_core/memory_manager.h @@ -79,9 +79,9 @@ public: * in the Host Memory counterpart. Note: This functions cause Host GPU Memory * Flushes and Invalidations, respectively to each operation. */ - void ReadBlock(GPUVAddr src_addr, void* dest_buffer, std::size_t size) const; - void WriteBlock(GPUVAddr dest_addr, const void* src_buffer, std::size_t size); - void CopyBlock(GPUVAddr dest_addr, GPUVAddr src_addr, std::size_t size); + void ReadBlock(GPUVAddr gpu_src_addr, void* dest_buffer, std::size_t size) const; + void WriteBlock(GPUVAddr gpu_dest_addr, const void* src_buffer, std::size_t size); + void CopyBlock(GPUVAddr gpu_dest_addr, GPUVAddr gpu_src_addr, std::size_t size); /** * ReadBlockUnsafe and WriteBlockUnsafe are special versions of ReadBlock and @@ -93,9 +93,9 @@ public: * WriteBlockUnsafe instead of WriteBlock since it shouldn't invalidate the texture * being flushed. */ - void ReadBlockUnsafe(GPUVAddr src_addr, void* dest_buffer, std::size_t size) const; - void WriteBlockUnsafe(GPUVAddr dest_addr, const void* src_buffer, std::size_t size); - void CopyBlockUnsafe(GPUVAddr dest_addr, GPUVAddr src_addr, std::size_t size); + void ReadBlockUnsafe(GPUVAddr gpu_src_addr, void* dest_buffer, std::size_t size) const; + void WriteBlockUnsafe(GPUVAddr gpu_dest_addr, const void* src_buffer, std::size_t size); + void CopyBlockUnsafe(GPUVAddr gpu_dest_addr, GPUVAddr gpu_src_addr, std::size_t size); /** * IsGranularRange checks if a gpu region can be simply read with a pointer |