From bdcc5853d51d82301a8a05cee721c395fabe918b Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Sat, 27 Jul 2019 15:50:41 -0400
Subject: [PATCH 1/4] VideoBackends/Null: Remove unnecessary includes

---
 Source/Core/VideoBackends/Null/NullBackend.cpp   | 7 +++++++
 Source/Core/VideoBackends/Null/Render.cpp        | 3 +--
 Source/Core/VideoBackends/Null/TextureCache.h    | 5 -----
 Source/Core/VideoBackends/Null/VertexManager.cpp | 4 ----
 Source/Core/VideoBackends/Null/VertexManager.h   | 3 ---
 Source/Core/VideoBackends/Null/VideoBackend.h    | 7 +------
 6 files changed, 9 insertions(+), 20 deletions(-)

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/Render.cpp b/Source/Core/VideoBackends/Null/Render.cpp
index 312844afe0..cfa35c7315 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"
diff --git a/Source/Core/VideoBackends/Null/TextureCache.h b/Source/Core/VideoBackends/Null/TextureCache.h
index 35c802ce4b..b9dd2de90a 100644
--- a/Source/Core/VideoBackends/Null/TextureCache.h
+++ b/Source/Core/VideoBackends/Null/TextureCache.h
@@ -4,12 +4,7 @@
 
 #pragma once
 
-#include <memory>
-
-#include "VideoBackends/Null/NullTexture.h"
-
 #include "VideoCommon/TextureCacheBase.h"
-#include "VideoCommon/TextureConfig.h"
 
 namespace Null
 {
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..2f45757f2e 100644
--- a/Source/Core/VideoBackends/Null/VertexManager.h
+++ b/Source/Core/VideoBackends/Null/VertexManager.h
@@ -4,9 +4,6 @@
 
 #pragma once
 
-#include <memory>
-#include <vector>
-
 #include "VideoCommon/VertexManagerBase.h"
 
 namespace Null
diff --git a/Source/Core/VideoBackends/Null/VideoBackend.h b/Source/Core/VideoBackends/Null/VideoBackend.h
index 3076f7aed0..8587854fc6 100644
--- a/Source/Core/VideoBackends/Null/VideoBackend.h
+++ b/Source/Core/VideoBackends/Null/VideoBackend.h
@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include "Common/Common.h"
 #include "VideoCommon/VideoBackendBase.h"
 
 namespace Null
@@ -15,11 +14,7 @@ class VideoBackend : public VideoBackendBase
   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

From 86000fc6b4531123adb2cffa46fffae5ebfe425d Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Sat, 27 Jul 2019 16:03:55 -0400
Subject: [PATCH 2/4] VideoBackends/Null: Remove unnecessary constructors and
 destructors

Removes constructors and destructors that don't actually provide any
behavior (i.e. doesn't constain generated code related to non-trivial
members in a cpp file, etc).

Lessens the amount of code present.
---
 Source/Core/VideoBackends/Null/NullTexture.h  | 2 --
 Source/Core/VideoBackends/Null/PerfQuery.h    | 2 --
 Source/Core/VideoBackends/Null/Render.cpp     | 4 ----
 Source/Core/VideoBackends/Null/TextureCache.h | 4 ----
 4 files changed, 12 deletions(-)

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<int>& 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<NullFramebuffer> 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..80e33753ba 100644
--- a/Source/Core/VideoBackends/Null/PerfQuery.h
+++ b/Source/Core/VideoBackends/Null/PerfQuery.h
@@ -11,8 +11,6 @@ namespace Null
 class PerfQuery : 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 cfa35c7315..7e8719baf5 100644
--- a/Source/Core/VideoBackends/Null/Render.cpp
+++ b/Source/Core/VideoBackends/Null/Render.cpp
@@ -44,7 +44,6 @@ class NullShader final : public AbstractShader
 {
 public:
   explicit NullShader(ShaderStage stage) : AbstractShader(stage) {}
-  ~NullShader() = default;
 };
 
 std::unique_ptr<AbstractShader>
@@ -61,9 +60,6 @@ std::unique_ptr<AbstractShader> Renderer::CreateShaderFromBinary(ShaderStage sta
 
 class NullPipeline final : public AbstractPipeline
 {
-public:
-  NullPipeline() = default;
-  ~NullPipeline() override = default;
 };
 
 std::unique_ptr<AbstractPipeline> Renderer::CreatePipeline(const AbstractPipelineConfig& config,
diff --git a/Source/Core/VideoBackends/Null/TextureCache.h b/Source/Core/VideoBackends/Null/TextureCache.h
index b9dd2de90a..7688004da2 100644
--- a/Source/Core/VideoBackends/Null/TextureCache.h
+++ b/Source/Core/VideoBackends/Null/TextureCache.h
@@ -10,10 +10,6 @@ namespace Null
 {
 class TextureCache : 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,

From 23c5b362a57d52adb094227ff5b456469ebd36ad Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Sat, 27 Jul 2019 17:19:52 -0400
Subject: [PATCH 3/4] VideoBackends/Null: Apply final to classes where
 applicable

These aren't intended to be further specialized, so we can make this
obvious with final.
---
 Source/Core/VideoBackends/Null/PerfQuery.h     | 2 +-
 Source/Core/VideoBackends/Null/Render.h        | 2 +-
 Source/Core/VideoBackends/Null/TextureCache.h  | 2 +-
 Source/Core/VideoBackends/Null/VertexManager.h | 2 +-
 Source/Core/VideoBackends/Null/VideoBackend.h  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Source/Core/VideoBackends/Null/PerfQuery.h b/Source/Core/VideoBackends/Null/PerfQuery.h
index 80e33753ba..0d43117951 100644
--- a/Source/Core/VideoBackends/Null/PerfQuery.h
+++ b/Source/Core/VideoBackends/Null/PerfQuery.h
@@ -8,7 +8,7 @@
 
 namespace Null
 {
-class PerfQuery : public PerfQueryBase
+class PerfQuery final : public PerfQueryBase
 {
 public:
   void EnableQuery(PerfQueryGroup type) override {}
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 7688004da2..b407c826e6 100644
--- a/Source/Core/VideoBackends/Null/TextureCache.h
+++ b/Source/Core/VideoBackends/Null/TextureCache.h
@@ -8,7 +8,7 @@
 
 namespace Null
 {
-class TextureCache : public TextureCacheBase
+class TextureCache final : public TextureCacheBase
 {
 protected:
   void CopyEFB(AbstractStagingTexture* dst, const EFBCopyParams& params, u32 native_width,
diff --git a/Source/Core/VideoBackends/Null/VertexManager.h b/Source/Core/VideoBackends/Null/VertexManager.h
index 2f45757f2e..ba9c2d7186 100644
--- a/Source/Core/VideoBackends/Null/VertexManager.h
+++ b/Source/Core/VideoBackends/Null/VertexManager.h
@@ -8,7 +8,7 @@
 
 namespace Null
 {
-class VertexManager : public VertexManagerBase
+class VertexManager final : public VertexManagerBase
 {
 public:
   VertexManager();
diff --git a/Source/Core/VideoBackends/Null/VideoBackend.h b/Source/Core/VideoBackends/Null/VideoBackend.h
index 8587854fc6..0930ccf7ad 100644
--- a/Source/Core/VideoBackends/Null/VideoBackend.h
+++ b/Source/Core/VideoBackends/Null/VideoBackend.h
@@ -8,7 +8,7 @@
 
 namespace Null
 {
-class VideoBackend : public VideoBackendBase
+class VideoBackend final : public VideoBackendBase
 {
   bool Initialize(const WindowSystemInfo& wsi) override;
   void Shutdown() override;

From 6db305a4e8e2e646992e32d0d1733ec3ce83d559 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Sat, 27 Jul 2019 17:21:02 -0400
Subject: [PATCH 4/4] VideoBackends/Null: Add missing override specifiers

Applies a missing override specifier to VertexManager's destructor.
---
 Source/Core/VideoBackends/Null/VertexManager.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Core/VideoBackends/Null/VertexManager.h b/Source/Core/VideoBackends/Null/VertexManager.h
index ba9c2d7186..1ca0d15177 100644
--- a/Source/Core/VideoBackends/Null/VertexManager.h
+++ b/Source/Core/VideoBackends/Null/VertexManager.h
@@ -12,7 +12,7 @@ class VertexManager final : public VertexManagerBase
 {
 public:
   VertexManager();
-  ~VertexManager();
+  ~VertexManager() override;
 
 protected:
   void DrawCurrentBatch(u32 base_index, u32 num_indices, u32 base_vertex) override;