Merge pull request #5203 from stenzek/useless-interface

D3D: Drop redundant interface TextureEncoder
dolphin-emu · Apr 4, 2017 · 8d31b4f · 8d31b4f
2 parents 90accea + 97dc773
commit 8d31b4f
Show file tree

Hide file tree

Showing 12 changed files with 5 additions and 76 deletions.
diff --git a/Source/Core/VideoBackends/D3D/CMakeLists.txt b/Source/Core/VideoBackends/D3D/CMakeLists.txt
@@ -31,7 +31,6 @@ set(SRCS
   Television.h
   TextureCache.cpp
   TextureCache.h
-  TextureEncoder.h
   VertexManager.cpp
   VertexManager.h
   VertexShaderCache.cpp

diff --git a/Source/Core/VideoBackends/D3D/D3D.vcxproj b/Source/Core/VideoBackends/D3D/D3D.vcxproj
@@ -72,7 +72,6 @@
     <ClInclude Include="Render.h" />
     <ClInclude Include="Television.h" />
     <ClInclude Include="TextureCache.h" />
-    <ClInclude Include="TextureEncoder.h" />
     <ClInclude Include="VertexManager.h" />
     <ClInclude Include="VertexShaderCache.h" />
     <ClInclude Include="VideoBackend.h" />

diff --git a/Source/Core/VideoBackends/D3D/D3D.vcxproj.filters b/Source/Core/VideoBackends/D3D/D3D.vcxproj.filters
@@ -111,9 +111,6 @@
     <ClInclude Include="TextureCache.h">
       <Filter>Render</Filter>
     </ClInclude>
-    <ClInclude Include="TextureEncoder.h">
-      <Filter>Render</Filter>
-    </ClInclude>
     <ClInclude Include="VertexManager.h">
       <Filter>Render</Filter>
     </ClInclude>

diff --git a/Source/Core/VideoBackends/D3D/PSTextureEncoder.h b/Source/Core/VideoBackends/D3D/PSTextureEncoder.h
@@ -7,7 +7,6 @@
 #include <map>
 
 #include "Common/CommonTypes.h"
-#include "VideoBackends/D3D/TextureEncoder.h"
 #include "VideoCommon/VideoCommon.h"
 
 struct ID3D11Texture2D;
@@ -25,7 +24,7 @@ struct ID3D11SamplerState;
 
 namespace DX11
 {
-class PSTextureEncoder : public TextureEncoder
+class PSTextureEncoder final
 {
 public:
   PSTextureEncoder();

diff --git a/Source/Core/VideoBackends/D3D/TextureCache.cpp b/Source/Core/VideoBackends/D3D/TextureCache.cpp
@@ -18,15 +18,14 @@
 #include "VideoBackends/D3D/GeometryShaderCache.h"
 #include "VideoBackends/D3D/PSTextureEncoder.h"
 #include "VideoBackends/D3D/PixelShaderCache.h"
-#include "VideoBackends/D3D/TextureEncoder.h"
 #include "VideoBackends/D3D/VertexShaderCache.h"
 #include "VideoCommon/ImageWrite.h"
 #include "VideoCommon/RenderBase.h"
 #include "VideoCommon/VideoConfig.h"
 
 namespace DX11
 {
-static std::unique_ptr<TextureEncoder> g_encoder;
+static std::unique_ptr<PSTextureEncoder> g_encoder;
 const size_t MAX_COPY_BUFFERS = 32;
 ID3D11Buffer* efbcopycbuf[MAX_COPY_BUFFERS] = {0};
 

diff --git a/Source/Core/VideoBackends/D3D/TextureEncoder.h b/Source/Core/VideoBackends/D3D/TextureEncoder.h
diff --git a/Source/Core/VideoBackends/D3D12/CMakeLists.txt b/Source/Core/VideoBackends/D3D12/CMakeLists.txt
@@ -38,7 +38,6 @@ set(SRCS
   StaticShaderCache.h
   TextureCache.cpp
   TextureCache.h
-  TextureEncoder.h
   VertexManager.cpp
   VertexManager.h
   VideoBackend.h

diff --git a/Source/Core/VideoBackends/D3D12/D3D12.vcxproj b/Source/Core/VideoBackends/D3D12/D3D12.vcxproj
@@ -91,7 +91,6 @@
     <ClInclude Include="ShaderConstantsManager.h" />
     <ClInclude Include="StaticShaderCache.h" />
     <ClInclude Include="TextureCache.h" />
-    <ClInclude Include="TextureEncoder.h" />
     <ClInclude Include="VertexManager.h" />
     <ClInclude Include="VideoBackend.h" />
     <ClInclude Include="XFBEncoder.h" />

diff --git a/Source/Core/VideoBackends/D3D12/D3D12.vcxproj.filters b/Source/Core/VideoBackends/D3D12/D3D12.vcxproj.filters
@@ -105,9 +105,6 @@
     <ClInclude Include="TextureCache.h">
       <Filter>Render</Filter>
     </ClInclude>
-    <ClInclude Include="TextureEncoder.h">
-      <Filter>Render</Filter>
-    </ClInclude>
     <ClInclude Include="VertexManager.h">
       <Filter>Render</Filter>
     </ClInclude>

diff --git a/Source/Core/VideoBackends/D3D12/PSTextureEncoder.h b/Source/Core/VideoBackends/D3D12/PSTextureEncoder.h
@@ -9,11 +9,11 @@
 
 #include "Common/CommonTypes.h"
 #include "VideoBackends/D3D12/D3DBase.h"
-#include "VideoBackends/D3D12/TextureEncoder.h"
+#include "VideoCommon/VideoCommon.h"
 
 namespace DX12
 {
-class PSTextureEncoder final : public TextureEncoder
+class PSTextureEncoder final
 {
 public:
   PSTextureEncoder();

diff --git a/Source/Core/VideoBackends/D3D12/TextureCache.cpp b/Source/Core/VideoBackends/D3D12/TextureCache.cpp
@@ -18,15 +18,14 @@
 #include "VideoBackends/D3D12/FramebufferManager.h"
 #include "VideoBackends/D3D12/PSTextureEncoder.h"
 #include "VideoBackends/D3D12/StaticShaderCache.h"
-#include "VideoBackends/D3D12/TextureEncoder.h"
 
 #include "VideoCommon/ImageWrite.h"
 #include "VideoCommon/RenderBase.h"
 #include "VideoCommon/VideoConfig.h"
 
 namespace DX12
 {
-static std::unique_ptr<TextureEncoder> s_encoder = nullptr;
+static std::unique_ptr<PSTextureEncoder> s_encoder = nullptr;
 
 static std::unique_ptr<D3DStreamBuffer> s_efb_copy_stream_buffer = nullptr;
 static u32 s_efb_copy_last_cbuf_id = UINT_MAX;

diff --git a/Source/Core/VideoBackends/D3D12/TextureEncoder.h b/Source/Core/VideoBackends/D3D12/TextureEncoder.h