diff options
author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-15 05:40:53 +0200 |
---|---|---|
committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-15 05:40:53 +0200 |
commit | bb689338943791c735c7c6adb186256457e064b4 (patch) | |
tree | a04ba64d18dd163709b1cb4b4212afaca6c091a6 /src/video_core | |
parent | Merge pull request #769 from lioncash/cond (diff) | |
parent | Memory: Use a table based lookup scheme to read from memory regions (diff) | |
download | yuzu-bb689338943791c735c7c6adb186256457e064b4.tar yuzu-bb689338943791c735c7c6adb186256457e064b4.tar.gz yuzu-bb689338943791c735c7c6adb186256457e064b4.tar.bz2 yuzu-bb689338943791c735c7c6adb186256457e064b4.tar.lz yuzu-bb689338943791c735c7c6adb186256457e064b4.tar.xz yuzu-bb689338943791c735c7c6adb186256457e064b4.tar.zst yuzu-bb689338943791c735c7c6adb186256457e064b4.zip |
Diffstat (limited to 'src/video_core')
-rw-r--r-- | src/video_core/pica.h | 2 | ||||
-rw-r--r-- | src/video_core/rasterizer.cpp | 2 | ||||
-rw-r--r-- | src/video_core/renderer_opengl/renderer_opengl.cpp | 2 | ||||
-rw-r--r-- | src/video_core/vertex_shader.cpp | 2 |
4 files changed, 3 insertions, 5 deletions
diff --git a/src/video_core/pica.h b/src/video_core/pica.h index a53429716..3fbf95721 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 02a08b20e..59eff48f9 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 0c072120d..71ceb021b 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 4734e546a..981d1a356 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" |