video_core: Reorganize headers

19 files changed, 56 insertions, 62 deletions

diff --git a/src/video_core/clipper.cpp b/src/video_core/clipper.cpp
index bb6048cc0..ed99c4f13 100644
--- a/src/video_core/clipper.cpp
+++ b/src/video_core/clipper.cpp
@@ -4,10 +4,10 @@
 
 #include <boost/container/static_vector.hpp>
 
-#include "clipper.h"
-#include "pica.h"
-#include "rasterizer.h"
-#include "shader/shader_interpreter.h"
+#include "video_core/clipper.h"
+#include "video_core/pica.h"
+#include "video_core/rasterizer.h"
+#include "video_core/shader/shader_interpreter.h"
 
 namespace Pica {
 
diff --git a/src/video_core/command_processor.cpp b/src/video_core/command_processor.cpp
index 6e9cb2586..47afd8938 100644
--- a/src/video_core/command_processor.cpp
+++ b/src/video_core/command_processor.cpp
@@ -2,25 +2,24 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include <cmath>
 #include <boost/range/algorithm/fill.hpp>
 
 #include "common/microprofile.h"
 #include "common/profiler.h"
 
+#include "core/settings.h"
 #include "core/hle/service/gsp_gpu.h"
 #include "core/hw/gpu.h"
-#include "core/settings.h"
-
-#include "debug_utils/debug_utils.h"
 
-#include "clipper.h"
-#include "command_processor.h"
-#include "math.h"
-#include "pica.h"
-#include "primitive_assembly.h"
-#include "renderer_base.h"
-#include "shader/shader_interpreter.h"
-#include "video_core.h"
+#include "video_core/clipper.h"
+#include "video_core/command_processor.h"
+#include "video_core/pica.h"
+#include "video_core/primitive_assembly.h"
+#include "video_core/renderer_base.h"
+#include "video_core/video_core.h"
+#include "video_core/debug_utils/debug_utils.h"
+#include "video_core/shader/shader_interpreter.h"
 
 namespace Pica {
 
diff --git a/src/video_core/debug_utils/debug_utils.cpp b/src/video_core/debug_utils/debug_utils.cpp
index 9a61e700b..77a4fe272 100644
--- a/src/video_core/debug_utils/debug_utils.cpp
+++ b/src/video_core/debug_utils/debug_utils.cpp
@@ -31,8 +31,7 @@
 #include "video_core/renderer_base.h"
 #include "video_core/utils.h"
 #include "video_core/video_core.h"
-
-#include "debug_utils.h"
+#include "video_core/debug_utils/debug_utils.h"
 
 using nihstro::DVLBHeader;
 using nihstro::DVLEHeader;
diff --git a/src/video_core/pica.cpp b/src/video_core/pica.cpp
index 61983bc6c..8c528989e 100644
--- a/src/video_core/pica.cpp
+++ b/src/video_core/pica.cpp
@@ -5,8 +5,8 @@
 #include <cstring>
 #include <unordered_map>
 
-#include "pica.h"
-#include "shader/shader.h"
+#include "video_core/pica.h"
+#include "video_core/shader/shader.h"
 
 namespace Pica {
 
diff --git a/src/video_core/pica.h b/src/video_core/pica.h
index c1dca5087..ff81b409d 100644
--- a/src/video_core/pica.h
+++ b/src/video_core/pica.h
@@ -13,8 +13,8 @@
 #include "common/bit_field.h"
 #include "common/common_funcs.h"
 #include "common/common_types.h"
-#include "common/logging/log.h"
 #include "common/vector_math.h"
+#include "common/logging/log.h"
 
 namespace Pica {
 
diff --git a/src/video_core/primitive_assembly.cpp b/src/video_core/primitive_assembly.cpp
index e2b1df44c..44a8dbfe9 100644
--- a/src/video_core/primitive_assembly.cpp
+++ b/src/video_core/primitive_assembly.cpp
@@ -2,12 +2,12 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "pica.h"
-#include "primitive_assembly.h"
-#include "shader/shader_interpreter.h"
-
 #include "common/logging/log.h"
+
+#include "video_core/pica.h"
+#include "video_core/primitive_assembly.h"
 #include "video_core/debug_utils/debug_utils.h"
+#include "video_core/shader/shader_interpreter.h"
 
 namespace Pica {
 
diff --git a/src/video_core/rasterizer.cpp b/src/video_core/rasterizer.cpp
index 77eadda9e..a90ff5fef 100644
--- a/src/video_core/rasterizer.cpp
+++ b/src/video_core/rasterizer.cpp
@@ -3,6 +3,7 @@
 // Refer to the license.txt file included.
 
 #include <algorithm>
+#include <cmath>
 
 #include "common/color.h"
 #include "common/common_types.h"
@@ -10,15 +11,14 @@
 #include "common/microprofile.h"
 #include "common/profiler.h"
 
-#include "core/hw/gpu.h"
 #include "core/memory.h"
+#include "core/hw/gpu.h"
 
-#include "debug_utils/debug_utils.h"
-#include "math.h"
-#include "pica.h"
-#include "rasterizer.h"
-#include "shader/shader_interpreter.h"
+#include "video_core/pica.h"
+#include "video_core/rasterizer.h"
 #include "video_core/utils.h"
+#include "video_core/debug_utils/debug_utils.h"
+#include "video_core/shader/shader_interpreter.h"
 
 namespace Pica {
 
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp
index 62ca18317..50eb157a5 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer.cpp
+++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp
@@ -12,9 +12,9 @@
 #include "common/microprofile.h"
 #include "common/profiler.h"
 
-#include "core/hw/gpu.h"
 #include "core/memory.h"
 #include "core/settings.h"
+#include "core/hw/gpu.h"
 
 #include "video_core/pica.h"
 #include "video_core/utils.h"
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.h b/src/video_core/renderer_opengl/gl_rasterizer.h
index 24560d7f8..1fe307846 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer.h
+++ b/src/video_core/renderer_opengl/gl_rasterizer.h
@@ -9,11 +9,10 @@
 #include "common/common_types.h"
 
 #include "video_core/hwrasterizer_base.h"
+#include "video_core/renderer_opengl/gl_rasterizer_cache.h"
+#include "video_core/renderer_opengl/gl_state.h"
 #include "video_core/shader/shader_interpreter.h"
 
-#include "gl_state.h"
-#include "gl_rasterizer_cache.h"
-
 class RasterizerOpenGL : public HWRasterizer {
 public:
 
diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
index d9ccf2a3f..10d4ab0b6 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
+++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
@@ -10,9 +10,9 @@
 
 #include "core/memory.h"
 
+#include "video_core/debug_utils/debug_utils.h"
 #include "video_core/renderer_opengl/gl_rasterizer_cache.h"
 #include "video_core/renderer_opengl/pica_to_gl.h"
-#include "video_core/debug_utils/debug_utils.h"
 
 RasterizerCacheOpenGL::~RasterizerCacheOpenGL() {
     FullFlush();
diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.h b/src/video_core/renderer_opengl/gl_rasterizer_cache.h
index ec56237b5..98a48ffbe 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer_cache.h
+++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.h
@@ -4,13 +4,13 @@
 
 #pragma once
 
-#include "gl_state.h"
-#include "gl_resource_manager.h"
-#include "video_core/debug_utils/debug_utils.h"
-#include "video_core/pica.h"
-
-#include <memory>
 #include <map>
+#include <memory>
+
+#include "video_core/pica.h"
+#include "video_core/debug_utils/debug_utils.h"
+#include "video_core/renderer_opengl/gl_resource_manager.h"
+#include "video_core/renderer_opengl/gl_state.h"
 
 class RasterizerCacheOpenGL : NonCopyable {
 public:
diff --git a/src/video_core/renderer_opengl/gl_shader_util.cpp b/src/video_core/renderer_opengl/gl_shader_util.cpp
index 42d0e597c..4cf246c06 100644
--- a/src/video_core/renderer_opengl/gl_shader_util.cpp
+++ b/src/video_core/renderer_opengl/gl_shader_util.cpp
@@ -2,11 +2,11 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "gl_shader_util.h"
-#include "common/logging/log.h"
-
-#include <vector>
 #include <algorithm>
+#include <vector>
+
+#include "common/logging/log.h"
+#include "video_core/renderer_opengl/gl_shader_util.h"
 
 namespace ShaderUtil {
 
diff --git a/src/video_core/renderer_opengl/gl_state.cpp b/src/video_core/renderer_opengl/gl_state.cpp
index e02c27fbf..77b2816cb 100644
--- a/src/video_core/renderer_opengl/gl_state.cpp
+++ b/src/video_core/renderer_opengl/gl_state.cpp
@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "video_core/renderer_opengl/gl_state.h"
 #include "video_core/pica.h"
+#include "video_core/renderer_opengl/gl_state.h"
 
 OpenGLState OpenGLState::cur_state;
 
diff --git a/src/video_core/renderer_opengl/renderer_opengl.cpp b/src/video_core/renderer_opengl/renderer_opengl.cpp
index e1828c754..22f261c68 100644
--- a/src/video_core/renderer_opengl/renderer_opengl.cpp
+++ b/src/video_core/renderer_opengl/renderer_opengl.cpp
@@ -11,11 +11,11 @@
 #include "common/logging/log.h"
 #include "common/profiler_reporting.h"
 
+#include "core/memory.h"
+#include "core/settings.h"
 #include "core/hw/gpu.h"
 #include "core/hw/hw.h"
 #include "core/hw/lcd.h"
-#include "core/memory.h"
-#include "core/settings.h"
 
 #include "video_core/video_core.h"
 #include "video_core/debug_utils/debug_utils.h"
diff --git a/src/video_core/shader/shader_interpreter.cpp b/src/video_core/shader/shader_interpreter.cpp
index 69e4efa68..7b0c20b74 100644
--- a/src/video_core/shader/shader_interpreter.cpp
+++ b/src/video_core/shader/shader_interpreter.cpp
@@ -7,9 +7,8 @@
 #include <nihstro/shader_bytecode.h>
 
 #include "video_core/pica.h"
-
-#include "shader.h"
-#include "shader_interpreter.h"
+#include "video_core/shader/shader.h"
+#include "video_core/shader/shader_interpreter.h"
 
 using nihstro::OpCode;
 using nihstro::Instruction;
diff --git a/src/video_core/shader/shader_interpreter.h b/src/video_core/shader/shader_interpreter.h
index 791467252..294bca50e 100644
--- a/src/video_core/shader/shader_interpreter.h
+++ b/src/video_core/shader/shader_interpreter.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "shader.h"
+#include "video_core/shader/shader.h"
 
 namespace Pica {
 
diff --git a/src/video_core/shader/shader_jit_x64.h b/src/video_core/shader/shader_jit_x64.h
index 8668cfff4..3afbceccf 100644
--- a/src/video_core/shader/shader_jit_x64.h
+++ b/src/video_core/shader/shader_jit_x64.h
@@ -9,8 +9,7 @@
 #include "common/x64/emitter.h"
 
 #include "video_core/pica.h"
-
-#include "shader.h"
+#include "video_core/shader/shader.h"
 
 using nihstro::Instruction;
 using nihstro::OpCode;
diff --git a/src/video_core/utils.cpp b/src/video_core/utils.cpp
index c7cc93cea..6e1ff5cf4 100644
--- a/src/video_core/utils.cpp
+++ b/src/video_core/utils.cpp
@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 
 #include "video_core/utils.h"
 
diff --git a/src/video_core/video_core.cpp b/src/video_core/video_core.cpp
index 943fde5ee..eaddda668 100644
--- a/src/video_core/video_core.cpp
+++ b/src/video_core/video_core.cpp
@@ -2,17 +2,16 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "common/logging/log.h"
 #include "common/emu_window.h"
+#include "common/logging/log.h"
 
 #include "core/core.h"
 #include "core/settings.h"
 
-#include "video_core.h"
-#include "renderer_base.h"
-#include "renderer_opengl/renderer_opengl.h"
-
-#include "pica.h"
+#include "video_core/pica.h"
+#include "video_core/renderer_base.h"
+#include "video_core/video_core.h"
+#include "video_core/renderer_opengl/renderer_opengl.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // Video Core namespace