From 273ace7bb7408853a31448e73fbd251ed0009e87 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 31 Jan 2017 23:29:29 -0500 Subject: [PATCH] LightingShaderGen: Remove unnecessary includes --- Source/Core/VideoBackends/D3D/D3DUtil.cpp | 2 ++ .../Core/VideoBackends/D3D/VertexManager.cpp | 6 +++++- Source/Core/VideoBackends/D3D/VertexManager.h | 2 ++ .../Core/VideoBackends/D3D12/TextureCache.cpp | 6 +++++- Source/Core/VideoBackends/D3D12/XFBEncoder.cpp | 4 +++- .../Core/VideoBackends/Null/VertexManager.cpp | 4 ++-- .../VideoBackends/OGL/ProgramShaderCache.cpp | 4 +++- Source/Core/VideoBackends/OGL/Render.cpp | 1 + Source/Core/VideoBackends/OGL/TextureCache.cpp | 18 +++++------------- .../VideoBackends/OGL/TextureConverter.cpp | 5 +++-- .../Core/VideoBackends/OGL/TextureConverter.h | 2 +- .../Vulkan/FramebufferManager.cpp | 2 ++ .../Core/VideoBackends/Vulkan/ObjectCache.cpp | 3 +++ Source/Core/VideoBackends/Vulkan/Renderer.cpp | 1 + .../Core/VideoBackends/Vulkan/StateTracker.h | 1 + .../VideoBackends/Vulkan/VertexManager.cpp | 3 +++ Source/Core/VideoBackends/Vulkan/main.cpp | 3 +-- Source/Core/VideoCommon/LightingShaderGen.cpp | 8 +++++++- Source/Core/VideoCommon/LightingShaderGen.h | 6 ++---- Source/Core/VideoCommon/PixelShaderGen.cpp | 4 +++- 20 files changed, 55 insertions(+), 30 deletions(-) diff --git a/Source/Core/VideoBackends/D3D/D3DUtil.cpp b/Source/Core/VideoBackends/D3D/D3DUtil.cpp index 58cfba4deb..2f5d1af5c6 100644 --- a/Source/Core/VideoBackends/D3D/D3DUtil.cpp +++ b/Source/Core/VideoBackends/D3D/D3DUtil.cpp @@ -9,6 +9,8 @@ #include #include "Common/Align.h" +#include "Common/Assert.h" +#include "Common/Logging/Log.h" #include "VideoBackends/D3D/D3DBase.h" #include "VideoBackends/D3D/D3DShader.h" #include "VideoBackends/D3D/D3DState.h" diff --git a/Source/Core/VideoBackends/D3D/VertexManager.cpp b/Source/Core/VideoBackends/D3D/VertexManager.cpp index 9adfb30379..7bb41a0f42 100644 --- a/Source/Core/VideoBackends/D3D/VertexManager.cpp +++ b/Source/Core/VideoBackends/D3D/VertexManager.cpp @@ -2,6 +2,10 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "VideoBackends/D3D/VertexManager.h" + +#include + #include "Common/CommonTypes.h" #include "VideoBackends/D3D/BoundingBox.h" @@ -10,12 +14,12 @@ #include "VideoBackends/D3D/GeometryShaderCache.h" #include "VideoBackends/D3D/PixelShaderCache.h" #include "VideoBackends/D3D/Render.h" -#include "VideoBackends/D3D/VertexManager.h" #include "VideoBackends/D3D/VertexShaderCache.h" #include "VideoCommon/BoundingBox.h" #include "VideoCommon/Debugger.h" #include "VideoCommon/IndexGenerator.h" +#include "VideoCommon/NativeVertexFormat.h" #include "VideoCommon/RenderBase.h" #include "VideoCommon/Statistics.h" #include "VideoCommon/VertexLoaderManager.h" diff --git a/Source/Core/VideoBackends/D3D/VertexManager.h b/Source/Core/VideoBackends/D3D/VertexManager.h index 6d874c6864..67c2962522 100644 --- a/Source/Core/VideoBackends/D3D/VertexManager.h +++ b/Source/Core/VideoBackends/D3D/VertexManager.h @@ -6,6 +6,8 @@ #include "VideoCommon/VertexManagerBase.h" +struct ID3D11Buffer; + namespace DX11 { class VertexManager : public VertexManagerBase diff --git a/Source/Core/VideoBackends/D3D12/TextureCache.cpp b/Source/Core/VideoBackends/D3D12/TextureCache.cpp index f30c6abd7d..4e297dc7e8 100644 --- a/Source/Core/VideoBackends/D3D12/TextureCache.cpp +++ b/Source/Core/VideoBackends/D3D12/TextureCache.cpp @@ -3,7 +3,11 @@ // Refer to the license.txt file included. #include "VideoBackends/D3D12/TextureCache.h" + #include "Common/Align.h" +#include "Common/Assert.h" +#include "Common/Logging/Log.h" + #include "VideoBackends/D3D12/D3DBase.h" #include "VideoBackends/D3D12/D3DCommandListManager.h" #include "VideoBackends/D3D12/D3DDescriptorHeapManager.h" @@ -15,8 +19,8 @@ #include "VideoBackends/D3D12/PSTextureEncoder.h" #include "VideoBackends/D3D12/StaticShaderCache.h" #include "VideoBackends/D3D12/TextureEncoder.h" + #include "VideoCommon/ImageWrite.h" -#include "VideoCommon/LookUpTables.h" #include "VideoCommon/RenderBase.h" #include "VideoCommon/VideoConfig.h" diff --git a/Source/Core/VideoBackends/D3D12/XFBEncoder.cpp b/Source/Core/VideoBackends/D3D12/XFBEncoder.cpp index 9e0d15327e..961ae8f477 100644 --- a/Source/Core/VideoBackends/D3D12/XFBEncoder.cpp +++ b/Source/Core/VideoBackends/D3D12/XFBEncoder.cpp @@ -3,13 +3,15 @@ // Refer to the license.txt file included. #include "VideoBackends/D3D12/XFBEncoder.h" + #include "Common/Align.h" +#include "Common/Assert.h" #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" + #include "VideoBackends/D3D12/D3DBase.h" #include "VideoBackends/D3D12/D3DCommandListManager.h" -#include "VideoBackends/D3D12/D3DShader.h" #include "VideoBackends/D3D12/D3DState.h" #include "VideoBackends/D3D12/D3DUtil.h" #include "VideoBackends/D3D12/FramebufferManager.h" diff --git a/Source/Core/VideoBackends/Null/VertexManager.cpp b/Source/Core/VideoBackends/Null/VertexManager.cpp index 86f4c14d48..c615bc468b 100644 --- a/Source/Core/VideoBackends/Null/VertexManager.cpp +++ b/Source/Core/VideoBackends/Null/VertexManager.cpp @@ -3,12 +3,12 @@ // Refer to the license.txt file included. #include "VideoBackends/Null/VertexManager.h" + #include "VideoBackends/Null/ShaderCache.h" #include "VideoCommon/IndexGenerator.h" -#include "VideoCommon/Statistics.h" +#include "VideoCommon/NativeVertexFormat.h" #include "VideoCommon/VertexLoaderManager.h" -#include "VideoCommon/VideoConfig.h" namespace Null { diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp index 9fc17d6d5d..76e7b641e4 100644 --- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp +++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp @@ -2,16 +2,18 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "VideoBackends/OGL/ProgramShaderCache.h" + #include #include #include "Common/Align.h" #include "Common/Common.h" +#include "Common/MsgHandler.h" #include "Common/StringUtil.h" #include "Core/ConfigManager.h" -#include "VideoBackends/OGL/ProgramShaderCache.h" #include "VideoBackends/OGL/Render.h" #include "VideoBackends/OGL/StreamBuffer.h" diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/Render.cpp index 85dbf843b7..f6c5f14112 100644 --- a/Source/Core/VideoBackends/OGL/Render.cpp +++ b/Source/Core/VideoBackends/OGL/Render.cpp @@ -19,6 +19,7 @@ #include "Common/GL/GLUtil.h" #include "Common/Logging/LogManager.h" #include "Common/MathUtil.h" +#include "Common/MsgHandler.h" #include "Common/StringUtil.h" #include "Core/Core.h" diff --git a/Source/Core/VideoBackends/OGL/TextureCache.cpp b/Source/Core/VideoBackends/OGL/TextureCache.cpp index 8408a1f1b3..2cf0623939 100644 --- a/Source/Core/VideoBackends/OGL/TextureCache.cpp +++ b/Source/Core/VideoBackends/OGL/TextureCache.cpp @@ -2,35 +2,27 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "VideoBackends/OGL/TextureCache.h" + #include #include +#include #include #include #include -#include "Common/Common.h" -#include "Common/CommonPaths.h" -#include "Common/FileUtil.h" -#include "Common/Hash.h" -#include "Common/MemoryUtil.h" -#include "Common/StringUtil.h" - #include "Common/GL/GLInterfaceBase.h" - -#include "Core/HW/Memmap.h" +#include "Common/MsgHandler.h" +#include "Common/StringUtil.h" #include "VideoBackends/OGL/FramebufferManager.h" #include "VideoBackends/OGL/ProgramShaderCache.h" #include "VideoBackends/OGL/Render.h" #include "VideoBackends/OGL/SamplerCache.h" #include "VideoBackends/OGL/StreamBuffer.h" -#include "VideoBackends/OGL/TextureCache.h" #include "VideoBackends/OGL/TextureConverter.h" -#include "VideoCommon/BPStructs.h" -#include "VideoCommon/HiresTextures.h" #include "VideoCommon/ImageWrite.h" -#include "VideoCommon/Statistics.h" #include "VideoCommon/TextureDecoder.h" #include "VideoCommon/VideoConfig.h" diff --git a/Source/Core/VideoBackends/OGL/TextureConverter.cpp b/Source/Core/VideoBackends/OGL/TextureConverter.cpp index 3288aedfb0..a0e281cf6c 100644 --- a/Source/Core/VideoBackends/OGL/TextureConverter.cpp +++ b/Source/Core/VideoBackends/OGL/TextureConverter.cpp @@ -4,10 +4,13 @@ // Fast image conversion using OpenGL shaders. +#include "VideoBackends/OGL/TextureConverter.h" + #include #include "Common/Common.h" #include "Common/FileUtil.h" +#include "Common/MsgHandler.h" #include "Common/StringUtil.h" #include "Core/HW/Memmap.h" @@ -17,9 +20,7 @@ #include "VideoBackends/OGL/Render.h" #include "VideoBackends/OGL/SamplerCache.h" #include "VideoBackends/OGL/TextureCache.h" -#include "VideoBackends/OGL/TextureConverter.h" -#include "VideoCommon/DriverDetails.h" #include "VideoCommon/ImageWrite.h" #include "VideoCommon/TextureConversionShader.h" #include "VideoCommon/VideoCommon.h" diff --git a/Source/Core/VideoBackends/OGL/TextureConverter.h b/Source/Core/VideoBackends/OGL/TextureConverter.h index d165c915f1..8893ef1e52 100644 --- a/Source/Core/VideoBackends/OGL/TextureConverter.h +++ b/Source/Core/VideoBackends/OGL/TextureConverter.h @@ -4,9 +4,9 @@ #pragma once +#include "Common/CommonTypes.h" #include "Common/GL/GLUtil.h" -#include "VideoCommon/TextureCacheBase.h" #include "VideoCommon/VideoCommon.h" namespace OGL diff --git a/Source/Core/VideoBackends/Vulkan/FramebufferManager.cpp b/Source/Core/VideoBackends/Vulkan/FramebufferManager.cpp index f5c0e038f6..2d7fd15418 100644 --- a/Source/Core/VideoBackends/Vulkan/FramebufferManager.cpp +++ b/Source/Core/VideoBackends/Vulkan/FramebufferManager.cpp @@ -7,8 +7,10 @@ #include #include +#include "Common/Assert.h" #include "Common/CommonFuncs.h" #include "Common/Logging/Log.h" +#include "Common/MsgHandler.h" #include "Core/HW/Memmap.h" diff --git a/Source/Core/VideoBackends/Vulkan/ObjectCache.cpp b/Source/Core/VideoBackends/Vulkan/ObjectCache.cpp index 1d8357e21c..21459e8a8a 100644 --- a/Source/Core/VideoBackends/Vulkan/ObjectCache.cpp +++ b/Source/Core/VideoBackends/Vulkan/ObjectCache.cpp @@ -9,8 +9,11 @@ #include #include +#include "Common/Assert.h" #include "Common/CommonFuncs.h" #include "Common/LinearDiskCache.h" +#include "Common/MsgHandler.h" + #include "Core/ConfigManager.h" #include "VideoBackends/Vulkan/ShaderCompiler.h" diff --git a/Source/Core/VideoBackends/Vulkan/Renderer.cpp b/Source/Core/VideoBackends/Vulkan/Renderer.cpp index 9fc3d50c23..23ca1ff696 100644 --- a/Source/Core/VideoBackends/Vulkan/Renderer.cpp +++ b/Source/Core/VideoBackends/Vulkan/Renderer.cpp @@ -9,6 +9,7 @@ #include #include +#include "Common/Assert.h" #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" diff --git a/Source/Core/VideoBackends/Vulkan/StateTracker.h b/Source/Core/VideoBackends/Vulkan/StateTracker.h index 1f6beddeed..109217d849 100644 --- a/Source/Core/VideoBackends/Vulkan/StateTracker.h +++ b/Source/Core/VideoBackends/Vulkan/StateTracker.h @@ -13,6 +13,7 @@ #include "VideoBackends/Vulkan/Constants.h" #include "VideoBackends/Vulkan/ObjectCache.h" #include "VideoCommon/GeometryShaderGen.h" +#include "VideoCommon/NativeVertexFormat.h" #include "VideoCommon/PixelShaderGen.h" #include "VideoCommon/RenderBase.h" #include "VideoCommon/VertexShaderGen.h" diff --git a/Source/Core/VideoBackends/Vulkan/VertexManager.cpp b/Source/Core/VideoBackends/Vulkan/VertexManager.cpp index 53309b3aec..dec323ba01 100644 --- a/Source/Core/VideoBackends/Vulkan/VertexManager.cpp +++ b/Source/Core/VideoBackends/Vulkan/VertexManager.cpp @@ -3,6 +3,9 @@ // Refer to the license.txt file included. #include "VideoBackends/Vulkan/VertexManager.h" + +#include "Common/MsgHandler.h" + #include "VideoBackends/Vulkan/BoundingBox.h" #include "VideoBackends/Vulkan/CommandBufferManager.h" #include "VideoBackends/Vulkan/FramebufferManager.h" diff --git a/Source/Core/VideoBackends/Vulkan/main.cpp b/Source/Core/VideoBackends/Vulkan/main.cpp index 8cff0fef74..8b610f517f 100644 --- a/Source/Core/VideoBackends/Vulkan/main.cpp +++ b/Source/Core/VideoBackends/Vulkan/main.cpp @@ -5,7 +5,7 @@ #include #include "Common/Logging/LogManager.h" -#include "Core/Host.h" +#include "Common/MsgHandler.h" #include "VideoBackends/Vulkan/CommandBufferManager.h" #include "VideoBackends/Vulkan/Constants.h" @@ -20,7 +20,6 @@ #include "VideoBackends/Vulkan/VideoBackend.h" #include "VideoBackends/Vulkan/VulkanContext.h" -#include "VideoCommon/DriverDetails.h" #include "VideoCommon/OnScreenDisplay.h" #include "VideoCommon/VideoBackendBase.h" #include "VideoCommon/VideoConfig.h" diff --git a/Source/Core/VideoCommon/LightingShaderGen.cpp b/Source/Core/VideoCommon/LightingShaderGen.cpp index ecc19b7b9f..a65faa4a8a 100644 --- a/Source/Core/VideoCommon/LightingShaderGen.cpp +++ b/Source/Core/VideoCommon/LightingShaderGen.cpp @@ -2,7 +2,13 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include +#include "VideoCommon/LightingShaderGen.h" + +#include "Common/Assert.h" +#include "Common/CommonTypes.h" + +#include "VideoCommon/NativeVertexFormat.h" +#include "VideoCommon/ShaderGenCommon.h" static void GenerateLightShader(ShaderCode& object, const LightingUidData& uid_data, int index, int litchan_index, bool alpha) diff --git a/Source/Core/VideoCommon/LightingShaderGen.h b/Source/Core/VideoCommon/LightingShaderGen.h index 5a0bd28574..4bd4e52016 100644 --- a/Source/Core/VideoCommon/LightingShaderGen.h +++ b/Source/Core/VideoCommon/LightingShaderGen.h @@ -4,11 +4,9 @@ #pragma once -#include "Common/Assert.h" #include "Common/CommonTypes.h" -#include "VideoCommon/NativeVertexFormat.h" -#include "VideoCommon/ShaderGenCommon.h" -#include "VideoCommon/XFMemory.h" + +class ShaderCode; #define LIGHT_COL "%s[%d].color.%s" #define LIGHT_COL_PARAMS(index, swizzle) (I_LIGHTS), (index), (swizzle) diff --git a/Source/Core/VideoCommon/PixelShaderGen.cpp b/Source/Core/VideoCommon/PixelShaderGen.cpp index 7a718c8f38..3c09e200f0 100644 --- a/Source/Core/VideoCommon/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/PixelShaderGen.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "VideoCommon/PixelShaderGen.h" + #include #include #include @@ -13,7 +15,7 @@ #include "VideoCommon/BoundingBox.h" #include "VideoCommon/DriverDetails.h" #include "VideoCommon/LightingShaderGen.h" -#include "VideoCommon/PixelShaderGen.h" +#include "VideoCommon/NativeVertexFormat.h" #include "VideoCommon/VertexLoaderManager.h" #include "VideoCommon/VideoCommon.h" #include "VideoCommon/VideoConfig.h"