From abfc75f3629fb0fcef42682d25249595923c7771 Mon Sep 17 00:00:00 2001 From: Scott Mansell Date: Tue, 31 Jan 2023 01:19:19 +1300 Subject: [PATCH] Cleanup headers --- Source/Android/jni/MainAndroid.cpp | 1 - Source/Core/Core/Core.cpp | 1 - Source/Core/DolphinNoGUI/PlatformFBDev.cpp | 1 - .../Core/DolphinQt/NetPlay/NetPlayDialog.cpp | 1 - Source/Core/DolphinQt/Settings.cpp | 1 - .../Core/VideoBackends/Vulkan/StateTracker.h | 1 - .../Core/VideoBackends/Vulkan/VKPerfQuery.cpp | 1 + Source/Core/VideoCommon/FrameDumper.cpp | 1 - Source/Core/VideoCommon/RenderBase.cpp | 22 ++++------------ Source/Core/VideoCommon/RenderBase.h | 26 ------------------- Source/Core/VideoCommon/VertexManagerBase.cpp | 1 - Source/Core/VideoCommon/VideoBackendBase.cpp | 2 +- 12 files changed, 7 insertions(+), 52 deletions(-) diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp index d305878f99..7902a9973f 100644 --- a/Source/Android/jni/MainAndroid.cpp +++ b/Source/Android/jni/MainAndroid.cpp @@ -60,7 +60,6 @@ #include "VideoCommon/OnScreenDisplay.h" #include "VideoCommon/Present.h" -#include "VideoCommon/RenderBase.h" #include "VideoCommon/VideoBackendBase.h" #include "jni/AndroidCommon/AndroidCommon.h" diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp index 8a2d3185c9..495ffc6ba4 100644 --- a/Source/Core/Core/Core.cpp +++ b/Source/Core/Core/Core.cpp @@ -89,7 +89,6 @@ #include "VideoCommon/OnScreenDisplay.h" #include "VideoCommon/PerformanceMetrics.h" #include "VideoCommon/Present.h" -#include "VideoCommon/RenderBase.h" #include "VideoCommon/VideoBackendBase.h" #include "VideoCommon/VideoEvents.h" diff --git a/Source/Core/DolphinNoGUI/PlatformFBDev.cpp b/Source/Core/DolphinNoGUI/PlatformFBDev.cpp index d965c6f99b..0b08bc110f 100644 --- a/Source/Core/DolphinNoGUI/PlatformFBDev.cpp +++ b/Source/Core/DolphinNoGUI/PlatformFBDev.cpp @@ -21,7 +21,6 @@ #include #include #include -#include "VideoCommon/RenderBase.h" namespace { diff --git a/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp b/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp index 31a8de1488..4dec815de9 100644 --- a/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp +++ b/Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp @@ -61,7 +61,6 @@ #include "VideoCommon/NetPlayChatUI.h" #include "VideoCommon/NetPlayGolfUI.h" -#include "VideoCommon/RenderBase.h" #include "VideoCommon/VideoConfig.h" namespace diff --git a/Source/Core/DolphinQt/Settings.cpp b/Source/Core/DolphinQt/Settings.cpp index 26e108e80a..bfc2f36ea1 100644 --- a/Source/Core/DolphinQt/Settings.cpp +++ b/Source/Core/DolphinQt/Settings.cpp @@ -46,7 +46,6 @@ #include "VideoCommon/NetPlayChatUI.h" #include "VideoCommon/NetPlayGolfUI.h" -#include "VideoCommon/RenderBase.h" Settings::Settings() { diff --git a/Source/Core/VideoBackends/Vulkan/StateTracker.h b/Source/Core/VideoBackends/Vulkan/StateTracker.h index eb5e4676de..d90496631c 100644 --- a/Source/Core/VideoBackends/Vulkan/StateTracker.h +++ b/Source/Core/VideoBackends/Vulkan/StateTracker.h @@ -9,7 +9,6 @@ #include "Common/CommonTypes.h" #include "VideoBackends/Vulkan/Constants.h" -#include "VideoCommon/RenderBase.h" namespace Vulkan { diff --git a/Source/Core/VideoBackends/Vulkan/VKPerfQuery.cpp b/Source/Core/VideoBackends/Vulkan/VKPerfQuery.cpp index c03d110eac..d362deaf37 100644 --- a/Source/Core/VideoBackends/Vulkan/VKPerfQuery.cpp +++ b/Source/Core/VideoBackends/Vulkan/VKPerfQuery.cpp @@ -15,6 +15,7 @@ #include "VideoBackends/Vulkan/StateTracker.h" #include "VideoBackends/Vulkan/VKGfx.h" #include "VideoBackends/Vulkan/VulkanContext.h" +#include "VideoCommon/RenderBase.h" #include "VideoCommon/VideoCommon.h" namespace Vulkan diff --git a/Source/Core/VideoCommon/FrameDumper.cpp b/Source/Core/VideoCommon/FrameDumper.cpp index bb0cb2c378..f0c62c4c17 100644 --- a/Source/Core/VideoCommon/FrameDumper.cpp +++ b/Source/Core/VideoCommon/FrameDumper.cpp @@ -16,7 +16,6 @@ #include "VideoCommon/AbstractTexture.h" #include "VideoCommon/OnScreenDisplay.h" #include "VideoCommon/Present.h" -#include "VideoCommon/RenderBase.h" #include "VideoCommon/VideoConfig.h" static bool DumpFrameToPNG(const FrameData& frame, const std::string& file_name) diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp index e252921c9f..b02738d037 100644 --- a/Source/Core/VideoCommon/RenderBase.cpp +++ b/Source/Core/VideoCommon/RenderBase.cpp @@ -23,38 +23,27 @@ #include "Common/Assert.h" #include "Common/ChunkFile.h" #include "Common/CommonTypes.h" -#include "Common/Config/Config.h" #include "Common/Logging/Log.h" #include "Common/MsgHandler.h" -#include "Core/Config/GraphicsSettings.h" #include "Core/Config/SYSCONFSettings.h" #include "Core/ConfigManager.h" -#include "Core/Core.h" -#include "Core/DolphinAnalytics.h" -#include "Core/FifoPlayer/FifoRecorder.h" -#include "Core/FreeLookConfig.h" -#include "Core/HW/SystemTimers.h" #include "Core/System.h" -#include "VideoCommon/AbstractFramebuffer.h" #include "VideoCommon/AbstractGfx.h" -#include "VideoCommon/AbstractTexture.h" +#include "VideoCommon/BPMemory.h" #include "VideoCommon/BoundingBox.h" -#include "VideoCommon/CommandProcessor.h" +#include "VideoCommon/BPFunctions.h" #include "VideoCommon/FrameDumper.h" -#include "VideoCommon/FramebufferManager.h" -#include "VideoCommon/GraphicsModSystem/Runtime/GraphicsModManager.h" -#include "VideoCommon/OnScreenDisplay.h" -#include "VideoCommon/PerformanceMetrics.h" + #include "VideoCommon/FramebufferManager.h" #include "VideoCommon/PixelEngine.h" #include "VideoCommon/PixelShaderManager.h" #include "VideoCommon/Present.h" -#include "VideoCommon/ShaderCache.h" -#include "VideoCommon/Statistics.h" #include "VideoCommon/VertexManagerBase.h" #include "VideoCommon/VideoBackendBase.h" #include "VideoCommon/VideoConfig.h" +#include "VideoCommon/VideoCommon.h" +#include "VideoCommon/XFMemory.h" std::unique_ptr g_renderer; @@ -62,7 +51,6 @@ Renderer::Renderer() : m_prev_efb_format{PixelFormat::INVALID_FMT}, m_last_xfb_width{MAX_XFB_WIDTH}, m_last_xfb_height{MAX_XFB_HEIGHT} { - UpdateActiveConfig(); CalculateTargetSize(); UpdateWidescreen(); diff --git a/Source/Core/VideoCommon/RenderBase.h b/Source/Core/VideoCommon/RenderBase.h index 209d915975..0468681e21 100644 --- a/Source/Core/VideoCommon/RenderBase.h +++ b/Source/Core/VideoCommon/RenderBase.h @@ -13,43 +13,17 @@ #pragma once -#include #include -#include -#include -#include -#include #include -#include #include "Common/CommonTypes.h" -#include "Common/Flag.h" #include "Common/MathUtil.h" #include "VideoCommon/RenderState.h" #include "VideoCommon/VideoEvents.h" -class AbstractFramebuffer; -class AbstractPipeline; -class AbstractShader; -class AbstractTexture; -class AbstractStagingTexture; -class NativeVertexFormat; -class PixelShaderManager; class PointerWrap; -struct ComputePipelineConfig; -struct AbstractPipelineConfig; -struct PortableVertexDeclaration; -struct TextureConfig; -enum class AbstractTextureFormat : u32; -enum class ShaderStage; enum class EFBAccessType; enum class EFBReinterpretType; -enum class StagingTextureType; - -namespace VideoCommon -{ -class AsyncShaderCompiler; -} struct EfbPokeData { diff --git a/Source/Core/VideoCommon/VertexManagerBase.cpp b/Source/Core/VideoCommon/VertexManagerBase.cpp index 895ddb1372..a1058c77c7 100644 --- a/Source/Core/VideoCommon/VertexManagerBase.cpp +++ b/Source/Core/VideoCommon/VertexManagerBase.cpp @@ -30,7 +30,6 @@ #include "VideoCommon/OpcodeDecoding.h" #include "VideoCommon/PerfQueryBase.h" #include "VideoCommon/PixelShaderManager.h" -#include "VideoCommon/RenderBase.h" #include "VideoCommon/Statistics.h" #include "VideoCommon/TextureCacheBase.h" #include "VideoCommon/TextureInfo.h" diff --git a/Source/Core/VideoCommon/VideoBackendBase.cpp b/Source/Core/VideoCommon/VideoBackendBase.cpp index 31bacc804c..3eeceb3c5e 100644 --- a/Source/Core/VideoCommon/VideoBackendBase.cpp +++ b/Source/Core/VideoCommon/VideoBackendBase.cpp @@ -97,7 +97,7 @@ void VideoBackendBase::Video_ExitLoop() void VideoBackendBase::Video_OutputXFB(u32 xfb_addr, u32 fb_width, u32 fb_stride, u32 fb_height, u64 ticks) { - if (m_initialized && g_renderer && !g_ActiveConfig.bImmediateXFB) + if (m_initialized && g_presenter && !g_ActiveConfig.bImmediateXFB) { auto& system = Core::System::GetInstance(); system.GetFifo().SyncGPU(Fifo::SyncGPUReason::Swap);