From 364eaadfe50d3e5c8206b508730317f919fbaf75 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 19 Nov 2017 00:16:22 -0500 Subject: [PATCH] VideoBackends: Remove header inclusions made unnecessary with Hybrid XFB Just some inclusions that weren't removed in the initial Hybrid XFB PR. --- Source/Core/VideoBackends/D3D/Render.cpp | 4 ---- Source/Core/VideoBackends/OGL/Render.cpp | 2 -- Source/Core/VideoBackends/Software/SWRenderer.cpp | 5 +---- Source/Core/VideoBackends/Software/SWRenderer.h | 2 -- Source/Core/VideoBackends/Vulkan/FramebufferManager.cpp | 2 -- Source/Core/VideoBackends/Vulkan/Renderer.cpp | 5 ----- Source/Core/VideoBackends/Vulkan/Renderer.h | 1 - Source/Core/VideoCommon/FramebufferManagerBase.cpp | 4 ---- Source/Core/VideoCommon/FramebufferManagerBase.h | 4 ---- 9 files changed, 1 insertion(+), 28 deletions(-) diff --git a/Source/Core/VideoBackends/D3D/Render.cpp b/Source/Core/VideoBackends/D3D/Render.cpp index 11bbea61c2..03ae927c83 100644 --- a/Source/Core/VideoBackends/D3D/Render.cpp +++ b/Source/Core/VideoBackends/D3D/Render.cpp @@ -12,7 +12,6 @@ #include #include #include -#include #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" @@ -31,13 +30,10 @@ #include "VideoBackends/D3D/TextureCache.h" #include "VideoBackends/D3D/VertexShaderCache.h" -#include "VideoCommon/AVIDump.h" #include "VideoCommon/BPFunctions.h" #include "VideoCommon/OnScreenDisplay.h" #include "VideoCommon/PixelEngine.h" -#include "VideoCommon/PixelShaderManager.h" #include "VideoCommon/RenderState.h" -#include "VideoCommon/SamplerCommon.h" #include "VideoCommon/VideoBackendBase.h" #include "VideoCommon/VideoCommon.h" #include "VideoCommon/VideoConfig.h" diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/Render.cpp index 2125102fe0..2dc84d7678 100644 --- a/Source/Core/VideoBackends/OGL/Render.cpp +++ b/Source/Core/VideoBackends/OGL/Render.cpp @@ -35,13 +35,11 @@ #include "VideoBackends/OGL/TextureCache.h" #include "VideoBackends/OGL/VertexManager.h" -#include "VideoCommon/AVIDump.h" #include "VideoCommon/BPFunctions.h" #include "VideoCommon/DriverDetails.h" #include "VideoCommon/IndexGenerator.h" #include "VideoCommon/OnScreenDisplay.h" #include "VideoCommon/PixelEngine.h" -#include "VideoCommon/PixelShaderManager.h" #include "VideoCommon/RenderState.h" #include "VideoCommon/ShaderGenCommon.h" #include "VideoCommon/VertexShaderManager.h" diff --git a/Source/Core/VideoBackends/Software/SWRenderer.cpp b/Source/Core/VideoBackends/Software/SWRenderer.cpp index 4f1fafd989..69523efe78 100644 --- a/Source/Core/VideoBackends/Software/SWRenderer.cpp +++ b/Source/Core/VideoBackends/Software/SWRenderer.cpp @@ -4,18 +4,15 @@ #include "VideoBackends/Software/SWRenderer.h" -#include -#include -#include #include #include "Common/CommonTypes.h" -#include "Common/Logging/Log.h" #include "Core/Config/GraphicsSettings.h" #include "Core/HW/Memmap.h" #include "VideoBackends/Software/EfbCopy.h" +#include "VideoBackends/Software/EfbInterface.h" #include "VideoBackends/Software/SWOGLWindow.h" #include "VideoCommon/BoundingBox.h" diff --git a/Source/Core/VideoBackends/Software/SWRenderer.h b/Source/Core/VideoBackends/Software/SWRenderer.h index e30e490bd7..a87531fcab 100644 --- a/Source/Core/VideoBackends/Software/SWRenderer.h +++ b/Source/Core/VideoBackends/Software/SWRenderer.h @@ -6,8 +6,6 @@ #include "Common/CommonTypes.h" -#include "VideoBackends/Software/EfbInterface.h" - #include "VideoCommon/RenderBase.h" class SWRenderer : public Renderer diff --git a/Source/Core/VideoBackends/Vulkan/FramebufferManager.cpp b/Source/Core/VideoBackends/Vulkan/FramebufferManager.cpp index 305f0343f7..6910bfb235 100644 --- a/Source/Core/VideoBackends/Vulkan/FramebufferManager.cpp +++ b/Source/Core/VideoBackends/Vulkan/FramebufferManager.cpp @@ -20,14 +20,12 @@ #include "VideoBackends/Vulkan/StateTracker.h" #include "VideoBackends/Vulkan/StreamBuffer.h" #include "VideoBackends/Vulkan/Texture2D.h" -#include "VideoBackends/Vulkan/TextureConverter.h" #include "VideoBackends/Vulkan/Util.h" #include "VideoBackends/Vulkan/VKTexture.h" #include "VideoBackends/Vulkan/VertexFormat.h" #include "VideoBackends/Vulkan/VulkanContext.h" #include "VideoCommon/RenderBase.h" -#include "VideoCommon/TextureConfig.h" #include "VideoCommon/VideoConfig.h" namespace Vulkan diff --git a/Source/Core/VideoBackends/Vulkan/Renderer.cpp b/Source/Core/VideoBackends/Vulkan/Renderer.cpp index d72f2929c3..d32e478292 100644 --- a/Source/Core/VideoBackends/Vulkan/Renderer.cpp +++ b/Source/Core/VideoBackends/Vulkan/Renderer.cpp @@ -8,7 +8,6 @@ #include #include -#include "Common/Assert.h" #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" @@ -22,7 +21,6 @@ #include "VideoBackends/Vulkan/PostProcessing.h" #include "VideoBackends/Vulkan/RasterFont.h" #include "VideoBackends/Vulkan/Renderer.h" -#include "VideoBackends/Vulkan/StagingTexture2D.h" #include "VideoBackends/Vulkan/StateTracker.h" #include "VideoBackends/Vulkan/SwapChain.h" #include "VideoBackends/Vulkan/TextureCache.h" @@ -30,15 +28,12 @@ #include "VideoBackends/Vulkan/VKTexture.h" #include "VideoBackends/Vulkan/VulkanContext.h" -#include "VideoCommon/AVIDump.h" #include "VideoCommon/BPFunctions.h" #include "VideoCommon/BPMemory.h" #include "VideoCommon/DriverDetails.h" #include "VideoCommon/OnScreenDisplay.h" #include "VideoCommon/PixelEngine.h" -#include "VideoCommon/PixelShaderManager.h" #include "VideoCommon/RenderState.h" -#include "VideoCommon/SamplerCommon.h" #include "VideoCommon/TextureCacheBase.h" #include "VideoCommon/VideoBackendBase.h" #include "VideoCommon/VideoCommon.h" diff --git a/Source/Core/VideoBackends/Vulkan/Renderer.h b/Source/Core/VideoBackends/Vulkan/Renderer.h index 2fbf240122..e8b7952e7d 100644 --- a/Source/Core/VideoBackends/Vulkan/Renderer.h +++ b/Source/Core/VideoBackends/Vulkan/Renderer.h @@ -10,7 +10,6 @@ #include "Common/CommonTypes.h" #include "VideoBackends/Vulkan/Constants.h" -#include "VideoCommon/AVIDump.h" #include "VideoCommon/RenderBase.h" struct XFBSourceBase; diff --git a/Source/Core/VideoCommon/FramebufferManagerBase.cpp b/Source/Core/VideoCommon/FramebufferManagerBase.cpp index 1df2960b1a..af8ad87256 100644 --- a/Source/Core/VideoCommon/FramebufferManagerBase.cpp +++ b/Source/Core/VideoCommon/FramebufferManagerBase.cpp @@ -4,13 +4,9 @@ #include "VideoCommon/FramebufferManagerBase.h" -#include -#include #include -#include #include "VideoCommon/RenderBase.h" -#include "VideoCommon/VideoConfig.h" std::unique_ptr g_framebuffer_manager; diff --git a/Source/Core/VideoCommon/FramebufferManagerBase.h b/Source/Core/VideoCommon/FramebufferManagerBase.h index 5e645dc7f7..a008d49e92 100644 --- a/Source/Core/VideoCommon/FramebufferManagerBase.h +++ b/Source/Core/VideoCommon/FramebufferManagerBase.h @@ -4,13 +4,9 @@ #pragma once -#include -#include #include -#include #include "Common/CommonTypes.h" -#include "VideoCommon/VideoCommon.h" inline bool AddressRangesOverlap(u32 aLower, u32 aUpper, u32 bLower, u32 bUpper) {