Use negative priorities to avoid special-casing the self-include

src/video_core/clipper.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "video_core/clipper.h"
 #include <algorithm>
 #include <array>
 #include <cstddef>
@@ -12,6 +11,7 @@
 #include "common/common_types.h"
 #include "common/logging/log.h"
 #include "common/vector_math.h"
+#include "video_core/clipper.h"
 #include "video_core/pica.h"
 #include "video_core/pica_state.h"
 #include "video_core/pica_types.h"

src/video_core/command_processor.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "video_core/command_processor.h"
 #include <array>
 #include <cstddef>
 #include <memory>
@@ -15,6 +14,7 @@
 #include "core/hw/gpu.h"
 #include "core/memory.h"
 #include "core/tracer/recorder.h"
+#include "video_core/command_processor.h"
 #include "video_core/debug_utils/debug_utils.h"
 #include "video_core/pica.h"
 #include "video_core/pica_state.h"

src/video_core/pica.cpp

@@ -2,11 +2,11 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "video_core/pica.h"
 #include <cstring>
 #include <iterator>
 #include <unordered_map>
 #include <utility>
+#include "video_core/pica.h"
 #include "video_core/pica_state.h"
 #include "video_core/primitive_assembly.h"
 #include "video_core/shader/shader.h"

src/video_core/primitive_assembly.cpp

@@ -2,9 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "video_core/primitive_assembly.h"
 #include "common/logging/log.h"
 #include "video_core/pica.h"
+#include "video_core/primitive_assembly.h"
 #include "video_core/shader/shader.h"
 
 namespace Pica {

src/video_core/rasterizer.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "video_core/rasterizer.h"
 #include <algorithm>
 #include <array>
 #include <cmath>
@@ -20,6 +19,7 @@
 #include "video_core/pica.h"
 #include "video_core/pica_state.h"
 #include "video_core/pica_types.h"
+#include "video_core/rasterizer.h"
 #include "video_core/shader/shader.h"
 #include "video_core/utils.h"
 

src/video_core/renderer_base.cpp

@@ -2,9 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "video_core/renderer_base.h"
 #include <atomic>
 #include <memory>
+#include "video_core/renderer_base.h"
 #include "video_core/renderer_opengl/gl_rasterizer.h"
 #include "video_core/swrasterizer.h"
 #include "video_core/video_core.h"

src/video_core/renderer_opengl/gl_rasterizer.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "video_core/renderer_opengl/gl_rasterizer.h"
 #include <memory>
 #include <string>
 #include <tuple>
@@ -16,6 +15,7 @@
 #include "core/hw/gpu.h"
 #include "video_core/pica.h"
 #include "video_core/pica_state.h"
+#include "video_core/renderer_opengl/gl_rasterizer.h"
 #include "video_core/renderer_opengl/gl_shader_gen.h"
 #include "video_core/renderer_opengl/gl_shader_util.h"
 #include "video_core/renderer_opengl/pica_to_gl.h"

src/video_core/renderer_opengl/gl_rasterizer_cache.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "video_core/renderer_opengl/gl_rasterizer_cache.h"
 #include <algorithm>
 #include <atomic>
 #include <cstring>
@@ -20,6 +19,7 @@
 #include "core/memory.h"
 #include "video_core/debug_utils/debug_utils.h"
 #include "video_core/pica_state.h"
+#include "video_core/renderer_opengl/gl_rasterizer_cache.h"
 #include "video_core/renderer_opengl/gl_state.h"
 #include "video_core/utils.h"
 #include "video_core/video_core.h"

src/video_core/renderer_opengl/gl_shader_gen.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "video_core/renderer_opengl/gl_shader_gen.h"
 #include <array>
 #include <cstddef>
 #include "common/assert.h"
@@ -10,6 +9,7 @@
 #include "common/logging/log.h"
 #include "video_core/pica.h"
 #include "video_core/renderer_opengl/gl_rasterizer.h"
+#include "video_core/renderer_opengl/gl_shader_gen.h"
 #include "video_core/renderer_opengl/gl_shader_util.h"
 
 using Pica::Regs;

src/video_core/renderer_opengl/gl_shader_util.cpp

@@ -2,10 +2,10 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "video_core/renderer_opengl/gl_shader_util.h"
 #include <vector>
 #include <glad/glad.h>
 #include "common/logging/log.h"
+#include "video_core/renderer_opengl/gl_shader_util.h"
 
 namespace GLShader {
 

src/video_core/renderer_opengl/gl_state.cpp

@@ -2,10 +2,10 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "video_core/renderer_opengl/gl_state.h"
 #include <glad/glad.h>
 #include "common/common_funcs.h"
 #include "common/logging/log.h"
+#include "video_core/renderer_opengl/gl_state.h"
 
 OpenGLState OpenGLState::cur_state;
 

src/video_core/renderer_opengl/renderer_opengl.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "video_core/renderer_opengl/renderer_opengl.h"
 #include <algorithm>
 #include <cstddef>
 #include <cstdlib>
@@ -22,6 +21,7 @@
 #include "core/tracer/recorder.h"
 #include "video_core/debug_utils/debug_utils.h"
 #include "video_core/rasterizer_interface.h"
+#include "video_core/renderer_opengl/renderer_opengl.h"
 #include "video_core/video_core.h"
 
 static const char vertex_shader[] = R"(

src/video_core/shader/shader.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "video_core/shader/shader.h"
 #include <atomic>
 #include <cmath>
 #include <cstring>
@@ -15,6 +14,7 @@
 #include "common/microprofile.h"
 #include "video_core/pica.h"
 #include "video_core/pica_state.h"
+#include "video_core/shader/shader.h"
 #include "video_core/shader/shader_interpreter.h"
 #ifdef ARCHITECTURE_x86_64
 #include "video_core/shader/shader_jit_x64.h"

src/video_core/shader/shader_interpreter.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "video_core/shader/shader.h"
 #include <algorithm>
 #include <array>
 #include <cmath>
@@ -14,6 +13,7 @@
 #include "common/vector_math.h"
 #include "video_core/pica_state.h"
 #include "video_core/pica_types.h"
+#include "video_core/shader/shader.h"
 #include "video_core/shader/shader_interpreter.h"
 
 using nihstro::OpCode;

src/video_core/shader/shader_jit_x64.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "shader.h"
 #include <algorithm>
 #include <cmath>
 #include <cstdint>
@@ -14,6 +13,7 @@
 #include "common/x64/abi.h"
 #include "common/x64/cpu_detect.h"
 #include "common/x64/emitter.h"
+#include "shader.h"
 #include "shader_jit_x64.h"
 #include "video_core/pica_state.h"
 #include "video_core/pica_types.h"

src/video_core/swrasterizer.cpp

@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "video_core/swrasterizer.h"
 #include "video_core/clipper.h"
+#include "video_core/swrasterizer.h"
 
 namespace VideoCore {
 

src/video_core/vertex_loader.cpp

@@ -1,4 +1,3 @@
-#include "video_core/vertex_loader.h"
 #include <memory>
 #include <boost/range/algorithm/fill.hpp>
 #include "common/alignment.h"
@@ -13,6 +12,7 @@
 #include "video_core/pica_state.h"
 #include "video_core/pica_types.h"
 #include "video_core/shader/shader.h"
+#include "video_core/vertex_loader.h"
 
 namespace Pica {
 

src/video_core/video_core.cpp

@@ -2,12 +2,12 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "video_core/video_core.h"
 #include <memory>
 #include "common/logging/log.h"
 #include "video_core/pica.h"
 #include "video_core/renderer_base.h"
 #include "video_core/renderer_opengl/renderer_opengl.h"
+#include "video_core/video_core.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // Video Core namespace