From 468f623d2744ad47009b655c2720e82b302ea102 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 1 Feb 2017 10:56:13 -0500 Subject: [PATCH] ShaderGenCommon: Remove unnecessary includes --- Source/Core/VideoBackends/D3D/PSTextureEncoder.cpp | 2 ++ Source/Core/VideoBackends/D3D/PSTextureEncoder.h | 6 ++++-- Source/Core/VideoBackends/D3D/Render.cpp | 4 ++-- Source/Core/VideoBackends/D3D/Television.cpp | 4 +++- Source/Core/VideoBackends/D3D/Television.h | 2 +- Source/Core/VideoBackends/D3D/TextureCache.cpp | 7 +++++-- Source/Core/VideoBackends/D3D/TextureEncoder.h | 3 +-- Source/Core/VideoBackends/D3D12/FramebufferManager.h | 1 + Source/Core/VideoBackends/D3D12/PSTextureEncoder.cpp | 5 +++++ Source/Core/VideoBackends/D3D12/PSTextureEncoder.h | 5 ++++- Source/Core/VideoBackends/D3D12/Render.cpp | 4 ++-- Source/Core/VideoBackends/D3D12/ShaderCache.h | 2 ++ .../VideoBackends/D3D12/ShaderConstantsManager.h | 2 -- Source/Core/VideoBackends/D3D12/TextureEncoder.h | 3 +-- Source/Core/VideoBackends/D3D12/main.cpp | 1 + Source/Core/VideoBackends/OGL/FramebufferManager.cpp | 5 ++++- Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp | 7 ++----- Source/Core/VideoBackends/OGL/PostProcessing.cpp | 12 +++++------- Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp | 4 ++-- Source/Core/VideoBackends/OGL/Render.cpp | 2 +- Source/Core/VideoBackends/OGL/StreamBuffer.cpp | 4 +++- Source/Core/VideoBackends/OGL/StreamBuffer.h | 5 +---- Source/Core/VideoBackends/OGL/TextureCache.h | 2 +- Source/Core/VideoBackends/OGL/TextureConverter.cpp | 3 ++- Source/Core/VideoBackends/OGL/VertexManager.cpp | 5 ++--- Source/Core/VideoBackends/OGL/VertexManager.h | 4 ++++ Source/Core/VideoBackends/Vulkan/Renderer.cpp | 2 ++ Source/Core/VideoBackends/Vulkan/StreamBuffer.h | 1 + .../Core/VideoBackends/Vulkan/TextureConverter.cpp | 2 +- Source/Core/VideoBackends/Vulkan/TextureConverter.h | 1 - Source/Core/VideoBackends/Vulkan/VertexFormat.cpp | 4 ++-- Source/Core/VideoBackends/Vulkan/VertexManager.cpp | 2 ++ Source/Core/VideoCommon/GeometryShaderGen.cpp | 5 +++-- Source/Core/VideoCommon/GeometryShaderGen.h | 1 + Source/Core/VideoCommon/LightingShaderGen.cpp | 1 + Source/Core/VideoCommon/ShaderGenCommon.h | 5 ----- Source/Core/VideoCommon/VertexShaderGen.cpp | 1 + 37 files changed, 75 insertions(+), 54 deletions(-) diff --git a/Source/Core/VideoBackends/D3D/PSTextureEncoder.cpp b/Source/Core/VideoBackends/D3D/PSTextureEncoder.cpp index 496ee2c079..dd47479b37 100644 --- a/Source/Core/VideoBackends/D3D/PSTextureEncoder.cpp +++ b/Source/Core/VideoBackends/D3D/PSTextureEncoder.cpp @@ -3,6 +3,8 @@ // Refer to the license.txt file included. #include "VideoBackends/D3D/PSTextureEncoder.h" + +#include "Common/Logging/Log.h" #include "Core/HW/Memmap.h" #include "VideoBackends/D3D/D3DBase.h" #include "VideoBackends/D3D/D3DShader.h" diff --git a/Source/Core/VideoBackends/D3D/PSTextureEncoder.h b/Source/Core/VideoBackends/D3D/PSTextureEncoder.h index d1249e242c..3c8924cb87 100644 --- a/Source/Core/VideoBackends/D3D/PSTextureEncoder.h +++ b/Source/Core/VideoBackends/D3D/PSTextureEncoder.h @@ -4,9 +4,11 @@ #pragma once -#include "VideoBackends/D3D/TextureEncoder.h" +#include -#include "VideoCommon/TextureCacheBase.h" +#include "Common/CommonTypes.h" +#include "VideoBackends/D3D/TextureEncoder.h" +#include "VideoCommon/VideoCommon.h" struct ID3D11Texture2D; struct ID3D11RenderTargetView; diff --git a/Source/Core/VideoBackends/D3D/Render.cpp b/Source/Core/VideoBackends/D3D/Render.cpp index 88e7a4ae92..bf1500ab0f 100644 --- a/Source/Core/VideoBackends/D3D/Render.cpp +++ b/Source/Core/VideoBackends/D3D/Render.cpp @@ -13,10 +13,10 @@ #include "Common/CommonTypes.h" #include "Common/FileUtil.h" +#include "Common/Logging/Log.h" #include "Common/MathUtil.h" #include "Core/Core.h" -#include "Core/Host.h" #include "VideoBackends/D3D/BoundingBox.h" #include "VideoBackends/D3D/D3DBase.h" @@ -31,13 +31,13 @@ #include "VideoCommon/AVIDump.h" #include "VideoCommon/BPFunctions.h" -#include "VideoCommon/Fifo.h" #include "VideoCommon/OnScreenDisplay.h" #include "VideoCommon/PixelEngine.h" #include "VideoCommon/PixelShaderManager.h" #include "VideoCommon/SamplerCommon.h" #include "VideoCommon/VideoBackendBase.h" #include "VideoCommon/VideoConfig.h" +#include "VideoCommon/XFMemory.h" namespace DX11 { diff --git a/Source/Core/VideoBackends/D3D/Television.cpp b/Source/Core/VideoBackends/D3D/Television.cpp index 148aa2a696..79f556cd09 100644 --- a/Source/Core/VideoBackends/D3D/Television.cpp +++ b/Source/Core/VideoBackends/D3D/Television.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "VideoBackends/D3D/Television.h" + #include #include "Core/HW/Memmap.h" @@ -9,8 +11,8 @@ #include "VideoBackends/D3D/D3DShader.h" #include "VideoBackends/D3D/D3DState.h" #include "VideoBackends/D3D/D3DUtil.h" -#include "VideoBackends/D3D/Television.h" #include "VideoBackends/D3D/VertexShaderCache.h" +#include "VideoCommon/VideoCommon.h" #include "VideoCommon/VideoConfig.h" namespace DX11 diff --git a/Source/Core/VideoBackends/D3D/Television.h b/Source/Core/VideoBackends/D3D/Television.h index 5bb5ecb85a..2ad29cdf10 100644 --- a/Source/Core/VideoBackends/D3D/Television.h +++ b/Source/Core/VideoBackends/D3D/Television.h @@ -4,7 +4,7 @@ #pragma once -#include "VideoCommon/VideoCommon.h" +#include "Common/CommonTypes.h" struct ID3D11Texture2D; struct ID3D11ShaderResourceView; diff --git a/Source/Core/VideoBackends/D3D/TextureCache.cpp b/Source/Core/VideoBackends/D3D/TextureCache.cpp index f9057fc13f..116d849f41 100644 --- a/Source/Core/VideoBackends/D3D/TextureCache.cpp +++ b/Source/Core/VideoBackends/D3D/TextureCache.cpp @@ -2,9 +2,14 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "VideoBackends/D3D/TextureCache.h" + #include #include +#include "Common/CommonTypes.h" +#include "Common/Logging/Log.h" + #include "VideoBackends/D3D/D3DBase.h" #include "VideoBackends/D3D/D3DShader.h" #include "VideoBackends/D3D/D3DState.h" @@ -13,11 +18,9 @@ #include "VideoBackends/D3D/GeometryShaderCache.h" #include "VideoBackends/D3D/PSTextureEncoder.h" #include "VideoBackends/D3D/PixelShaderCache.h" -#include "VideoBackends/D3D/TextureCache.h" #include "VideoBackends/D3D/TextureEncoder.h" #include "VideoBackends/D3D/VertexShaderCache.h" #include "VideoCommon/ImageWrite.h" -#include "VideoCommon/LookUpTables.h" #include "VideoCommon/RenderBase.h" #include "VideoCommon/VideoConfig.h" diff --git a/Source/Core/VideoBackends/D3D/TextureEncoder.h b/Source/Core/VideoBackends/D3D/TextureEncoder.h index 6d0ea2c69d..36d78f19c4 100644 --- a/Source/Core/VideoBackends/D3D/TextureEncoder.h +++ b/Source/Core/VideoBackends/D3D/TextureEncoder.h @@ -4,8 +4,7 @@ #pragma once -#include "VideoCommon/BPMemory.h" -#include "VideoCommon/TextureCacheBase.h" +#include "Common/CommonTypes.h" #include "VideoCommon/VideoCommon.h" namespace DX11 diff --git a/Source/Core/VideoBackends/D3D12/FramebufferManager.h b/Source/Core/VideoBackends/D3D12/FramebufferManager.h index d5b6c32555..5c17d6f076 100644 --- a/Source/Core/VideoBackends/D3D12/FramebufferManager.h +++ b/Source/Core/VideoBackends/D3D12/FramebufferManager.h @@ -4,6 +4,7 @@ #pragma once +#include "Common/CommonTypes.h" #include "VideoBackends/D3D12/D3DTexture.h" #include "VideoCommon/FramebufferManagerBase.h" diff --git a/Source/Core/VideoBackends/D3D12/PSTextureEncoder.cpp b/Source/Core/VideoBackends/D3D12/PSTextureEncoder.cpp index 30268a20b3..d582d5a414 100644 --- a/Source/Core/VideoBackends/D3D12/PSTextureEncoder.cpp +++ b/Source/Core/VideoBackends/D3D12/PSTextureEncoder.cpp @@ -3,8 +3,13 @@ // Refer to the license.txt file included. #include "VideoBackends/D3D12/PSTextureEncoder.h" + #include "Common/Align.h" +#include "Common/CommonTypes.h" +#include "Common/Logging/Log.h" + #include "Core/HW/Memmap.h" + #include "VideoBackends/D3D12/D3DBase.h" #include "VideoBackends/D3D12/D3DCommandListManager.h" #include "VideoBackends/D3D12/D3DDescriptorHeapManager.h" diff --git a/Source/Core/VideoBackends/D3D12/PSTextureEncoder.h b/Source/Core/VideoBackends/D3D12/PSTextureEncoder.h index e26fad295b..a1b518996f 100644 --- a/Source/Core/VideoBackends/D3D12/PSTextureEncoder.h +++ b/Source/Core/VideoBackends/D3D12/PSTextureEncoder.h @@ -4,9 +4,12 @@ #pragma once +#include +#include + +#include "Common/CommonTypes.h" #include "VideoBackends/D3D12/D3DBase.h" #include "VideoBackends/D3D12/TextureEncoder.h" -#include "VideoCommon/TextureCacheBase.h" namespace DX12 { diff --git a/Source/Core/VideoBackends/D3D12/Render.cpp b/Source/Core/VideoBackends/D3D12/Render.cpp index f278bc6ded..812a0adf11 100644 --- a/Source/Core/VideoBackends/D3D12/Render.cpp +++ b/Source/Core/VideoBackends/D3D12/Render.cpp @@ -14,10 +14,10 @@ #include "Common/Align.h" #include "Common/CommonTypes.h" #include "Common/FileUtil.h" +#include "Common/Logging/Log.h" #include "Common/MathUtil.h" #include "Core/Core.h" -#include "Core/Host.h" #include "VideoBackends/D3D12/BoundingBox.h" #include "VideoBackends/D3D12/D3DBase.h" @@ -34,7 +34,6 @@ #include "VideoCommon/AVIDump.h" #include "VideoCommon/BPFunctions.h" -#include "VideoCommon/Fifo.h" #include "VideoCommon/OnScreenDisplay.h" #include "VideoCommon/PixelEngine.h" #include "VideoCommon/PixelShaderManager.h" @@ -42,6 +41,7 @@ #include "VideoCommon/VertexLoaderManager.h" #include "VideoCommon/VideoBackendBase.h" #include "VideoCommon/VideoConfig.h" +#include "VideoCommon/XFMemory.h" namespace DX12 { diff --git a/Source/Core/VideoBackends/D3D12/ShaderCache.h b/Source/Core/VideoBackends/D3D12/ShaderCache.h index bfc2fb6ce2..4b5c8d2b1a 100644 --- a/Source/Core/VideoBackends/D3D12/ShaderCache.h +++ b/Source/Core/VideoBackends/D3D12/ShaderCache.h @@ -4,6 +4,8 @@ #pragma once +#include "Common/CommonTypes.h" + #include "VideoCommon/GeometryShaderGen.h" #include "VideoCommon/PixelShaderGen.h" #include "VideoCommon/VertexShaderGen.h" diff --git a/Source/Core/VideoBackends/D3D12/ShaderConstantsManager.h b/Source/Core/VideoBackends/D3D12/ShaderConstantsManager.h index 786a1ff028..ce5baae3da 100644 --- a/Source/Core/VideoBackends/D3D12/ShaderConstantsManager.h +++ b/Source/Core/VideoBackends/D3D12/ShaderConstantsManager.h @@ -4,8 +4,6 @@ #pragma once -#include "ShaderCache.h" - namespace DX12 { class ShaderConstantsManager final diff --git a/Source/Core/VideoBackends/D3D12/TextureEncoder.h b/Source/Core/VideoBackends/D3D12/TextureEncoder.h index 0506ebcfc6..198bb9c6b8 100644 --- a/Source/Core/VideoBackends/D3D12/TextureEncoder.h +++ b/Source/Core/VideoBackends/D3D12/TextureEncoder.h @@ -4,8 +4,7 @@ #pragma once -#include "VideoCommon/BPMemory.h" -#include "VideoCommon/TextureCacheBase.h" +#include "Common/CommonTypes.h" #include "VideoCommon/VideoCommon.h" namespace DX12 diff --git a/Source/Core/VideoBackends/D3D12/main.cpp b/Source/Core/VideoBackends/D3D12/main.cpp index 774783f5a1..ef377bab41 100644 --- a/Source/Core/VideoBackends/D3D12/main.cpp +++ b/Source/Core/VideoBackends/D3D12/main.cpp @@ -5,6 +5,7 @@ #include #include "Common/CommonTypes.h" +#include "Common/MsgHandler.h" #include "Common/StringUtil.h" #include "VideoBackends/D3D12/BoundingBox.h" diff --git a/Source/Core/VideoBackends/OGL/FramebufferManager.cpp b/Source/Core/VideoBackends/OGL/FramebufferManager.cpp index bf27cdcc4c..ef85560875 100644 --- a/Source/Core/VideoBackends/OGL/FramebufferManager.cpp +++ b/Source/Core/VideoBackends/OGL/FramebufferManager.cpp @@ -5,11 +5,14 @@ #include "VideoBackends/OGL/FramebufferManager.h" #include +#include #include #include "Common/Common.h" -#include "Common/CommonFuncs.h" +#include "Common/CommonTypes.h" #include "Common/GL/GLInterfaceBase.h" +#include "Common/Logging/Log.h" + #include "Core/HW/Memmap.h" #include "VideoBackends/OGL/Render.h" diff --git a/Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp b/Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp index 93a8c18d40..c20e21666d 100644 --- a/Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp +++ b/Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp @@ -2,16 +2,13 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/GL/GLUtil.h" -#include "Common/MemoryUtil.h" -#include "Common/x64ABI.h" -#include "Common/x64Emitter.h" +#include "Common/MsgHandler.h" #include "VideoBackends/OGL/ProgramShaderCache.h" #include "VideoBackends/OGL/VertexManager.h" -#include "VideoCommon/CPMemory.h" #include "VideoCommon/NativeVertexFormat.h" #include "VideoCommon/VertexShaderGen.h" diff --git a/Source/Core/VideoBackends/OGL/PostProcessing.cpp b/Source/Core/VideoBackends/OGL/PostProcessing.cpp index 7796e659c4..177a6ae4d8 100644 --- a/Source/Core/VideoBackends/OGL/PostProcessing.cpp +++ b/Source/Core/VideoBackends/OGL/PostProcessing.cpp @@ -2,19 +2,17 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "Common/Common.h" -#include "Common/CommonPaths.h" -#include "Common/FileUtil.h" +#include "VideoBackends/OGL/PostProcessing.h" + +#include "Common/CommonTypes.h" +#include "Common/GL/GLUtil.h" +#include "Common/Logging/Log.h" #include "Common/StringUtil.h" -#include "Common/GL/GLUtil.h" - #include "VideoBackends/OGL/FramebufferManager.h" -#include "VideoBackends/OGL/PostProcessing.h" #include "VideoBackends/OGL/ProgramShaderCache.h" #include "VideoBackends/OGL/SamplerCache.h" -#include "VideoCommon/DriverDetails.h" #include "VideoCommon/VideoCommon.h" #include "VideoCommon/VideoConfig.h" diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp index 76e7b641e4..16a851c829 100644 --- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp +++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp @@ -8,7 +8,8 @@ #include #include "Common/Align.h" -#include "Common/Common.h" +#include "Common/CommonTypes.h" +#include "Common/Logging/Log.h" #include "Common/MsgHandler.h" #include "Common/StringUtil.h" @@ -18,7 +19,6 @@ #include "VideoBackends/OGL/StreamBuffer.h" #include "VideoCommon/Debugger.h" -#include "VideoCommon/DriverDetails.h" #include "VideoCommon/GeometryShaderManager.h" #include "VideoCommon/ImageWrite.h" #include "VideoCommon/PixelShaderManager.h" diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/Render.cpp index f6c5f14112..a92c4810f4 100644 --- a/Source/Core/VideoBackends/OGL/Render.cpp +++ b/Source/Core/VideoBackends/OGL/Render.cpp @@ -36,7 +36,6 @@ #include "VideoCommon/AVIDump.h" #include "VideoCommon/BPFunctions.h" #include "VideoCommon/DriverDetails.h" -#include "VideoCommon/Fifo.h" #include "VideoCommon/IndexGenerator.h" #include "VideoCommon/OnScreenDisplay.h" #include "VideoCommon/PixelEngine.h" @@ -45,6 +44,7 @@ #include "VideoCommon/VertexShaderManager.h" #include "VideoCommon/VideoBackendBase.h" #include "VideoCommon/VideoConfig.h" +#include "VideoCommon/XFMemory.h" void VideoConfig::UpdateProjectionHack() { diff --git a/Source/Core/VideoBackends/OGL/StreamBuffer.cpp b/Source/Core/VideoBackends/OGL/StreamBuffer.cpp index 97a25a5bc7..91a63389a7 100644 --- a/Source/Core/VideoBackends/OGL/StreamBuffer.cpp +++ b/Source/Core/VideoBackends/OGL/StreamBuffer.cpp @@ -2,12 +2,14 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "VideoBackends/OGL/StreamBuffer.h" + #include "Common/Align.h" +#include "Common/CommonFuncs.h" #include "Common/GL/GLUtil.h" #include "Common/MemoryUtil.h" #include "VideoBackends/OGL/Render.h" -#include "VideoBackends/OGL/StreamBuffer.h" #include "VideoCommon/DriverDetails.h" #include "VideoCommon/OnScreenDisplay.h" diff --git a/Source/Core/VideoBackends/OGL/StreamBuffer.h b/Source/Core/VideoBackends/OGL/StreamBuffer.h index 864da268c9..83b79bd906 100644 --- a/Source/Core/VideoBackends/OGL/StreamBuffer.h +++ b/Source/Core/VideoBackends/OGL/StreamBuffer.h @@ -8,12 +8,9 @@ #include #include +#include "Common/CommonTypes.h" #include "Common/GL/GLUtil.h" -#include "VideoBackends/OGL/FramebufferManager.h" - -#include "VideoCommon/VideoCommon.h" - namespace OGL { class StreamBuffer diff --git a/Source/Core/VideoBackends/OGL/TextureCache.h b/Source/Core/VideoBackends/OGL/TextureCache.h index d7b3439a43..66f58cae0b 100644 --- a/Source/Core/VideoBackends/OGL/TextureCache.h +++ b/Source/Core/VideoBackends/OGL/TextureCache.h @@ -6,9 +6,9 @@ #include +#include "Common/CommonTypes.h" #include "Common/GL/GLUtil.h" -#include "VideoCommon/BPStructs.h" #include "VideoCommon/TextureCacheBase.h" #include "VideoCommon/VideoCommon.h" diff --git a/Source/Core/VideoBackends/OGL/TextureConverter.cpp b/Source/Core/VideoBackends/OGL/TextureConverter.cpp index a0e281cf6c..b54234710b 100644 --- a/Source/Core/VideoBackends/OGL/TextureConverter.cpp +++ b/Source/Core/VideoBackends/OGL/TextureConverter.cpp @@ -8,8 +8,9 @@ #include -#include "Common/Common.h" +#include "Common/CommonTypes.h" #include "Common/FileUtil.h" +#include "Common/Logging/Log.h" #include "Common/MsgHandler.h" #include "Common/StringUtil.h" diff --git a/Source/Core/VideoBackends/OGL/VertexManager.cpp b/Source/Core/VideoBackends/OGL/VertexManager.cpp index 522cc342d0..bd9878b692 100644 --- a/Source/Core/VideoBackends/OGL/VertexManager.cpp +++ b/Source/Core/VideoBackends/OGL/VertexManager.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "VideoBackends/OGL/VertexManager.h" + #include #include #include @@ -10,15 +12,12 @@ #include "Common/CommonTypes.h" #include "Common/FileUtil.h" #include "Common/GL/GLExtensions/GLExtensions.h" -#include "Common/GL/GLInterfaceBase.h" #include "Common/StringUtil.h" #include "VideoBackends/OGL/ProgramShaderCache.h" #include "VideoBackends/OGL/Render.h" #include "VideoBackends/OGL/StreamBuffer.h" -#include "VideoBackends/OGL/VertexManager.h" -#include "VideoCommon/BPMemory.h" #include "VideoCommon/IndexGenerator.h" #include "VideoCommon/Statistics.h" #include "VideoCommon/VertexLoaderManager.h" diff --git a/Source/Core/VideoBackends/OGL/VertexManager.h b/Source/Core/VideoBackends/OGL/VertexManager.h index af79d7586c..a376c29e0e 100644 --- a/Source/Core/VideoBackends/OGL/VertexManager.h +++ b/Source/Core/VideoBackends/OGL/VertexManager.h @@ -4,6 +4,10 @@ #pragma once +#include + +#include "Common/CommonTypes.h" +#include "Common/GL/GLUtil.h" #include "VideoCommon/NativeVertexFormat.h" #include "VideoCommon/VertexManagerBase.h" diff --git a/Source/Core/VideoBackends/Vulkan/Renderer.cpp b/Source/Core/VideoBackends/Vulkan/Renderer.cpp index 23ca1ff696..77f6fd3453 100644 --- a/Source/Core/VideoBackends/Vulkan/Renderer.cpp +++ b/Source/Core/VideoBackends/Vulkan/Renderer.cpp @@ -10,6 +10,7 @@ #include #include "Common/Assert.h" +#include "Common/CommonTypes.h" #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" @@ -37,6 +38,7 @@ #include "VideoCommon/TextureCacheBase.h" #include "VideoCommon/VideoBackendBase.h" #include "VideoCommon/VideoConfig.h" +#include "VideoCommon/XFMemory.h" namespace Vulkan { diff --git a/Source/Core/VideoBackends/Vulkan/StreamBuffer.h b/Source/Core/VideoBackends/Vulkan/StreamBuffer.h index 291597fb9b..ce1b02164f 100644 --- a/Source/Core/VideoBackends/Vulkan/StreamBuffer.h +++ b/Source/Core/VideoBackends/Vulkan/StreamBuffer.h @@ -9,6 +9,7 @@ #include #include +#include "Common/CommonTypes.h" #include "VideoBackends/Vulkan/Constants.h" namespace Vulkan diff --git a/Source/Core/VideoBackends/Vulkan/TextureConverter.cpp b/Source/Core/VideoBackends/Vulkan/TextureConverter.cpp index 504a11b378..8f69b386e0 100644 --- a/Source/Core/VideoBackends/Vulkan/TextureConverter.cpp +++ b/Source/Core/VideoBackends/Vulkan/TextureConverter.cpp @@ -11,13 +11,13 @@ #include "Common/Assert.h" #include "Common/CommonFuncs.h" +#include "Common/CommonTypes.h" #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" #include "VideoBackends/Vulkan/CommandBufferManager.h" #include "VideoBackends/Vulkan/FramebufferManager.h" #include "VideoBackends/Vulkan/ObjectCache.h" -#include "VideoBackends/Vulkan/Renderer.h" #include "VideoBackends/Vulkan/StagingTexture2D.h" #include "VideoBackends/Vulkan/StateTracker.h" #include "VideoBackends/Vulkan/StreamBuffer.h" diff --git a/Source/Core/VideoBackends/Vulkan/TextureConverter.h b/Source/Core/VideoBackends/Vulkan/TextureConverter.h index a4178634d7..651d511849 100644 --- a/Source/Core/VideoBackends/Vulkan/TextureConverter.h +++ b/Source/Core/VideoBackends/Vulkan/TextureConverter.h @@ -10,7 +10,6 @@ #include "Common/CommonTypes.h" #include "VideoBackends/Vulkan/StreamBuffer.h" #include "VideoBackends/Vulkan/TextureCache.h" -#include "VideoCommon/BPMemory.h" #include "VideoCommon/TextureDecoder.h" #include "VideoCommon/VideoCommon.h" diff --git a/Source/Core/VideoBackends/Vulkan/VertexFormat.cpp b/Source/Core/VideoBackends/Vulkan/VertexFormat.cpp index ba67472394..1d35177252 100644 --- a/Source/Core/VideoBackends/Vulkan/VertexFormat.cpp +++ b/Source/Core/VideoBackends/Vulkan/VertexFormat.cpp @@ -2,13 +2,13 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "VideoBackends/Vulkan/VertexFormat.h" + #include "Common/Assert.h" #include "VideoBackends/Vulkan/CommandBufferManager.h" #include "VideoBackends/Vulkan/ObjectCache.h" -#include "VideoBackends/Vulkan/VertexFormat.h" -#include "VideoCommon/CPMemory.h" #include "VideoCommon/VertexLoaderManager.h" #include "VideoCommon/VertexShaderGen.h" diff --git a/Source/Core/VideoBackends/Vulkan/VertexManager.cpp b/Source/Core/VideoBackends/Vulkan/VertexManager.cpp index dec323ba01..63857a8c42 100644 --- a/Source/Core/VideoBackends/Vulkan/VertexManager.cpp +++ b/Source/Core/VideoBackends/Vulkan/VertexManager.cpp @@ -4,6 +4,8 @@ #include "VideoBackends/Vulkan/VertexManager.h" +#include "Common/CommonTypes.h" +#include "Common/Logging/Log.h" #include "Common/MsgHandler.h" #include "VideoBackends/Vulkan/BoundingBox.h" diff --git a/Source/Core/VideoCommon/GeometryShaderGen.cpp b/Source/Core/VideoCommon/GeometryShaderGen.cpp index aeb7f76b4b..5695e9c256 100644 --- a/Source/Core/VideoCommon/GeometryShaderGen.cpp +++ b/Source/Core/VideoCommon/GeometryShaderGen.cpp @@ -2,16 +2,17 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "VideoCommon/GeometryShaderGen.h" + #include #include #include "Common/CommonTypes.h" -#include "VideoCommon/BPMemory.h" #include "VideoCommon/DriverDetails.h" -#include "VideoCommon/GeometryShaderGen.h" #include "VideoCommon/LightingShaderGen.h" #include "VideoCommon/VideoCommon.h" #include "VideoCommon/VideoConfig.h" +#include "VideoCommon/XFMemory.h" static const char* primitives_ogl[] = {"points", "lines", "triangles"}; diff --git a/Source/Core/VideoCommon/GeometryShaderGen.h b/Source/Core/VideoCommon/GeometryShaderGen.h index 8b21665a0d..03b58a0367 100644 --- a/Source/Core/VideoCommon/GeometryShaderGen.h +++ b/Source/Core/VideoCommon/GeometryShaderGen.h @@ -4,6 +4,7 @@ #pragma once +#include "Common/CommonTypes.h" #include "VideoCommon/ShaderGenCommon.h" #include "VideoCommon/VertexManagerBase.h" diff --git a/Source/Core/VideoCommon/LightingShaderGen.cpp b/Source/Core/VideoCommon/LightingShaderGen.cpp index a65faa4a8a..b5556214f0 100644 --- a/Source/Core/VideoCommon/LightingShaderGen.cpp +++ b/Source/Core/VideoCommon/LightingShaderGen.cpp @@ -9,6 +9,7 @@ #include "VideoCommon/NativeVertexFormat.h" #include "VideoCommon/ShaderGenCommon.h" +#include "VideoCommon/XFMemory.h" static void GenerateLightShader(ShaderCode& object, const LightingUidData& uid_data, int index, int litchan_index, bool alpha) diff --git a/Source/Core/VideoCommon/ShaderGenCommon.h b/Source/Core/VideoCommon/ShaderGenCommon.h index 5aa841f1ac..267887a814 100644 --- a/Source/Core/VideoCommon/ShaderGenCommon.h +++ b/Source/Core/VideoCommon/ShaderGenCommon.h @@ -6,19 +6,14 @@ #include #include -#include -#include #include #include #include #include "Common/CommonTypes.h" -#include "Common/FileUtil.h" -#include "Common/Logging/Log.h" #include "Common/StringUtil.h" #include "VideoCommon/VideoCommon.h" #include "VideoCommon/VideoConfig.h" -#include "VideoCommon/XFMemory.h" /** * Common interface for classes that need to go through the shader generation path diff --git a/Source/Core/VideoCommon/VertexShaderGen.cpp b/Source/Core/VideoCommon/VertexShaderGen.cpp index 49052db9be..22aab55bb9 100644 --- a/Source/Core/VideoCommon/VertexShaderGen.cpp +++ b/Source/Core/VideoCommon/VertexShaderGen.cpp @@ -14,6 +14,7 @@ #include "VideoCommon/VertexShaderGen.h" #include "VideoCommon/VideoCommon.h" #include "VideoCommon/VideoConfig.h" +#include "VideoCommon/XFMemory.h" VertexShaderUid GetVertexShaderUid() {