From 425f9dcd5155614e66fab635819ef12ee390dc7b Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Wed, 19 Feb 2014 12:14:09 +0100 Subject: [PATCH] Fix more header sorting issues in VideoBackends/ (now check-includes clean). --- Source/Core/VideoBackends/D3D/D3DBase.cpp | 3 +-- Source/Core/VideoBackends/D3D/D3DBase.h | 2 +- .../VideoBackends/D3D/LineGeometryShader.cpp | 2 +- .../VideoBackends/D3D/PSTextureEncoder.cpp | 2 +- .../Core/VideoBackends/D3D/PixelShaderCache.h | 2 +- Source/Core/VideoBackends/D3D/Render.cpp | 2 +- .../Core/VideoBackends/D3D/TextureCache.cpp | 7 +++---- .../VideoBackends/OGL/FramebufferManager.cpp | 2 +- .../OGL/GLExtensions/GLExtensions.h | 20 +++++++++---------- .../VideoBackends/OGL/NativeVertexFormat.cpp | 2 +- .../VideoBackends/OGL/ProgramShaderCache.cpp | 2 +- .../VideoBackends/OGL/ProgramShaderCache.h | 2 +- Source/Core/VideoBackends/OGL/Render.cpp | 2 +- Source/Core/VideoBackends/OGL/SamplerCache.h | 2 +- .../Core/VideoBackends/OGL/TextureCache.cpp | 2 +- .../VideoBackends/Software/BPMemLoader.cpp | 2 +- .../Core/VideoBackends/Software/DebugUtil.cpp | 4 ++-- Source/Core/VideoBackends/Software/SWmain.cpp | 13 ++++++------ .../VideoBackends/Software/TextureSampler.cpp | 4 ++-- .../Software/VideoConfigDialog.h | 19 +++++++++--------- 20 files changed, 46 insertions(+), 50 deletions(-) diff --git a/Source/Core/VideoBackends/D3D/D3DBase.cpp b/Source/Core/VideoBackends/D3D/D3DBase.cpp index a2ed0f4268..4575d47f37 100644 --- 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 { diff --git a/Source/Core/VideoBackends/D3D/D3DBase.h b/Source/Core/VideoBackends/D3D/D3DBase.h index a2afabbaf8..457b62d8d9 100644 --- a/Source/Core/VideoBackends/D3D/D3DBase.h +++ b/Source/Core/VideoBackends/D3D/D3DBase.h @@ -4,9 +4,9 @@ #pragma once -#include #include #include +#include #include #include "Common/Common.h" diff --git a/Source/Core/VideoBackends/D3D/LineGeometryShader.cpp b/Source/Core/VideoBackends/D3D/LineGeometryShader.cpp index 36f519f974..b0b71313fa 100644 --- a/Source/Core/VideoBackends/D3D/LineGeometryShader.cpp +++ b/Source/Core/VideoBackends/D3D/LineGeometryShader.cpp @@ -4,9 +4,9 @@ #include -#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 diff --git a/Source/Core/VideoBackends/D3D/PSTextureEncoder.cpp b/Source/Core/VideoBackends/D3D/PSTextureEncoder.cpp index fdb54bb189..3820fb3cb3 100644 --- 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" diff --git a/Source/Core/VideoBackends/D3D/PixelShaderCache.h b/Source/Core/VideoBackends/D3D/PixelShaderCache.h index 55beee1d61..26981dc481 100644 --- a/Source/Core/VideoBackends/D3D/PixelShaderCache.h +++ b/Source/Core/VideoBackends/D3D/PixelShaderCache.h @@ -4,8 +4,8 @@ #pragma once -#include #include +#include #include "VideoCommon/PixelShaderGen.h" diff --git a/Source/Core/VideoBackends/D3D/Render.cpp b/Source/Core/VideoBackends/D3D/Render.cpp index 623e5b471b..23467f2406 100644 --- 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" diff --git a/Source/Core/VideoBackends/D3D/TextureCache.cpp b/Source/Core/VideoBackends/D3D/TextureCache.cpp index 7fc1ed913a..8e616582ca 100644 --- 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" diff --git a/Source/Core/VideoBackends/OGL/FramebufferManager.cpp b/Source/Core/VideoBackends/OGL/FramebufferManager.cpp index 9913bb2a4f..3fca224bb8 100644 --- 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" diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.h b/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.h index 7c3c22c427..442fda9e78 100644 --- 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 { diff --git a/Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp b/Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp index 6b6a46bbf3..dad409e47a 100644 --- 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" diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp index a701158a6d..79826860a7 100644 --- 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 diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.h b/Source/Core/VideoBackends/OGL/ProgramShaderCache.h index 93ac124925..8db3eb7ccb 100644 --- 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" diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/Render.cpp index 464054307e..433b71847a 100644 --- 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" diff --git a/Source/Core/VideoBackends/OGL/SamplerCache.h b/Source/Core/VideoBackends/OGL/SamplerCache.h index ec357c0cb6..f8e77a0b93 100644 --- a/Source/Core/VideoBackends/OGL/SamplerCache.h +++ b/Source/Core/VideoBackends/OGL/SamplerCache.h @@ -2,8 +2,8 @@ #include -#include "VideoBackends/OGL/Render.h" #include "VideoBackends/OGL/GLUtil.h" +#include "VideoBackends/OGL/Render.h" namespace OGL { diff --git a/Source/Core/VideoBackends/OGL/TextureCache.cpp b/Source/Core/VideoBackends/OGL/TextureCache.cpp index 628c9a9432..29a2a13a27 100644 --- 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 #include +#include #include #ifdef _WIN32 diff --git a/Source/Core/VideoBackends/Software/BPMemLoader.cpp b/Source/Core/VideoBackends/Software/BPMemLoader.cpp index b62776fa64..738b909fc0 100644 --- 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() diff --git a/Source/Core/VideoBackends/Software/DebugUtil.cpp b/Source/Core/VideoBackends/Software/DebugUtil.cpp index 80259a4576..95303d4c2f 100644 --- 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" diff --git a/Source/Core/VideoBackends/Software/SWmain.cpp b/Source/Core/VideoBackends/Software/SWmain.cpp index efc4471d0e..b4a4cb2a2a 100644 --- 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 diff --git a/Source/Core/VideoBackends/Software/TextureSampler.cpp b/Source/Core/VideoBackends/Software/TextureSampler.cpp index 4f5a3a4a67..87ac79563b 100644 --- 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 + #include "Core/HW/Memmap.h" #include "VideoBackends/Software/BPMemLoader.h" #include "VideoBackends/Software/TextureSampler.h" #include "VideoCommon/TextureDecoder.h" -#include - #define ALLOW_MIPMAP 1 namespace TextureSampler diff --git a/Source/Core/VideoBackends/Software/VideoConfigDialog.h b/Source/Core/VideoBackends/Software/VideoConfigDialog.h index 057ceb15e1..59d76a912b 100644 --- a/Source/Core/VideoBackends/Software/VideoConfigDialog.h +++ b/Source/Core/VideoBackends/Software/VideoConfigDialog.h @@ -6,21 +6,20 @@ #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "Core/ConfigManager.h" #include "VideoBackends/Software/SWVideoConfig.h" #include "VideoCommon/VideoBackendBase.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include - class VideoConfigDialog : public wxDialog { public: