aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/video_core
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner <yuriks@yuriks.net>2015-05-12 22:38:29 -0300
committerGravatar Yuri Kunde Schlesner <yuriks@yuriks.net>2015-05-15 00:04:38 -0300
commit7ada357b2d12cf616672425a8961804b865354d6 (patch)
tree983003c1efc0950605eca3aa7d135b7c8fe9edcf /src/video_core
parenta251721bf3a053ea012ac0b891826f3246273c82 (diff)
Memmap: Re-organize memory function in two files
memory.cpp/h contains definitions related to acessing memory and configuring the address space mem_map.cpp/h contains higher-level definitions related to configuring the address space accoording to the kernel and allocating memory.
Diffstat (limited to 'src/video_core')
-rw-r--r--src/video_core/pica.h2
-rw-r--r--src/video_core/rasterizer.cpp2
-rw-r--r--src/video_core/renderer_opengl/renderer_opengl.cpp2
-rw-r--r--src/video_core/vertex_shader.cpp2
4 files changed, 3 insertions, 5 deletions
diff --git a/src/video_core/pica.h b/src/video_core/pica.h
index a5342971..3fbf9572 100644
--- a/src/video_core/pica.h
+++ b/src/video_core/pica.h
@@ -16,8 +16,6 @@
#include "common/common_types.h"
#include "common/logging/log.h"
-#include "core/mem_map.h"
-
namespace Pica {
// Returns index corresponding to the Regs member labeled by field_name
diff --git a/src/video_core/rasterizer.cpp b/src/video_core/rasterizer.cpp
index 02a08b20..59eff48f 100644
--- a/src/video_core/rasterizer.cpp
+++ b/src/video_core/rasterizer.cpp
@@ -9,6 +9,8 @@
#include "common/profiler.h"
#include "core/hw/gpu.h"
+#include "core/memory.h"
+
#include "debug_utils/debug_utils.h"
#include "math.h"
#include "color.h"
diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp
index 0c072120..71ceb021 100644
--- a/src/video_core/renderer_opengl/renderer_opengl.cpp
+++ b/src/video_core/renderer_opengl/renderer_opengl.cpp
@@ -5,7 +5,7 @@
#include "core/hw/gpu.h"
#include "core/hw/hw.h"
#include "core/hw/lcd.h"
-#include "core/mem_map.h"
+#include "core/memory.h"
#include "core/settings.h"
#include "common/emu_window.h"
diff --git a/src/video_core/vertex_shader.cpp b/src/video_core/vertex_shader.cpp
index 4734e546..981d1a35 100644
--- a/src/video_core/vertex_shader.cpp
+++ b/src/video_core/vertex_shader.cpp
@@ -8,8 +8,6 @@
#include <common/file_util.h>
-#include <core/mem_map.h>
-
#include <nihstro/shader_bytecode.h>
#include "common/profiler.h"