summaryrefslogtreecommitdiff
path: root/src/video_core
diff options
context:
space:
mode:
authorGravatar MerryMage2016-12-23 13:37:40 +0000
committerGravatar MerryMage2016-12-23 13:42:39 +0000
commit64f98f4d0f33b5c626d86a05ab9dd8060e160cc5 (patch)
tree8874f16f9f840add798f58981d5c2fcdf4da3c84 /src/video_core
parentMerge pull request #2364 from mailwl/nwm-services (diff)
downloadyuzu-64f98f4d0f33b5c626d86a05ab9dd8060e160cc5.tar.gz
yuzu-64f98f4d0f33b5c626d86a05ab9dd8060e160cc5.tar.xz
yuzu-64f98f4d0f33b5c626d86a05ab9dd8060e160cc5.zip
core: Move emu_window and key_map into core
* Removes circular dependences (common should not depend on core)
Diffstat (limited to 'src/video_core')
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer_cache.cpp2
-rw-r--r--src/video_core/renderer_opengl/renderer_opengl.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
index 0b2e48407..85aa06cd5 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
+++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
@@ -11,11 +11,11 @@
11#include <vector> 11#include <vector>
12#include <glad/glad.h> 12#include <glad/glad.h>
13#include "common/bit_field.h" 13#include "common/bit_field.h"
14#include "common/emu_window.h"
15#include "common/logging/log.h" 14#include "common/logging/log.h"
16#include "common/math_util.h" 15#include "common/math_util.h"
17#include "common/microprofile.h" 16#include "common/microprofile.h"
18#include "common/vector_math.h" 17#include "common/vector_math.h"
18#include "core/frontend/emu_window.h"
19#include "core/memory.h" 19#include "core/memory.h"
20#include "video_core/debug_utils/debug_utils.h" 20#include "video_core/debug_utils/debug_utils.h"
21#include "video_core/pica_state.h" 21#include "video_core/pica_state.h"
diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp
index 93f0ac105..2aa90e5c1 100644
--- a/src/video_core/renderer_opengl/renderer_opengl.cpp
+++ b/src/video_core/renderer_opengl/renderer_opengl.cpp
@@ -9,10 +9,10 @@
9#include <glad/glad.h> 9#include <glad/glad.h>
10#include "common/assert.h" 10#include "common/assert.h"
11#include "common/bit_field.h" 11#include "common/bit_field.h"
12#include "common/emu_window.h"
13#include "common/logging/log.h" 12#include "common/logging/log.h"
14#include "common/profiler_reporting.h" 13#include "common/profiler_reporting.h"
15#include "common/synchronized_wrapper.h" 14#include "common/synchronized_wrapper.h"
15#include "core/frontend/emu_window.h"
16#include "core/hw/gpu.h" 16#include "core/hw/gpu.h"
17#include "core/hw/hw.h" 17#include "core/hw/hw.h"
18#include "core/hw/lcd.h" 18#include "core/hw/lcd.h"