diff options
| author |  Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-07 11:45:45 -0700 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-07 11:45:45 -0700 |
| commit | 4f4d230dac936f32cceb8be35fe09822d85bb2b6 (patch) | |
| tree | a180a736708834708e0e5b95fd1720f37722b429 /src/video_core | |
| parent | 337f1e1b96445b81c40c313b1bf680fe660f14f5 (diff) | |
| parent | c956e8a6869d0ee1edd68a6ab880efa6bf1fbe70 (diff) | |
Merge pull request #721 from yuriks/more-cleanups
More cleanups
Diffstat (limited to 'src/video_core')
| -rw-r--r-- | src/video_core/color.h | 2 | ||||
| -rw-r--r-- | src/video_core/pica.h | 3 | ||||
| -rw-r--r-- | src/video_core/renderer_base.h | 2 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/renderer_opengl.cpp | 1 | ||||
| -rw-r--r-- | src/video_core/video_core.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/video_core.h | 1 |
6 files changed, 8 insertions, 3 deletions
diff --git a/src/video_core/color.h b/src/video_core/color.h index 43d635e2..4d2026eb 100644 --- a/src/video_core/color.h +++ b/src/video_core/color.h @@ -5,6 +5,8 @@ #pragma once #include "common/common_types.h" +#include "common/swap.h" + #include "video_core/math.h" namespace Color { diff --git a/src/video_core/pica.h b/src/video_core/pica.h index 8acad867..a0ba715f 100644 --- a/src/video_core/pica.h +++ b/src/video_core/pica.h @@ -10,8 +10,11 @@ #include <map> #include <vector> +#include "common/assert.h" #include "common/bit_field.h" +#include "common/common_funcs.h" #include "common/common_types.h" +#include "common/logging/log.h" #include "core/mem_map.h" diff --git a/src/video_core/renderer_base.h b/src/video_core/renderer_base.h index b77f29c1..b6240953 100644 --- a/src/video_core/renderer_base.h +++ b/src/video_core/renderer_base.h @@ -4,7 +4,7 @@ #pragma once -#include "common/common.h" +#include "common/common_types.h" class RendererBase : NonCopyable { public: diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp index 5e864b75..6b242a6e 100644 --- a/src/video_core/renderer_opengl/renderer_opengl.cpp +++ b/src/video_core/renderer_opengl/renderer_opengl.cpp @@ -9,6 +9,7 @@ #include "core/settings.h" #include "common/emu_window.h" +#include "common/logging/log.h" #include "common/profiler_reporting.h" #include "video_core/video_core.h" diff --git a/src/video_core/video_core.cpp b/src/video_core/video_core.cpp index b9d4ede3..42e3bdd5 100644 --- a/src/video_core/video_core.cpp +++ b/src/video_core/video_core.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include "common/common.h" +#include "common/logging/log.h" #include "common/emu_window.h" #include "core/core.h" diff --git a/src/video_core/video_core.h b/src/video_core/video_core.h index 1b51d39b..f885bec2 100644 --- a/src/video_core/video_core.h +++ b/src/video_core/video_core.h @@ -4,7 +4,6 @@ #pragma once -#include "common/common.h" #include "common/emu_window.h" #include "renderer_base.h" |