Video Backends: Split texture cache code out into separate files, introduce 'AbstractTexture'

Source/Core/VideoBackends/Null/CMakeLists.txt

@@ -1,5 +1,6 @@
 set(SRCS
   NullBackend.cpp
+  NullTexture.cpp
   Render.cpp
   VertexManager.cpp
   ShaderCache.cpp

Source/Core/VideoBackends/Null/Null.vcxproj

@@ -37,12 +37,14 @@
   <PropertyGroup Label="UserMacros" />
   <ItemGroup>
     <ClCompile Include="NullBackend.cpp" />
+    <ClCompile Include="NullTexture.cpp" />
     <ClCompile Include="Render.cpp" />
     <ClCompile Include="ShaderCache.cpp" />
     <ClCompile Include="VertexManager.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="FramebufferManager.h" />
+    <ClInclude Include="NullTexture.h" />
     <ClInclude Include="PerfQuery.h" />
     <ClInclude Include="Render.h" />
     <ClInclude Include="ShaderCache.h" />

Source/Core/VideoBackends/Null/NullTexture.cpp

@@ -0,0 +1,28 @@
+// Copyright 2017 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#include "VideoBackends/Null/NullTexture.h"
+
+namespace Null
+{
+NullTexture::NullTexture(const TextureConfig& tex_config) : AbstractTexture(tex_config)
+{
+}
+
+void NullTexture::Bind(unsigned int stage)
+{
+}
+
+void NullTexture::CopyRectangleFromTexture(const AbstractTexture* source,
+                                           const MathUtil::Rectangle<int>& srcrect,
+                                           const MathUtil::Rectangle<int>& dstrect)
+{
+}
+
+void NullTexture::Load(u32 level, u32 width, u32 height, u32 row_length, const u8* buffer,
+                       size_t buffer_size)
+{
+}
+
+}  // namespace Null

Source/Core/VideoBackends/Null/NullTexture.h

@@ -0,0 +1,29 @@
+// Copyright 2017 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "Common/CommonTypes.h"
+
+#include "VideoCommon/AbstractTexture.h"
+#include "VideoCommon/VideoCommon.h"
+
+namespace Null
+{
+class NullTexture final : public AbstractTexture
+{
+public:
+  explicit NullTexture(const TextureConfig& config);
+  ~NullTexture() = default;
+
+  void Bind(unsigned int stage) override;
+
+  void CopyRectangleFromTexture(const AbstractTexture* source,
+                                const MathUtil::Rectangle<int>& srcrect,
+                                const MathUtil::Rectangle<int>& dstrect) override;
+  void Load(u32 level, u32 width, u32 height, u32 row_length, const u8* buffer,
+            size_t buffer_size) override;
+};
+
+}  // namespace Null

Source/Core/VideoBackends/Null/TextureCache.h

@@ -4,7 +4,12 @@
 
 #pragma once
 
+#include <memory>
+
+#include "VideoBackends/Null/NullTexture.h"
+
 #include "VideoCommon/TextureCacheBase.h"
+#include "VideoCommon/TextureConfig.h"
 
 namespace Null
 {
@@ -15,7 +20,7 @@ public:
   ~TextureCache() {}
   bool CompileShaders() override { return true; }
   void DeleteShaders() override {}
-  void ConvertTexture(TCacheEntryBase* entry, TCacheEntryBase* unconverted, void* palette,
+  void ConvertTexture(TCacheEntry* entry, TCacheEntry* unconverted, void* palette,
                       TlutFormat format) override
   {
   }
@@ -26,33 +31,15 @@ public:
   {
   }
 
+  void CopyEFBToCacheEntry(TCacheEntry* entry, bool is_depth_copy, const EFBRectangle& src_rect,
+                           bool scale_by_half, unsigned int cbuf_id, const float* colmat) override
+  {
+  }
+
 private:
-  struct TCacheEntry : TCacheEntryBase
+  std::unique_ptr<AbstractTexture> CreateTexture(const TextureConfig& config) override
   {
-    TCacheEntry(const TCacheEntryConfig& _config) : TCacheEntryBase(_config) {}
-    ~TCacheEntry() {}
-    void Load(u32 level, u32 width, u32 height, u32 row_length, const u8* buffer,
-              size_t buffer_size) override
-    {
-    }
-    void FromRenderTarget(bool is_depth_copy, const EFBRectangle& src_rect, bool scale_by_half,
-                          unsigned int cbufid, const float* colmat) override
-    {
-    }
-
-    void CopyRectangleFromTexture(const TCacheEntryBase* source,
-                                  const MathUtil::Rectangle<int>& srcrect,
-                                  const MathUtil::Rectangle<int>& dstrect) override
-    {
-    }
-
-    void Bind(unsigned int stage) override {}
-    bool Save(const std::string& filename, unsigned int level) override { return false; }
-  };
-
-  TCacheEntryBase* CreateTexture(const TCacheEntryConfig& config) override
-  {
-    return new TCacheEntry(config);
+    return std::make_unique<NullTexture>(config);
   }
 };