summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2019-04-06 02:30:46 +0200
committerLioncash <mathew1800@gmail.com>2019-04-06 02:30:48 +0200
commitc13fbe6a41a8e496e6b7de38a15669344e9cab7a (patch)
tree51933c4b7a07f8cb1a7d1ee1c5bb1bc3cfaf42f4
parentvideo_core/memory_manager: Make ReadBlock() a const qualifier member function (diff)
downloadyuzu-c13fbe6a41a8e496e6b7de38a15669344e9cab7a.tar
yuzu-c13fbe6a41a8e496e6b7de38a15669344e9cab7a.tar.gz
yuzu-c13fbe6a41a8e496e6b7de38a15669344e9cab7a.tar.bz2
yuzu-c13fbe6a41a8e496e6b7de38a15669344e9cab7a.tar.lz
yuzu-c13fbe6a41a8e496e6b7de38a15669344e9cab7a.tar.xz
yuzu-c13fbe6a41a8e496e6b7de38a15669344e9cab7a.tar.zst
yuzu-c13fbe6a41a8e496e6b7de38a15669344e9cab7a.zip
-rw-r--r--src/video_core/memory_manager.cpp10
-rw-r--r--src/video_core/memory_manager.h2
2 files changed, 6 insertions, 6 deletions
diff --git a/src/video_core/memory_manager.cpp b/src/video_core/memory_manager.cpp
index 2b3651f20..8417324ff 100644
--- a/src/video_core/memory_manager.cpp
+++ b/src/video_core/memory_manager.cpp
@@ -114,7 +114,7 @@ std::optional<VAddr> MemoryManager::GpuToCpuAddress(GPUVAddr addr) const {
}
template <typename T>
-T MemoryManager::Read(GPUVAddr addr) {
+T MemoryManager::Read(GPUVAddr addr) const {
if (!IsAddressValid(addr)) {
return {};
}
@@ -166,10 +166,10 @@ void MemoryManager::Write(GPUVAddr addr, T data) {
}
}
-template u8 MemoryManager::Read<u8>(GPUVAddr addr);
-template u16 MemoryManager::Read<u16>(GPUVAddr addr);
-template u32 MemoryManager::Read<u32>(GPUVAddr addr);
-template u64 MemoryManager::Read<u64>(GPUVAddr addr);
+template u8 MemoryManager::Read<u8>(GPUVAddr addr) const;
+template u16 MemoryManager::Read<u16>(GPUVAddr addr) const;
+template u32 MemoryManager::Read<u32>(GPUVAddr addr) const;
+template u64 MemoryManager::Read<u64>(GPUVAddr addr) const;
template void MemoryManager::Write<u8>(GPUVAddr addr, u8 data);
template void MemoryManager::Write<u16>(GPUVAddr addr, u16 data);
template void MemoryManager::Write<u32>(GPUVAddr addr, u32 data);
diff --git a/src/video_core/memory_manager.h b/src/video_core/memory_manager.h
index 273d538b8..178e2f655 100644
--- a/src/video_core/memory_manager.h
+++ b/src/video_core/memory_manager.h
@@ -53,7 +53,7 @@ public:
std::optional<VAddr> GpuToCpuAddress(GPUVAddr addr) const;
template <typename T>
- T Read(GPUVAddr addr);
+ T Read(GPUVAddr addr) const;
template <typename T>
void Write(GPUVAddr addr, T data);