From cf9a6f8477a8c0ebfcb344fb9f3af9b97569798b Mon Sep 17 00:00:00 2001 From: Scott Mansell Date: Tue, 31 Jan 2023 19:21:15 +1300 Subject: [PATCH] Lint fixes --- Source/Core/VideoBackends/Metal/MTLMain.mm | 9 +++------ Source/Core/VideoBackends/Metal/MTLObjectCache.h | 2 +- Source/Core/VideoBackends/OGL/OGLConfig.h | 2 +- Source/Core/VideoBackends/Software/SWGfx.cpp | 2 +- Source/Core/VideoCommon/VertexShaderManager.cpp | 1 - Source/Core/VideoCommon/VertexShaderManager.h | 2 -- Source/Core/VideoCommon/VideoConfig.cpp | 7 ++----- Source/Core/VideoCommon/Widescreen.cpp | 13 +++++++------ Source/Core/VideoCommon/Widescreen.h | 4 ++-- 9 files changed, 17 insertions(+), 25 deletions(-) diff --git a/Source/Core/VideoBackends/Metal/MTLMain.mm b/Source/Core/VideoBackends/Metal/MTLMain.mm index d7be2cc534..f799d5eea1 100644 --- a/Source/Core/VideoBackends/Metal/MTLMain.mm +++ b/Source/Core/VideoBackends/Metal/MTLMain.mm @@ -17,9 +17,9 @@ #include "Common/MsgHandler.h" #include "VideoBackends/Metal/MTLBoundingBox.h" +#include "VideoBackends/Metal/MTLGfx.h" #include "VideoBackends/Metal/MTLObjectCache.h" #include "VideoBackends/Metal/MTLPerfQuery.h" -#include "VideoBackends/Metal/MTLGfx.h" #include "VideoBackends/Metal/MTLStateTracker.h" #include "VideoBackends/Metal/MTLUtil.h" #include "VideoBackends/Metal/MTLVertexManager.h" @@ -106,11 +106,8 @@ bool Metal::VideoBackend::Initialize(const WindowSystemInfo& wsi) g_state_tracker = std::make_unique(); return InitializeShared( - std::make_unique(std::move(layer)), - std::make_unique(), - std::make_unique(), - std::make_unique() - ); + std::make_unique(std::move(layer)), std::make_unique(), + std::make_unique(), std::make_unique()); } } diff --git a/Source/Core/VideoBackends/Metal/MTLObjectCache.h b/Source/Core/VideoBackends/Metal/MTLObjectCache.h index 9ae28a6352..f47a513116 100644 --- a/Source/Core/VideoBackends/Metal/MTLObjectCache.h +++ b/Source/Core/VideoBackends/Metal/MTLObjectCache.h @@ -8,8 +8,8 @@ #include "VideoBackends/Metal/MRCHelpers.h" -#include "VideoCommon/RenderState.h" #include "VideoCommon/BPMemory.h" +#include "VideoCommon/RenderState.h" struct AbstractPipelineConfig; class AbstractPipeline; diff --git a/Source/Core/VideoBackends/OGL/OGLConfig.h b/Source/Core/VideoBackends/OGL/OGLConfig.h index eb3d20e70c..2aece68896 100644 --- a/Source/Core/VideoBackends/OGL/OGLConfig.h +++ b/Source/Core/VideoBackends/OGL/OGLConfig.h @@ -75,4 +75,4 @@ bool PopulateConfig(GLContext* main_gl_context); extern VideoConfig g_ogl_config; -} // namespace OGL \ No newline at end of file +} // namespace OGL diff --git a/Source/Core/VideoBackends/Software/SWGfx.cpp b/Source/Core/VideoBackends/Software/SWGfx.cpp index d4758a07fa..4dfd5dc0f2 100644 --- a/Source/Core/VideoBackends/Software/SWGfx.cpp +++ b/Source/Core/VideoBackends/Software/SWGfx.cpp @@ -128,4 +128,4 @@ void SWGfx::SetScissorRect(const MathUtil::Rectangle& rc) Rasterizer::ScissorChanged(); } -} // namespace SW \ No newline at end of file +} // namespace SW diff --git a/Source/Core/VideoCommon/VertexShaderManager.cpp b/Source/Core/VideoCommon/VertexShaderManager.cpp index ab55efca8c..2408281da6 100644 --- a/Source/Core/VideoCommon/VertexShaderManager.cpp +++ b/Source/Core/VideoCommon/VertexShaderManager.cpp @@ -176,7 +176,6 @@ bool VertexShaderManager::UseVertexDepthRange() return fabs(xfmem.viewport.zRange) > 16777215.0f || fabs(xfmem.viewport.farZ) > 16777215.0f; } - // Syncs the shader constant buffers with xfmem // TODO: A cleaner way to control the matrices without making a mess in the parameters field void VertexShaderManager::SetConstants(const std::vector& textures) diff --git a/Source/Core/VideoCommon/VertexShaderManager.h b/Source/Core/VideoCommon/VertexShaderManager.h index 3b22d43aeb..320e04985d 100644 --- a/Source/Core/VideoCommon/VertexShaderManager.h +++ b/Source/Core/VideoCommon/VertexShaderManager.h @@ -49,8 +49,6 @@ public: VertexShaderConstants constants{}; bool dirty = false; - - private: alignas(16) std::array m_projection_matrix; diff --git a/Source/Core/VideoCommon/VideoConfig.cpp b/Source/Core/VideoCommon/VideoConfig.cpp index 0c209a9686..dfbc0d3952 100644 --- a/Source/Core/VideoCommon/VideoConfig.cpp +++ b/Source/Core/VideoCommon/VideoConfig.cpp @@ -355,8 +355,5 @@ void CheckForConfigChanges() // TODO: Move everything else to the ConfigChanged event } -static EventHook s_check_config_event = AfterFrameEvent::Register( - [] { - CheckForConfigChanges(); - }, - "CheckForConfigChanges"); +static EventHook s_check_config_event = + AfterFrameEvent::Register([] { CheckForConfigChanges(); }, "CheckForConfigChanges"); diff --git a/Source/Core/VideoCommon/Widescreen.cpp b/Source/Core/VideoCommon/Widescreen.cpp index ac8fa2fcfd..dd1393d309 100644 --- a/Source/Core/VideoCommon/Widescreen.cpp +++ b/Source/Core/VideoCommon/Widescreen.cpp @@ -15,10 +15,12 @@ WidescreenManager::WidescreenManager() { Update(); - m_config_changed = ConfigChangedEvent::Register([this](u32 bits) { - if (bits & (CONFIG_CHANGE_BIT_ASPECT_RATIO)) - Update(); - }, "Widescreen"); + m_config_changed = ConfigChangedEvent::Register( + [this](u32 bits) { + if (bits & (CONFIG_CHANGE_BIT_ASPECT_RATIO)) + Update(); + }, + "Widescreen"); // VertexManager doesn't maintain statistics in Wii mode. if (!SConfig::GetInstance().bWii) @@ -28,7 +30,6 @@ WidescreenManager::WidescreenManager() } } - void WidescreenManager::Update() { if (SConfig::GetInstance().bWii) @@ -110,4 +111,4 @@ void WidescreenManager::DoState(PointerWrap& p) { m_was_orthographically_anamorphic = false; } -} \ No newline at end of file +} diff --git a/Source/Core/VideoCommon/Widescreen.h b/Source/Core/VideoCommon/Widescreen.h index 437149cb54..78430ca9bf 100644 --- a/Source/Core/VideoCommon/Widescreen.h +++ b/Source/Core/VideoCommon/Widescreen.h @@ -5,7 +5,6 @@ #include - #include "VideoCommon/VideoConfig.h" #include "VideoCommon/VideoEvents.h" @@ -20,6 +19,7 @@ public: bool IsGameWidescreen() const { return m_is_game_widescreen; } void DoState(PointerWrap& p); + private: void Update(); void UpdateWidescreenHeuristic(); @@ -31,4 +31,4 @@ private: EventHook m_config_changed; }; -extern std::unique_ptr g_widescreen; \ No newline at end of file +extern std::unique_ptr g_widescreen;