From ffe588cc240745f0a30595c604083d37e791c670 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Wed, 19 Feb 2014 02:27:20 +0100 Subject: [PATCH] Fix more header sorting issues in VideoCommon/ (now check-includes clean). --- Source/Core/VideoCommon/CommandProcessor.cpp | 4 ++-- Source/Core/VideoCommon/Debugger.cpp | 2 +- Source/Core/VideoCommon/LightingShaderGen.h | 2 +- Source/Core/VideoCommon/OpcodeDecoding.cpp | 10 ++++------ Source/Core/VideoCommon/PixelEngine.cpp | 4 +--- Source/Core/VideoCommon/PixelShaderGen.cpp | 2 +- Source/Core/VideoCommon/PixelShaderManager.h | 2 +- Source/Core/VideoCommon/RenderBase.h | 3 +-- .../Core/VideoCommon/TextureConversionShader.cpp | 2 +- .../Core/VideoCommon/TextureDecoder_Generic.cpp | 16 ++++++---------- Source/Core/VideoCommon/TextureDecoder_x64.cpp | 2 +- Source/Core/VideoCommon/VertexLoader.cpp | 2 +- Source/Core/VideoCommon/VertexShaderManager.cpp | 7 +++---- Source/Core/VideoCommon/VideoBackendBase.cpp | 4 ++-- Source/Core/VideoCommon/VideoConfig.cpp | 4 +--- Source/Core/VideoCommon/VideoState.cpp | 6 +++--- 16 files changed, 30 insertions(+), 42 deletions(-) diff --git a/Source/Core/VideoCommon/CommandProcessor.cpp b/Source/Core/VideoCommon/CommandProcessor.cpp index 21955b27a5..0ccd251718 100644 --- a/Source/Core/VideoCommon/CommandProcessor.cpp +++ b/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" diff --git a/Source/Core/VideoCommon/Debugger.cpp b/Source/Core/VideoCommon/Debugger.cpp index 3a22fa8c74..affeb9183a 100644 --- a/Source/Core/VideoCommon/Debugger.cpp +++ b/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" diff --git a/Source/Core/VideoCommon/LightingShaderGen.h b/Source/Core/VideoCommon/LightingShaderGen.h index c763416eb8..9379f65775 100644 --- a/Source/Core/VideoCommon/LightingShaderGen.h +++ b/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" diff --git a/Source/Core/VideoCommon/OpcodeDecoding.cpp b/Source/Core/VideoCommon/OpcodeDecoding.cpp index 29cee8e1a5..8c680a04c5 100644 --- a/Source/Core/VideoCommon/OpcodeDecoding.cpp +++ b/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; diff --git a/Source/Core/VideoCommon/PixelEngine.cpp b/Source/Core/VideoCommon/PixelEngine.cpp index 9436d93db7..4d913dd836 100644 --- a/Source/Core/VideoCommon/PixelEngine.cpp +++ b/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" diff --git a/Source/Core/VideoCommon/PixelShaderGen.cpp b/Source/Core/VideoCommon/PixelShaderGen.cpp index a243810832..66965139b8 100644 --- a/Source/Core/VideoCommon/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/PixelShaderGen.cpp @@ -2,9 +2,9 @@ // Licensed under GPLv2 // Refer to the license.txt file included. +#include #include #include -#include #include #ifdef __APPLE__ #include diff --git a/Source/Core/VideoCommon/PixelShaderManager.h b/Source/Core/VideoCommon/PixelShaderManager.h index 437c088e11..bd0c904b43 100644 --- a/Source/Core/VideoCommon/PixelShaderManager.h +++ b/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; diff --git a/Source/Core/VideoCommon/RenderBase.h b/Source/Core/VideoCommon/RenderBase.h index bf86265b1a..96bf4312d7 100644 --- a/Source/Core/VideoCommon/RenderBase.h +++ b/Source/Core/VideoCommon/RenderBase.h @@ -16,9 +16,8 @@ #include -#include "Common/Thread.h" #include "Common/MathUtil.h" - +#include "Common/Thread.h" #include "VideoCommon/BPMemory.h" #include "VideoCommon/FramebufferManagerBase.h" #include "VideoCommon/NativeVertexFormat.h" diff --git a/Source/Core/VideoCommon/TextureConversionShader.cpp b/Source/Core/VideoCommon/TextureConversionShader.cpp index d6cf45c777..a7db33418f 100644 --- a/Source/Core/VideoCommon/TextureConversionShader.cpp +++ b/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 diff --git a/Source/Core/VideoCommon/TextureDecoder_Generic.cpp b/Source/Core/VideoCommon/TextureDecoder_Generic.cpp index a4f301e36c..91fb723e84 100644 --- a/Source/Core/VideoCommon/TextureDecoder_Generic.cpp +++ b/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 - +#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; diff --git a/Source/Core/VideoCommon/TextureDecoder_x64.cpp b/Source/Core/VideoCommon/TextureDecoder_x64.cpp index d49e4ddb87..d00a9bb454 100644 --- a/Source/Core/VideoCommon/TextureDecoder_x64.cpp +++ b/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 diff --git a/Source/Core/VideoCommon/VertexLoader.cpp b/Source/Core/VideoCommon/VertexLoader.cpp index 45dc47f2c3..a9bdb468b8 100644 --- a/Source/Core/VideoCommon/VertexLoader.cpp +++ b/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" diff --git a/Source/Core/VideoCommon/VertexShaderManager.cpp b/Source/Core/VideoCommon/VertexShaderManager.cpp index 5e88d97867..a9a9f4de8d 100644 --- a/Source/Core/VideoCommon/VertexShaderManager.cpp +++ b/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]); diff --git a/Source/Core/VideoCommon/VideoBackendBase.cpp b/Source/Core/VideoCommon/VideoBackendBase.cpp index a9a6c1f77b..36e52b6654 100644 --- a/Source/Core/VideoCommon/VideoBackendBase.cpp +++ b/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 g_available_video_backends; VideoBackend* g_video_backend = NULL; static VideoBackend* s_default_backend = NULL; diff --git a/Source/Core/VideoCommon/VideoConfig.cpp b/Source/Core/VideoCommon/VideoConfig.cpp index e2caac92a5..c6e37b96fc 100644 --- a/Source/Core/VideoCommon/VideoConfig.cpp +++ b/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; diff --git a/Source/Core/VideoCommon/VideoState.cpp b/Source/Core/VideoCommon/VideoState.cpp index bb0a3c3a9d..b73088ad22 100644 --- a/Source/Core/VideoCommon/VideoState.cpp +++ b/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) {