Fix more header sorting issues in VideoCommon/ (now check-includes clean).

Source/Core/VideoCommon/CommandProcessor.cpp

@@ -2,11 +2,11 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
+#include "Common/Atomic.h"
+#include "Common/ChunkFile.h"
 #include "Common/Common.h"
 #include "Common/MathUtil.h"
 #include "Common/Thread.h"
-#include "Common/Atomic.h"
-#include "Common/ChunkFile.h"
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 #include "Core/CoreTiming.h"

Source/Core/VideoCommon/Debugger.cpp

@@ -7,8 +7,8 @@
 
 #include "VideoCommon/Debugger.h"
 #include "VideoCommon/NativeVertexFormat.h"
-#include "VideoCommon/TextureCacheBase.h"
 #include "VideoCommon/PixelShaderGen.h"
+#include "VideoCommon/TextureCacheBase.h"
 #include "VideoCommon/VertexShaderGen.h"
 #include "VideoCommon/VideoConfig.h"
 

Source/Core/VideoCommon/LightingShaderGen.h

@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "VideoCommon/ShaderGenCommon.h"
 #include "VideoCommon/NativeVertexFormat.h"
+#include "VideoCommon/ShaderGenCommon.h"
 #include "VideoCommon/XFMemory.h"
 
 

Source/Core/VideoCommon/OpcodeDecoding.cpp

@@ -14,24 +14,22 @@
 
 #include "Common/Common.h"
 #include "Common/CPUDetect.h"
-
 #include "Core/Core.h"
 #include "Core/Host.h"
 #include "Core/FifoPlayer/FifoRecorder.h"
 #include "Core/HW/Memmap.h"
-
 #include "VideoCommon/BPMemory.h"
-#include "VideoCommon/CPMemory.h"
-#include "VideoCommon/XFMemory.h"
-
 #include "VideoCommon/CommandProcessor.h"
+#include "VideoCommon/CPMemory.h"
 #include "VideoCommon/DataReader.h"
 #include "VideoCommon/Fifo.h"
 #include "VideoCommon/OpcodeDecoding.h"
 #include "VideoCommon/Statistics.h"
 #include "VideoCommon/VertexLoaderManager.h"
-#include "VideoCommon/VideoConfig.h"
 #include "VideoCommon/VideoCommon.h"
+#include "VideoCommon/VideoConfig.h"
+#include "VideoCommon/XFMemory.h"
+
 
 u8* g_pVideoData = 0;
 bool g_bRecordFifoData = false;

Source/Core/VideoCommon/PixelEngine.cpp

@@ -6,16 +6,14 @@
 // http://developer.nvidia.com/object/General_FAQ.html#t6 !!!!!
 
 
+#include "Common/Atomic.h"
 #include "Common/ChunkFile.h"
 #include "Common/Common.h"
-#include "Common/Atomic.h"
-
 #include "Core/ConfigManager.h"
 #include "Core/CoreTiming.h"
 #include "Core/State.h"
 #include "Core/HW/MMIO.h"
 #include "Core/HW/ProcessorInterface.h"
-
 #include "VideoCommon/CommandProcessor.h"
 #include "VideoCommon/PixelEngine.h"
 #include "VideoCommon/RenderBase.h"

Source/Core/VideoCommon/PixelShaderGen.cpp

@@ -2,9 +2,9 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
+#include <cassert>
 #include <cmath>
 #include <cstdio>
-#include <assert.h>
 #include <locale.h>
 #ifdef __APPLE__
 	#include <xlocale.h>

Source/Core/VideoCommon/PixelShaderManager.h

@@ -5,9 +5,9 @@
 #pragma once
 
 #include "VideoCommon/BPMemory.h"
-#include "VideoCommon/XFMemory.h"
 #include "VideoCommon/ConstantManager.h"
 #include "VideoCommon/PixelShaderGen.h"
+#include "VideoCommon/XFMemory.h"
 
 class PointerWrap;
 

Source/Core/VideoCommon/RenderBase.h

@@ -16,9 +16,8 @@
 
 #include <string>
 
-#include "Common/Thread.h"
 #include "Common/MathUtil.h"
-
+#include "Common/Thread.h"
 #include "VideoCommon/BPMemory.h"
 #include "VideoCommon/FramebufferManagerBase.h"
 #include "VideoCommon/NativeVertexFormat.h"

Source/Core/VideoCommon/TextureConversionShader.cpp

@@ -10,9 +10,9 @@
 #endif
 
 #include "VideoCommon/BPMemory.h"
+#include "VideoCommon/RenderBase.h"
 #include "VideoCommon/TextureConversionShader.h"
 #include "VideoCommon/TextureDecoder.h"
-#include "VideoCommon/RenderBase.h"
 #include "VideoCommon/VideoConfig.h"
 
 #define WRITE p+=sprintf

Source/Core/VideoCommon/TextureDecoder_Generic.cpp

@@ -15,18 +15,14 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
-#include "Common.h"
-//#include "VideoCommon.h" // to get debug logs
-
-#include "CPUDetect.h"
-#include "TextureDecoder.h"
-#include "VideoConfig.h"
-
-#include "LookUpTables.h"
-
 #include <cmath>
 
-
+#include "Common/Common.h"
+#include "Common/CPUDetect.h"
+#include "VideoCommon/LookUpTables.h"
+#include "VideoCommon/TextureDecoder.h"
+//#include "VideoCommon/VideoCommon.h" // to get debug logs
+#include "VideoCommon/VideoConfig.h"
 
 bool TexFmt_Overlay_Enable=false;
 bool TexFmt_Overlay_Center=false;

Source/Core/VideoCommon/TextureDecoder_x64.cpp

@@ -8,8 +8,8 @@
 //#include "VideoCommon.h" // to get debug logs
 #include "Common/CPUDetect.h"
 
-#include "VideoCommon/TextureDecoder.h"
 #include "VideoCommon/LookUpTables.h"
+#include "VideoCommon/TextureDecoder.h"
 #include "VideoCommon/VideoConfig.h"
 
 #ifdef _OPENMP

Source/Core/VideoCommon/VertexLoader.cpp

@@ -17,11 +17,11 @@
 #include "VideoCommon/PixelEngine.h"
 #include "VideoCommon/Statistics.h"
 #include "VideoCommon/VertexLoader.h"
-#include "VideoCommon/VertexLoaderManager.h"
 #include "VideoCommon/VertexLoader_Color.h"
 #include "VideoCommon/VertexLoader_Normal.h"
 #include "VideoCommon/VertexLoader_Position.h"
 #include "VideoCommon/VertexLoader_TextCoord.h"
+#include "VideoCommon/VertexLoaderManager.h"
 #include "VideoCommon/VertexManagerBase.h"
 #include "VideoCommon/VideoCommon.h"
 #include "VideoCommon/VideoConfig.h"

Source/Core/VideoCommon/VertexShaderManager.cpp

@@ -7,17 +7,16 @@
 
 #include "Common/Common.h"
 #include "Common/MathUtil.h"
-
 #include "VideoCommon/BPMemory.h"
 #include "VideoCommon/CPMemory.h"
-#include "VideoCommon/XFMemory.h"
 #include "VideoCommon/RenderBase.h"
 #include "VideoCommon/Statistics.h"
-#include "VideoCommon/VideoCommon.h"
-#include "VideoCommon/VideoConfig.h"
 #include "VideoCommon/VertexManagerBase.h"
 #include "VideoCommon/VertexShaderGen.h"
 #include "VideoCommon/VertexShaderManager.h"
+#include "VideoCommon/VideoCommon.h"
+#include "VideoCommon/VideoConfig.h"
+#include "VideoCommon/XFMemory.h"
 
 float GC_ALIGNED16(g_fProjectionMatrix[16]);
 

Source/Core/VideoCommon/VideoBackendBase.cpp

@@ -2,8 +2,6 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
-#include "VideoCommon/VideoBackendBase.h"
-
 // TODO: ugly
 #ifdef _WIN32
 #include "VideoBackends/D3D/VideoBackend.h"
@@ -11,6 +9,8 @@
 #include "VideoBackends/OGL/VideoBackend.h"
 #include "VideoBackends/Software/VideoBackend.h"
 
+#include "VideoCommon/VideoBackendBase.h"
+
 std::vector<VideoBackend*> g_available_video_backends;
 VideoBackend* g_video_backend = NULL;
 static VideoBackend* s_default_backend = NULL;

Source/Core/VideoCommon/VideoConfig.cpp

@@ -7,14 +7,12 @@
 #include "Common/Common.h"
 #include "Common/FileUtil.h"
 #include "Common/IniFile.h"
-
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 #include "Core/Movie.h"
-
 #include "VideoCommon/OnScreenDisplay.h"
-#include "VideoCommon/VideoConfig.h"
 #include "VideoCommon/VideoCommon.h"
+#include "VideoCommon/VideoConfig.h"
 
 VideoConfig g_Config;
 VideoConfig g_ActiveConfig;

Source/Core/VideoCommon/VideoState.cpp

@@ -3,16 +3,16 @@
 // Refer to the license.txt file included.
 
 #include "VideoCommon/BPMemory.h"
-#include "VideoCommon/CPMemory.h"
-#include "VideoCommon/XFMemory.h"
-#include "VideoCommon/Fifo.h"
 #include "VideoCommon/CommandProcessor.h"
+#include "VideoCommon/CPMemory.h"
+#include "VideoCommon/Fifo.h"
 #include "VideoCommon/PixelEngine.h"
 #include "VideoCommon/PixelShaderManager.h"
 #include "VideoCommon/TextureDecoder.h"
 #include "VideoCommon/VertexManagerBase.h"
 #include "VideoCommon/VertexShaderManager.h"
 #include "VideoCommon/VideoState.h"
+#include "VideoCommon/XFMemory.h"
 
 static void DoState(PointerWrap &p)
 {