From 1c18dc6577de0d3e294a22074eec02b70776930f Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Wed, 8 Apr 2020 18:09:16 -0400 Subject: [PATCH] Memory: Correct GCC errors. --- src/video_core/buffer_cache/buffer_cache.h | 1 + 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 @@ #include "common/alignment.h" #include "common/common_types.h" #include "core/core.h" +#include "core/memory.h" #include "video_core/buffer_cache/buffer_block.h" #include "video_core/buffer_cache/map_interval.h" #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) { auto& memory = system.Memory(); - const VAddr const page_addr{page_table.backing_addr[addr >> page_bits]}; + const VAddr page_addr{page_table.backing_addr[addr >> page_bits]}; if (page_addr != 0) { return memory.GetPointer(page_addr + (addr & page_mask)); @@ -219,7 +219,7 @@ const u8* MemoryManager::GetPointer(GPUVAddr addr) const { const auto& memory = system.Memory(); - const VAddr const page_addr{page_table.backing_addr[addr >> page_bits]}; + const VAddr page_addr{page_table.backing_addr[addr >> page_bits]}; if (page_addr != 0) { return memory.GetPointer(page_addr + (addr & page_mask));