summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Lioncash2019-04-05 20:18:27 -0400
committerGravatar Lioncash2019-04-05 20:18:29 -0400
commit9dec087fca5944b6e4ee5f0f76c0716a93a9fe4d (patch)
tree13001b2f2e22d963ab0043daf17d6220cc59ad75 /src
parentMerge pull request #2282 from bunnei/gpu-asynch-v2 (diff)
downloadyuzu-9dec087fca5944b6e4ee5f0f76c0716a93a9fe4d.tar.gz
yuzu-9dec087fca5944b6e4ee5f0f76c0716a93a9fe4d.tar.xz
yuzu-9dec087fca5944b6e4ee5f0f76c0716a93a9fe4d.zip
video_core/memory_manager: Make GpuToCpuAddress() a const member function
This doesn't modify any internal state, so it can be made a const member function to allow its use in const contexts.
Diffstat (limited to 'src')
-rw-r--r--src/video_core/memory_manager.cpp4
-rw-r--r--src/video_core/memory_manager.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/video_core/memory_manager.cpp b/src/video_core/memory_manager.cpp
index e76b59842..124a3c6d2 100644
--- a/src/video_core/memory_manager.cpp
+++ b/src/video_core/memory_manager.cpp
@@ -99,12 +99,12 @@ bool MemoryManager::IsAddressValid(GPUVAddr addr) const {
99 return (addr >> page_bits) < page_table.pointers.size(); 99 return (addr >> page_bits) < page_table.pointers.size();
100} 100}
101 101
102std::optional<VAddr> MemoryManager::GpuToCpuAddress(GPUVAddr addr) { 102std::optional<VAddr> MemoryManager::GpuToCpuAddress(GPUVAddr addr) const {
103 if (!IsAddressValid(addr)) { 103 if (!IsAddressValid(addr)) {
104 return {}; 104 return {};
105 } 105 }
106 106
107 VAddr cpu_addr{page_table.backing_addr[addr >> page_bits]}; 107 const VAddr cpu_addr{page_table.backing_addr[addr >> page_bits]};
108 if (cpu_addr) { 108 if (cpu_addr) {
109 return cpu_addr + (addr & page_mask); 109 return cpu_addr + (addr & page_mask);
110 } 110 }
diff --git a/src/video_core/memory_manager.h b/src/video_core/memory_manager.h
index 34744bb27..c3b4d7ae7 100644
--- a/src/video_core/memory_manager.h
+++ b/src/video_core/memory_manager.h
@@ -50,7 +50,7 @@ public:
50 GPUVAddr MapBufferEx(VAddr cpu_addr, u64 size); 50 GPUVAddr MapBufferEx(VAddr cpu_addr, u64 size);
51 GPUVAddr MapBufferEx(VAddr cpu_addr, GPUVAddr addr, u64 size); 51 GPUVAddr MapBufferEx(VAddr cpu_addr, GPUVAddr addr, u64 size);
52 GPUVAddr UnmapBuffer(GPUVAddr addr, u64 size); 52 GPUVAddr UnmapBuffer(GPUVAddr addr, u64 size);
53 std::optional<VAddr> GpuToCpuAddress(GPUVAddr addr); 53 std::optional<VAddr> GpuToCpuAddress(GPUVAddr addr) const;
54 54
55 template <typename T> 55 template <typename T>
56 T Read(GPUVAddr addr); 56 T Read(GPUVAddr addr);