From 2b9389202e0d1c8451aff176233cf211feef59dd Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 16 Jul 2019 20:18:48 -0400 Subject: VideoCommon: Remove unused MathUtil.h include from VideoCommon.h This header doesn't actually make use of MathUtil.h within itself, so this can be removed. Many other source files used VideoCommon.h as an indirect include to include MathUtil.h, so these includes can also be adjusted. While we're at it, we can also migrate valid inclusions of VideoCommon.h into cpp files where it can feasibly be done to minimize propagating it via other headers. --- Source/Core/VideoBackends/D3D/PerfQuery.cpp | 1 + Source/Core/VideoBackends/D3D12/PerfQuery.cpp | 4 +++- Source/Core/VideoBackends/D3DCommon/Common.h | 1 - Source/Core/VideoBackends/OGL/PerfQuery.cpp | 4 +++- Source/Core/VideoBackends/Software/DebugUtil.cpp | 1 + Source/Core/VideoBackends/Software/EfbInterface.cpp | 2 +- Source/Core/VideoBackends/Software/EfbInterface.h | 2 +- Source/Core/VideoBackends/Software/Rasterizer.cpp | 4 +++- Source/Core/VideoBackends/Software/SWOGLWindow.h | 7 ++----- Source/Core/VideoBackends/Software/SWRenderer.cpp | 4 +--- Source/Core/VideoBackends/Software/Tev.cpp | 4 +++- Source/Core/VideoBackends/Software/TextureEncoder.h | 2 +- Source/Core/VideoBackends/Vulkan/CommandBufferManager.h | 2 -- Source/Core/VideoBackends/Vulkan/PerfQuery.cpp | 1 + Source/Core/VideoBackends/Vulkan/VulkanContext.cpp | 1 + 15 files changed, 22 insertions(+), 18 deletions(-) (limited to 'Source/Core/VideoBackends') diff --git a/Source/Core/VideoBackends/D3D/PerfQuery.cpp b/Source/Core/VideoBackends/D3D/PerfQuery.cpp index 37d6620aba..c62cc9f4fc 100644 --- a/Source/Core/VideoBackends/D3D/PerfQuery.cpp +++ b/Source/Core/VideoBackends/D3D/PerfQuery.cpp @@ -8,6 +8,7 @@ #include "Common/Logging/Log.h" #include "VideoBackends/D3D/D3DBase.h" #include "VideoCommon/RenderBase.h" +#include "VideoCommon/VideoCommon.h" namespace DX11 { diff --git a/Source/Core/VideoBackends/D3D12/PerfQuery.cpp b/Source/Core/VideoBackends/D3D12/PerfQuery.cpp index a99a33a61e..bcea01ab9b 100644 --- a/Source/Core/VideoBackends/D3D12/PerfQuery.cpp +++ b/Source/Core/VideoBackends/D3D12/PerfQuery.cpp @@ -2,14 +2,16 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "VideoBackends/D3D12/PerfQuery.h" + #include #include "Common/Assert.h" #include "Common/Logging/Log.h" #include "VideoBackends/D3D12/Common.h" #include "VideoBackends/D3D12/DXContext.h" -#include "VideoBackends/D3D12/PerfQuery.h" #include "VideoBackends/D3D12/Renderer.h" +#include "VideoCommon/VideoCommon.h" namespace DX12 { diff --git a/Source/Core/VideoBackends/D3DCommon/Common.h b/Source/Core/VideoBackends/D3DCommon/Common.h index aece64256a..e98edbbc94 100644 --- a/Source/Core/VideoBackends/D3DCommon/Common.h +++ b/Source/Core/VideoBackends/D3DCommon/Common.h @@ -10,7 +10,6 @@ #include #include "Common/CommonTypes.h" -#include "VideoCommon/VideoCommon.h" struct IDXGIFactory; diff --git a/Source/Core/VideoBackends/OGL/PerfQuery.cpp b/Source/Core/VideoBackends/OGL/PerfQuery.cpp index 61cc951ce7..74bc28ef19 100644 --- a/Source/Core/VideoBackends/OGL/PerfQuery.cpp +++ b/Source/Core/VideoBackends/OGL/PerfQuery.cpp @@ -2,13 +2,15 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "VideoBackends/OGL/PerfQuery.h" + #include #include "Common/CommonTypes.h" #include "Common/GL/GLExtensions/GLExtensions.h" -#include "VideoBackends/OGL/PerfQuery.h" #include "VideoBackends/OGL/Render.h" +#include "VideoCommon/VideoCommon.h" #include "VideoCommon/VideoConfig.h" namespace OGL diff --git a/Source/Core/VideoBackends/Software/DebugUtil.cpp b/Source/Core/VideoBackends/Software/DebugUtil.cpp index 7b9be6e503..275cc6521d 100644 --- a/Source/Core/VideoBackends/Software/DebugUtil.cpp +++ b/Source/Core/VideoBackends/Software/DebugUtil.cpp @@ -18,6 +18,7 @@ #include "VideoCommon/BPMemory.h" #include "VideoCommon/ImageWrite.h" #include "VideoCommon/Statistics.h" +#include "VideoCommon/VideoCommon.h" #include "VideoCommon/VideoConfig.h" namespace DebugUtil diff --git a/Source/Core/VideoBackends/Software/EfbInterface.cpp b/Source/Core/VideoBackends/Software/EfbInterface.cpp index d64c519385..7118ff8615 100644 --- a/Source/Core/VideoBackends/Software/EfbInterface.cpp +++ b/Source/Core/VideoBackends/Software/EfbInterface.cpp @@ -12,12 +12,12 @@ #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" -#include "Common/Swap.h" #include "VideoBackends/Software/CopyRegion.h" #include "VideoCommon/BPMemory.h" #include "VideoCommon/LookUpTables.h" #include "VideoCommon/PerfQueryBase.h" +#include "VideoCommon/VideoCommon.h" namespace EfbInterface { diff --git a/Source/Core/VideoBackends/Software/EfbInterface.h b/Source/Core/VideoBackends/Software/EfbInterface.h index ea3bfc4bf9..329e260bf0 100644 --- a/Source/Core/VideoBackends/Software/EfbInterface.h +++ b/Source/Core/VideoBackends/Software/EfbInterface.h @@ -5,8 +5,8 @@ #pragma once #include "Common/CommonTypes.h" +#include "Common/MathUtil.h" #include "VideoCommon/PerfQueryBase.h" -#include "VideoCommon/VideoCommon.h" namespace EfbInterface { diff --git a/Source/Core/VideoBackends/Software/Rasterizer.cpp b/Source/Core/VideoBackends/Software/Rasterizer.cpp index 5fc21340fe..352b995b9c 100644 --- a/Source/Core/VideoBackends/Software/Rasterizer.cpp +++ b/Source/Core/VideoBackends/Software/Rasterizer.cpp @@ -2,16 +2,18 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "VideoBackends/Software/Rasterizer.h" + #include #include #include "Common/CommonTypes.h" #include "VideoBackends/Software/EfbInterface.h" #include "VideoBackends/Software/NativeVertexFormat.h" -#include "VideoBackends/Software/Rasterizer.h" #include "VideoBackends/Software/Tev.h" #include "VideoCommon/PerfQueryBase.h" #include "VideoCommon/Statistics.h" +#include "VideoCommon/VideoCommon.h" #include "VideoCommon/VideoConfig.h" #include "VideoCommon/XFMemory.h" diff --git a/Source/Core/VideoBackends/Software/SWOGLWindow.h b/Source/Core/VideoBackends/Software/SWOGLWindow.h index ce95c87694..753c156440 100644 --- a/Source/Core/VideoBackends/Software/SWOGLWindow.h +++ b/Source/Core/VideoBackends/Software/SWOGLWindow.h @@ -5,15 +5,12 @@ #pragma once #include -#include -#include #include "Common/CommonTypes.h" -#include "VideoCommon/VideoCommon.h" - -class GLContext; +#include "Common/MathUtil.h" class AbstractTexture; +class GLContext; struct WindowSystemInfo; class SWOGLWindow diff --git a/Source/Core/VideoBackends/Software/SWRenderer.cpp b/Source/Core/VideoBackends/Software/SWRenderer.cpp index e316ecae51..4d9b821f5a 100644 --- a/Source/Core/VideoBackends/Software/SWRenderer.cpp +++ b/Source/Core/VideoBackends/Software/SWRenderer.cpp @@ -9,7 +9,6 @@ #include "Common/CommonTypes.h" #include "Common/GL/GLContext.h" -#include "Core/Config/GraphicsSettings.h" #include "Core/HW/Memmap.h" #include "VideoBackends/Software/EfbCopy.h" @@ -22,9 +21,8 @@ #include "VideoCommon/AbstractTexture.h" #include "VideoCommon/BoundingBox.h" #include "VideoCommon/NativeVertexFormat.h" -#include "VideoCommon/OnScreenDisplay.h" #include "VideoCommon/VideoBackendBase.h" -#include "VideoCommon/VideoConfig.h" +#include "VideoCommon/VideoCommon.h" namespace SW { diff --git a/Source/Core/VideoBackends/Software/Tev.cpp b/Source/Core/VideoBackends/Software/Tev.cpp index b0285867b9..580ab58685 100644 --- a/Source/Core/VideoBackends/Software/Tev.cpp +++ b/Source/Core/VideoBackends/Software/Tev.cpp @@ -2,6 +2,8 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "VideoBackends/Software/Tev.h" + #include #include @@ -9,13 +11,13 @@ #include "Common/CommonTypes.h" #include "VideoBackends/Software/DebugUtil.h" #include "VideoBackends/Software/EfbInterface.h" -#include "VideoBackends/Software/Tev.h" #include "VideoBackends/Software/TextureSampler.h" #include "VideoCommon/BoundingBox.h" #include "VideoCommon/PerfQueryBase.h" #include "VideoCommon/PixelShaderManager.h" #include "VideoCommon/Statistics.h" +#include "VideoCommon/VideoCommon.h" #include "VideoCommon/VideoConfig.h" #include "VideoCommon/XFMemory.h" diff --git a/Source/Core/VideoBackends/Software/TextureEncoder.h b/Source/Core/VideoBackends/Software/TextureEncoder.h index a1e1f09cef..186455a711 100644 --- a/Source/Core/VideoBackends/Software/TextureEncoder.h +++ b/Source/Core/VideoBackends/Software/TextureEncoder.h @@ -5,8 +5,8 @@ #pragma once #include "Common/CommonTypes.h" +#include "Common/MathUtil.h" #include "VideoCommon/TextureCacheBase.h" -#include "VideoCommon/VideoCommon.h" namespace TextureEncoder { diff --git a/Source/Core/VideoBackends/Vulkan/CommandBufferManager.h b/Source/Core/VideoBackends/Vulkan/CommandBufferManager.h index abc49c0622..350a576c04 100644 --- a/Source/Core/VideoBackends/Vulkan/CommandBufferManager.h +++ b/Source/Core/VideoBackends/Vulkan/CommandBufferManager.h @@ -19,8 +19,6 @@ #include "Common/Flag.h" #include "Common/Semaphore.h" -#include "VideoCommon/VideoCommon.h" - #include "VideoBackends/Vulkan/Constants.h" namespace Vulkan diff --git a/Source/Core/VideoBackends/Vulkan/PerfQuery.cpp b/Source/Core/VideoBackends/Vulkan/PerfQuery.cpp index 6c64d71b2e..50a696c26b 100644 --- a/Source/Core/VideoBackends/Vulkan/PerfQuery.cpp +++ b/Source/Core/VideoBackends/Vulkan/PerfQuery.cpp @@ -16,6 +16,7 @@ #include "VideoBackends/Vulkan/Renderer.h" #include "VideoBackends/Vulkan/StateTracker.h" #include "VideoBackends/Vulkan/VulkanContext.h" +#include "VideoCommon/VideoCommon.h" namespace Vulkan { diff --git a/Source/Core/VideoBackends/Vulkan/VulkanContext.cpp b/Source/Core/VideoBackends/Vulkan/VulkanContext.cpp index 1f0955c921..1df8080f84 100644 --- a/Source/Core/VideoBackends/Vulkan/VulkanContext.cpp +++ b/Source/Core/VideoBackends/Vulkan/VulkanContext.cpp @@ -14,6 +14,7 @@ #include "VideoBackends/Vulkan/VulkanContext.h" #include "VideoCommon/DriverDetails.h" +#include "VideoCommon/VideoCommon.h" namespace Vulkan { -- cgit v1.2.3