diff --git a/Source/Core/VideoBackends/Null/NullBackend.cpp b/Source/Core/VideoBackends/Null/NullBackend.cpp index 2f353d1fe3..5b0661fe2e 100644 --- a/Source/Core/VideoBackends/Null/NullBackend.cpp +++ b/Source/Core/VideoBackends/Null/NullBackend.cpp @@ -13,6 +13,7 @@ #include "VideoBackends/Null/VertexManager.h" #include "VideoBackends/Null/VideoBackend.h" +#include "Common/Common.h" #include "Common/MsgHandler.h" #include "VideoCommon/FramebufferManager.h" @@ -97,4 +98,10 @@ void VideoBackend::Shutdown() ShutdownShared(); } + +std::string VideoBackend::GetDisplayName() const +{ + // i18n: Null is referring to the null video backend, which renders nothing + return _trans("Null"); +} } // namespace Null diff --git a/Source/Core/VideoBackends/Null/NullTexture.h b/Source/Core/VideoBackends/Null/NullTexture.h index 42cbc7e542..ce3726be0f 100644 --- a/Source/Core/VideoBackends/Null/NullTexture.h +++ b/Source/Core/VideoBackends/Null/NullTexture.h @@ -19,7 +19,6 @@ class NullTexture final : public AbstractTexture { public: explicit NullTexture(const TextureConfig& config); - ~NullTexture() = default; void CopyRectangleFromTexture(const AbstractTexture* src, const MathUtil::Rectangle& src_rect, u32 src_layer, @@ -58,7 +57,6 @@ public: explicit NullFramebuffer(AbstractTexture* color_attachment, AbstractTexture* depth_attachment, AbstractTextureFormat color_format, AbstractTextureFormat depth_format, u32 width, u32 height, u32 layers, u32 samples); - ~NullFramebuffer() override = default; static std::unique_ptr Create(NullTexture* color_attachment, NullTexture* depth_attachment); diff --git a/Source/Core/VideoBackends/Null/PerfQuery.h b/Source/Core/VideoBackends/Null/PerfQuery.h index 91d13d4722..0d43117951 100644 --- a/Source/Core/VideoBackends/Null/PerfQuery.h +++ b/Source/Core/VideoBackends/Null/PerfQuery.h @@ -8,11 +8,9 @@ namespace Null { -class PerfQuery : public PerfQueryBase +class PerfQuery final : public PerfQueryBase { public: - PerfQuery() {} - ~PerfQuery() override {} void EnableQuery(PerfQueryGroup type) override {} void DisableQuery(PerfQueryGroup type) override {} void ResetQuery() override {} diff --git a/Source/Core/VideoBackends/Null/Render.cpp b/Source/Core/VideoBackends/Null/Render.cpp index 312844afe0..7e8719baf5 100644 --- a/Source/Core/VideoBackends/Null/Render.cpp +++ b/Source/Core/VideoBackends/Null/Render.cpp @@ -2,10 +2,9 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. -#include "Common/Logging/Log.h" +#include "VideoBackends/Null/Render.h" #include "VideoBackends/Null/NullTexture.h" -#include "VideoBackends/Null/Render.h" #include "VideoCommon/AbstractPipeline.h" #include "VideoCommon/AbstractShader.h" @@ -45,7 +44,6 @@ class NullShader final : public AbstractShader { public: explicit NullShader(ShaderStage stage) : AbstractShader(stage) {} - ~NullShader() = default; }; std::unique_ptr @@ -62,9 +60,6 @@ std::unique_ptr Renderer::CreateShaderFromBinary(ShaderStage sta class NullPipeline final : public AbstractPipeline { -public: - NullPipeline() = default; - ~NullPipeline() override = default; }; std::unique_ptr Renderer::CreatePipeline(const AbstractPipelineConfig& config, diff --git a/Source/Core/VideoBackends/Null/Render.h b/Source/Core/VideoBackends/Null/Render.h index 03f08e850d..21bd9c9c2c 100644 --- a/Source/Core/VideoBackends/Null/Render.h +++ b/Source/Core/VideoBackends/Null/Render.h @@ -8,7 +8,7 @@ namespace Null { -class Renderer : public ::Renderer +class Renderer final : public ::Renderer { public: Renderer(); diff --git a/Source/Core/VideoBackends/Null/TextureCache.h b/Source/Core/VideoBackends/Null/TextureCache.h index 35c802ce4b..b407c826e6 100644 --- a/Source/Core/VideoBackends/Null/TextureCache.h +++ b/Source/Core/VideoBackends/Null/TextureCache.h @@ -4,21 +4,12 @@ #pragma once -#include - -#include "VideoBackends/Null/NullTexture.h" - #include "VideoCommon/TextureCacheBase.h" -#include "VideoCommon/TextureConfig.h" namespace Null { -class TextureCache : public TextureCacheBase +class TextureCache final : public TextureCacheBase { -public: - TextureCache() {} - ~TextureCache() {} - protected: void CopyEFB(AbstractStagingTexture* dst, const EFBCopyParams& params, u32 native_width, u32 bytes_per_row, u32 num_blocks_y, u32 memory_stride, diff --git a/Source/Core/VideoBackends/Null/VertexManager.cpp b/Source/Core/VideoBackends/Null/VertexManager.cpp index bf70743262..329f89a2a2 100644 --- a/Source/Core/VideoBackends/Null/VertexManager.cpp +++ b/Source/Core/VideoBackends/Null/VertexManager.cpp @@ -3,10 +3,6 @@ // Refer to the license.txt file included. #include "VideoBackends/Null/VertexManager.h" -#include "VideoBackends/Null/Render.h" - -#include "VideoCommon/IndexGenerator.h" -#include "VideoCommon/VertexLoaderManager.h" namespace Null { diff --git a/Source/Core/VideoBackends/Null/VertexManager.h b/Source/Core/VideoBackends/Null/VertexManager.h index 7ab7557db6..1ca0d15177 100644 --- a/Source/Core/VideoBackends/Null/VertexManager.h +++ b/Source/Core/VideoBackends/Null/VertexManager.h @@ -4,18 +4,15 @@ #pragma once -#include -#include - #include "VideoCommon/VertexManagerBase.h" namespace Null { -class VertexManager : public VertexManagerBase +class VertexManager final : public VertexManagerBase { public: VertexManager(); - ~VertexManager(); + ~VertexManager() override; protected: void DrawCurrentBatch(u32 base_index, u32 num_indices, u32 base_vertex) override; diff --git a/Source/Core/VideoBackends/Null/VideoBackend.h b/Source/Core/VideoBackends/Null/VideoBackend.h index 3076f7aed0..0930ccf7ad 100644 --- a/Source/Core/VideoBackends/Null/VideoBackend.h +++ b/Source/Core/VideoBackends/Null/VideoBackend.h @@ -4,22 +4,17 @@ #pragma once -#include "Common/Common.h" #include "VideoCommon/VideoBackendBase.h" namespace Null { -class VideoBackend : public VideoBackendBase +class VideoBackend final : public VideoBackendBase { bool Initialize(const WindowSystemInfo& wsi) override; void Shutdown() override; std::string GetName() const override { return "Null"; } - std::string GetDisplayName() const override - { - // i18n: Null is referring to the null video backend, which renders nothing - return _trans("Null"); - } + std::string GetDisplayName() const override; void InitBackendInfo() override; }; } // namespace Null