diff options
| author | 2020-04-08 18:09:16 -0400 | |
|---|---|---|
| committer | 2020-04-08 18:09:16 -0400 | |
| commit | 1c18dc6577de0d3e294a22074eec02b70776930f (patch) | |
| tree | dda0663b498d846dcdeec171952f152e8127a0b7 | |
| parent | Memory: Address Feedback. (diff) | |
| download | yuzu-1c18dc6577de0d3e294a22074eec02b70776930f.tar.gz yuzu-1c18dc6577de0d3e294a22074eec02b70776930f.tar.xz yuzu-1c18dc6577de0d3e294a22074eec02b70776930f.zip | |
Memory: Correct GCC errors.
| -rw-r--r-- | src/video_core/buffer_cache/buffer_cache.h | 1 | ||||
| -rw-r--r-- | src/video_core/memory_manager.cpp | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/video_core/buffer_cache/buffer_cache.h b/src/video_core/buffer_cache/buffer_cache.h index eb2f9ecf2..b57c0d4d4 100644 --- a/src/video_core/buffer_cache/buffer_cache.h +++ b/src/video_core/buffer_cache/buffer_cache.h | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include "common/alignment.h" | 19 | #include "common/alignment.h" |
| 20 | #include "common/common_types.h" | 20 | #include "common/common_types.h" |
| 21 | #include "core/core.h" | 21 | #include "core/core.h" |
| 22 | #include "core/memory.h" | ||
| 22 | #include "video_core/buffer_cache/buffer_block.h" | 23 | #include "video_core/buffer_cache/buffer_block.h" |
| 23 | #include "video_core/buffer_cache/map_interval.h" | 24 | #include "video_core/buffer_cache/map_interval.h" |
| 24 | #include "video_core/memory_manager.h" | 25 | #include "video_core/memory_manager.h" |
diff --git a/src/video_core/memory_manager.cpp b/src/video_core/memory_manager.cpp index eb934ad5e..a3389d0d2 100644 --- a/src/video_core/memory_manager.cpp +++ b/src/video_core/memory_manager.cpp | |||
| @@ -202,7 +202,7 @@ u8* MemoryManager::GetPointer(GPUVAddr addr) { | |||
| 202 | 202 | ||
| 203 | auto& memory = system.Memory(); | 203 | auto& memory = system.Memory(); |
| 204 | 204 | ||
| 205 | const VAddr const page_addr{page_table.backing_addr[addr >> page_bits]}; | 205 | const VAddr page_addr{page_table.backing_addr[addr >> page_bits]}; |
| 206 | 206 | ||
| 207 | if (page_addr != 0) { | 207 | if (page_addr != 0) { |
| 208 | return memory.GetPointer(page_addr + (addr & page_mask)); | 208 | return memory.GetPointer(page_addr + (addr & page_mask)); |
| @@ -219,7 +219,7 @@ const u8* MemoryManager::GetPointer(GPUVAddr addr) const { | |||
| 219 | 219 | ||
| 220 | const auto& memory = system.Memory(); | 220 | const auto& memory = system.Memory(); |
| 221 | 221 | ||
| 222 | const VAddr const page_addr{page_table.backing_addr[addr >> page_bits]}; | 222 | const VAddr page_addr{page_table.backing_addr[addr >> page_bits]}; |
| 223 | 223 | ||
| 224 | if (page_addr != 0) { | 224 | if (page_addr != 0) { |
| 225 | return memory.GetPointer(page_addr + (addr & page_mask)); | 225 | return memory.GetPointer(page_addr + (addr & page_mask)); |