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

2014-02-19 12:14:09 +01:00 · 2014-02-19 12:14:09 +01:00 · 425f9dcd51
parent 592ebc5262
commit 425f9dcd51
20 changed files with 46 additions and 50 deletions
--- a/Source/Core/VideoBackends/D3D/D3DBase.cpp
+++ b/Source/Core/VideoBackends/D3D/D3DBase.cpp
@ -3,11 +3,10 @@
 // Refer to the license.txt file included.

 #include "Common/StringUtil.h"
-#include "VideoCommon/VideoConfig.h"
-
 #include "VideoBackends/D3D/D3DBase.h"
 #include "VideoBackends/D3D/D3DTexture.h"
 #include "VideoBackends/D3D/GfxState.h"
+#include "VideoCommon/VideoConfig.h"

 namespace DX11
 {
--- a/Source/Core/VideoBackends/D3D/D3DBase.h
+++ b/Source/Core/VideoBackends/D3D/D3DBase.h
@ -4,9 +4,9 @@

 #pragma once

-#include <dxgi.h>
 #include <d3d11.h>
 #include <d3dcompiler.h>
+#include <dxgi.h>
 #include <vector>

 #include "Common/Common.h"
--- a/Source/Core/VideoBackends/D3D/LineGeometryShader.cpp
+++ b/Source/Core/VideoBackends/D3D/LineGeometryShader.cpp
@ -4,9 +4,9 @@

 #include <sstream>

-#include "VideoBackends/D3D/LineGeometryShader.h"
 #include "VideoBackends/D3D/D3DBase.h"
 #include "VideoBackends/D3D/D3DShader.h"
+#include "VideoBackends/D3D/LineGeometryShader.h"
 #include "VideoCommon/VertexShaderGen.h"

 namespace DX11
--- a/Source/Core/VideoBackends/D3D/PSTextureEncoder.cpp
+++ b/Source/Core/VideoBackends/D3D/PSTextureEncoder.cpp
@ -5,8 +5,8 @@
 #include "Core/HW/Memmap.h"
 #include "VideoBackends/D3D/D3DBase.h"
 #include "VideoBackends/D3D/D3DShader.h"
-#include "VideoBackends/D3D/GfxState.h"
 #include "VideoBackends/D3D/FramebufferManager.h"
+#include "VideoBackends/D3D/GfxState.h"
 #include "VideoBackends/D3D/PSTextureEncoder.h"
 #include "VideoBackends/D3D/Render.h"
 #include "VideoBackends/D3D/TextureCache.h"
--- a/Source/Core/VideoBackends/D3D/PixelShaderCache.h
+++ b/Source/Core/VideoBackends/D3D/PixelShaderCache.h
@ -4,8 +4,8 @@

 #pragma once

-#include <map>
 #include <d3d11.h>
+#include <map>

 #include "VideoCommon/PixelShaderGen.h"

--- a/Source/Core/VideoBackends/D3D/Render.cpp
+++ b/Source/Core/VideoBackends/D3D/Render.cpp
@ -8,8 +8,8 @@

 #include "Common/Timer.h"

-#include "Core/Core.h"
 #include "Core/ConfigManager.h"
+#include "Core/Core.h"
 #include "Core/Host.h"
 #include "Core/Movie.h"

--- a/Source/Core/VideoBackends/D3D/TextureCache.cpp
+++ b/Source/Core/VideoBackends/D3D/TextureCache.cpp
@ -7,11 +7,10 @@
 #include "VideoBackends/D3D/D3DUtil.h"
 #include "VideoBackends/D3D/FramebufferManager.h"
 #include "VideoBackends/D3D/PixelShaderCache.h"
-#include "VideoBackends/D3D/TextureCache.h"
-#include "VideoBackends/D3D/VertexShaderCache.h"
-#include "VideoBackends/D3D/TextureEncoder.h"
 #include "VideoBackends/D3D/PSTextureEncoder.h"
-
+#include "VideoBackends/D3D/TextureCache.h"
+#include "VideoBackends/D3D/TextureEncoder.h"
+#include "VideoBackends/D3D/VertexShaderCache.h"
 #include "VideoCommon/ImageWrite.h"
 #include "VideoCommon/RenderBase.h"
 #include "VideoCommon/VideoConfig.h"
--- a/Source/Core/VideoBackends/OGL/FramebufferManager.cpp
+++ b/Source/Core/VideoBackends/OGL/FramebufferManager.cpp
@ -4,8 +4,8 @@

 #include "Core/HW/Memmap.h"

-#include "VideoBackends/OGL/Globals.h"
 #include "VideoBackends/OGL/FramebufferManager.h"
+#include "VideoBackends/OGL/Globals.h"
 #include "VideoBackends/OGL/Render.h"
 #include "VideoBackends/OGL/TextureConverter.h"

--- a/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.h
+++ b/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.h
@ -6,15 +6,6 @@

 #include "DolphinWX/GLInterface/GLInterface.h"

-#include "VideoBackends/OGL/GLExtensions/gl_1_1.h"
-#include "VideoBackends/OGL/GLExtensions/gl_1_2.h"
-#include "VideoBackends/OGL/GLExtensions/gl_1_3.h"
-#include "VideoBackends/OGL/GLExtensions/gl_1_4.h"
-#include "VideoBackends/OGL/GLExtensions/gl_1_5.h"
-#include "VideoBackends/OGL/GLExtensions/gl_2_0.h"
-#include "VideoBackends/OGL/GLExtensions/gl_3_0.h"
-#include "VideoBackends/OGL/GLExtensions/gl_3_1.h"
-#include "VideoBackends/OGL/GLExtensions/gl_3_2.h"
 #include "VideoBackends/OGL/GLExtensions/ARB_blend_func_extended.h"
 #include "VideoBackends/OGL/GLExtensions/ARB_buffer_storage.h"
 #include "VideoBackends/OGL/GLExtensions/ARB_debug_output.h"
@ -29,9 +20,18 @@
 #include "VideoBackends/OGL/GLExtensions/ARB_uniform_buffer_object.h"
 #include "VideoBackends/OGL/GLExtensions/ARB_vertex_array_object.h"
 #include "VideoBackends/OGL/GLExtensions/ARB_viewport_array.h"
+#include "VideoBackends/OGL/GLExtensions/gl_1_1.h"
+#include "VideoBackends/OGL/GLExtensions/gl_1_2.h"
+#include "VideoBackends/OGL/GLExtensions/gl_1_3.h"
+#include "VideoBackends/OGL/GLExtensions/gl_1_4.h"
+#include "VideoBackends/OGL/GLExtensions/gl_1_5.h"
+#include "VideoBackends/OGL/GLExtensions/gl_2_0.h"
+#include "VideoBackends/OGL/GLExtensions/gl_3_0.h"
+#include "VideoBackends/OGL/GLExtensions/gl_3_1.h"
+#include "VideoBackends/OGL/GLExtensions/gl_3_2.h"
 #include "VideoBackends/OGL/GLExtensions/KHR_debug.h"
-#include "VideoBackends/OGL/GLExtensions/NV_primitive_restart.h"
 #include "VideoBackends/OGL/GLExtensions/NV_framebuffer_multisample_coverage.h"
+#include "VideoBackends/OGL/GLExtensions/NV_primitive_restart.h"

 namespace GLExtensions
 {
--- a/Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp
+++ b/Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp
@ -2,9 +2,9 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

+#include "Common/MemoryUtil.h"
 #include "Common/x64ABI.h"
 #include "Common/x64Emitter.h"
-#include "Common/MemoryUtil.h"

 #include "VideoBackends/OGL/GLUtil.h"
 #include "VideoBackends/OGL/ProgramShaderCache.h"
--- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp
+++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp
@ -11,8 +11,8 @@
 #include "VideoCommon/Debugger.h"
 #include "VideoCommon/DriverDetails.h"
 #include "VideoCommon/ImageWrite.h"
-#include "VideoCommon/Statistics.h"
 #include "VideoCommon/PixelShaderManager.h"
+#include "VideoCommon/Statistics.h"
 #include "VideoCommon/VertexShaderManager.h"

 namespace OGL
--- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.h
+++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.h
@ -4,8 +4,8 @@

 #pragma once

-#include "Core/ConfigManager.h"
 #include "Common/LinearDiskCache.h"
+#include "Core/ConfigManager.h"
 #include "VideoBackends/OGL/GLUtil.h"
 #include "VideoCommon/PixelShaderGen.h"
 #include "VideoCommon/VertexShaderGen.h"
--- a/Source/Core/VideoBackends/OGL/Render.cpp
+++ b/Source/Core/VideoBackends/OGL/Render.cpp
@ -11,8 +11,8 @@
 #include "Common/CommonPaths.h"
 #include "Common/FileUtil.h"
 #include "Common/StringUtil.h"
-#include "Common/Timer.h"
 #include "Common/Thread.h"
+#include "Common/Timer.h"

 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
--- a/Source/Core/VideoBackends/OGL/SamplerCache.h
+++ b/Source/Core/VideoBackends/OGL/SamplerCache.h
@ -2,8 +2,8 @@

 #include <map>

-#include "VideoBackends/OGL/Render.h"
 #include "VideoBackends/OGL/GLUtil.h"
+#include "VideoBackends/OGL/Render.h"

 namespace OGL
 {
--- a/Source/Core/VideoBackends/OGL/TextureCache.cpp
+++ b/Source/Core/VideoBackends/OGL/TextureCache.cpp
@ -2,8 +2,8 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include <fstream>
 #include <cmath>
+#include <fstream>
 #include <vector>

 #ifdef _WIN32
--- a/Source/Core/VideoBackends/Software/BPMemLoader.cpp
+++ b/Source/Core/VideoBackends/Software/BPMemLoader.cpp
@ -11,8 +11,8 @@
 #include "VideoBackends/Software/SWPixelEngine.h"
 #include "VideoBackends/Software/Tev.h"

-#include "VideoCommon/VideoCommon.h"
 #include "VideoCommon/TextureDecoder.h"
+#include "VideoCommon/VideoCommon.h"


 void InitBPMemory()
--- a/Source/Core/VideoBackends/Software/DebugUtil.cpp
+++ b/Source/Core/VideoBackends/Software/DebugUtil.cpp
@ -10,9 +10,9 @@
 #include "VideoBackends/Software/DebugUtil.h"
 #include "VideoBackends/Software/EfbInterface.h"
 #include "VideoBackends/Software/HwRasterizer.h"
-#include "VideoBackends/Software/SWVideoConfig.h"
-#include "VideoBackends/Software/SWStatistics.h"
 #include "VideoBackends/Software/SWCommandProcessor.h"
+#include "VideoBackends/Software/SWStatistics.h"
+#include "VideoBackends/Software/SWVideoConfig.h"
 #include "VideoBackends/Software/TextureSampler.h"

 #include "VideoCommon/ImageWrite.h"
--- a/Source/Core/VideoBackends/Software/SWmain.cpp
+++ b/Source/Core/VideoBackends/Software/SWmain.cpp
@ -2,13 +2,8 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "Common/Common.h"
-
-#if defined(HAVE_WX) && HAVE_WX
-#include "VideoBackends/Software/VideoConfigDialog.h"
-#endif // HAVE_WX
-
 #include "Common/Atomic.h"
+#include "Common/Common.h"
 #include "Common/FileUtil.h"
 #include "Common/LogManager.h"

@ -26,14 +21,18 @@
 #include "VideoBackends/Software/OpcodeDecoder.h"
 #include "VideoBackends/Software/Rasterizer.h"
 #include "VideoBackends/Software/SWCommandProcessor.h"
-#include "VideoBackends/Software/SWRenderer.h"
 #include "VideoBackends/Software/SWPixelEngine.h"
+#include "VideoBackends/Software/SWRenderer.h"
 #include "VideoBackends/Software/SWStatistics.h"
 #include "VideoBackends/Software/SWVertexLoader.h"
 #include "VideoBackends/Software/SWVideoConfig.h"
 #include "VideoBackends/Software/VideoBackend.h"
 #include "VideoBackends/Software/XFMemLoader.h"

+#if defined(HAVE_WX) && HAVE_WX
+#include "VideoBackends/Software/VideoConfigDialog.h"
+#endif // HAVE_WX
+
 #include "VideoCommon/OnScreenDisplay.h"

 #define VSYNC_ENABLED 0
--- a/Source/Core/VideoBackends/Software/TextureSampler.cpp
+++ b/Source/Core/VideoBackends/Software/TextureSampler.cpp
@ -2,13 +2,13 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

+#include <cmath>
+
 #include "Core/HW/Memmap.h"
 #include "VideoBackends/Software/BPMemLoader.h"
 #include "VideoBackends/Software/TextureSampler.h"
 #include "VideoCommon/TextureDecoder.h"

-#include <cmath>
-
 #define ALLOW_MIPMAP 1

 namespace TextureSampler
--- a/Source/Core/VideoBackends/Software/VideoConfigDialog.h
+++ b/Source/Core/VideoBackends/Software/VideoConfigDialog.h
@ -6,21 +6,20 @@

 #include <string>
 #include <vector>
+#include <wx/button.h>
+#include <wx/checkbox.h>
+#include <wx/combobox.h>
+#include <wx/notebook.h>
+#include <wx/panel.h>
+#include <wx/spinctrl.h>
+#include <wx/stattext.h>
+#include <wx/textctrl.h>
+#include <wx/wx.h>

 #include "Core/ConfigManager.h"
 #include "VideoBackends/Software/SWVideoConfig.h"
 #include "VideoCommon/VideoBackendBase.h"

-#include <wx/wx.h>
-#include <wx/textctrl.h>
-#include <wx/button.h>
-#include <wx/stattext.h>
-#include <wx/combobox.h>
-#include <wx/checkbox.h>
-#include <wx/notebook.h>
-#include <wx/panel.h>
-#include <wx/spinctrl.h>
-
 class VideoConfigDialog : public wxDialog
 {
 public: