From 97dc773a3eecba886f9a99a6aa2bb460cf73ef20 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Tue, 4 Apr 2017 22:52:48 +1000 Subject: [PATCH] D3D: Drop redundant interface TextureEncoder --- Source/Core/VideoBackends/D3D/CMakeLists.txt | 1 - Source/Core/VideoBackends/D3D/D3D.vcxproj | 1 - .../VideoBackends/D3D/D3D.vcxproj.filters | 3 -- .../Core/VideoBackends/D3D/PSTextureEncoder.h | 3 +- .../Core/VideoBackends/D3D/TextureCache.cpp | 3 +- .../Core/VideoBackends/D3D/TextureEncoder.h | 29 ------------------- .../Core/VideoBackends/D3D12/CMakeLists.txt | 1 - Source/Core/VideoBackends/D3D12/D3D12.vcxproj | 1 - .../VideoBackends/D3D12/D3D12.vcxproj.filters | 3 -- .../VideoBackends/D3D12/PSTextureEncoder.h | 4 +-- .../Core/VideoBackends/D3D12/TextureCache.cpp | 3 +- .../Core/VideoBackends/D3D12/TextureEncoder.h | 29 ------------------- 12 files changed, 5 insertions(+), 76 deletions(-) delete mode 100644 Source/Core/VideoBackends/D3D/TextureEncoder.h delete mode 100644 Source/Core/VideoBackends/D3D12/TextureEncoder.h diff --git a/Source/Core/VideoBackends/D3D/CMakeLists.txt b/Source/Core/VideoBackends/D3D/CMakeLists.txt index c6d75950a9..9a95efe46d 100644 --- 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 index 12a7239c1a..76e591891b 100644 --- a/Source/Core/VideoBackends/D3D/D3D.vcxproj +++ b/Source/Core/VideoBackends/D3D/D3D.vcxproj @@ -72,7 +72,6 @@ - diff --git a/Source/Core/VideoBackends/D3D/D3D.vcxproj.filters b/Source/Core/VideoBackends/D3D/D3D.vcxproj.filters index 440a547084..67e78c6c29 100644 --- a/Source/Core/VideoBackends/D3D/D3D.vcxproj.filters +++ b/Source/Core/VideoBackends/D3D/D3D.vcxproj.filters @@ -111,9 +111,6 @@ Render - - Render - Render diff --git a/Source/Core/VideoBackends/D3D/PSTextureEncoder.h b/Source/Core/VideoBackends/D3D/PSTextureEncoder.h index 3c8924cb87..eee3f63cc5 100644 --- a/Source/Core/VideoBackends/D3D/PSTextureEncoder.h +++ b/Source/Core/VideoBackends/D3D/PSTextureEncoder.h @@ -7,7 +7,6 @@ #include #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 index 0cf01c0a0e..e3edf79695 100644 --- a/Source/Core/VideoBackends/D3D/TextureCache.cpp +++ b/Source/Core/VideoBackends/D3D/TextureCache.cpp @@ -18,7 +18,6 @@ #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" @@ -26,7 +25,7 @@ namespace DX11 { -static std::unique_ptr g_encoder; +static std::unique_ptr 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 deleted file mode 100644 index 36d78f19c4..0000000000 --- a/Source/Core/VideoBackends/D3D/TextureEncoder.h +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright 2011 Dolphin Emulator Project -// Licensed under GPLv2+ -// Refer to the license.txt file included. - -#pragma once - -#include "Common/CommonTypes.h" -#include "VideoCommon/VideoCommon.h" - -namespace DX11 -{ -// Maximum number of bytes that can occur in a texture block-row generated by -// the encoder -static const UINT MAX_BYTES_PER_BLOCK_ROW = (EFB_WIDTH / 4) * 64; -// The maximum amount of data that the texture encoder can generate in one call -static const UINT MAX_BYTES_PER_ENCODE = MAX_BYTES_PER_BLOCK_ROW * (EFB_HEIGHT / 4); - -class TextureEncoder -{ -public: - virtual ~TextureEncoder() {} - virtual void Init() = 0; - virtual void Shutdown() = 0; - // Returns size in bytes of encoded block of memory - virtual void Encode(u8* dst, u32 format, u32 native_width, u32 bytes_per_row, u32 num_blocks_y, - u32 memory_stride, bool is_depth_copy, const EFBRectangle& srcRect, - bool isIntensity, bool scaleByHalf) = 0; -}; -} diff --git a/Source/Core/VideoBackends/D3D12/CMakeLists.txt b/Source/Core/VideoBackends/D3D12/CMakeLists.txt index efae294ac3..984e84a8b6 100644 --- 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 index ff026f977c..401fa20df1 100644 --- a/Source/Core/VideoBackends/D3D12/D3D12.vcxproj +++ b/Source/Core/VideoBackends/D3D12/D3D12.vcxproj @@ -91,7 +91,6 @@ - diff --git a/Source/Core/VideoBackends/D3D12/D3D12.vcxproj.filters b/Source/Core/VideoBackends/D3D12/D3D12.vcxproj.filters index f9b7d8e624..ff2922fbd1 100644 --- a/Source/Core/VideoBackends/D3D12/D3D12.vcxproj.filters +++ b/Source/Core/VideoBackends/D3D12/D3D12.vcxproj.filters @@ -105,9 +105,6 @@ Render - - Render - Render diff --git a/Source/Core/VideoBackends/D3D12/PSTextureEncoder.h b/Source/Core/VideoBackends/D3D12/PSTextureEncoder.h index a1b518996f..8f7f11b229 100644 --- 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 index 3fe7e77e4f..8ae4d54d74 100644 --- a/Source/Core/VideoBackends/D3D12/TextureCache.cpp +++ b/Source/Core/VideoBackends/D3D12/TextureCache.cpp @@ -18,7 +18,6 @@ #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" @@ -26,7 +25,7 @@ namespace DX12 { -static std::unique_ptr s_encoder = nullptr; +static std::unique_ptr s_encoder = nullptr; static std::unique_ptr 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 deleted file mode 100644 index 198bb9c6b8..0000000000 --- a/Source/Core/VideoBackends/D3D12/TextureEncoder.h +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright 2011 Dolphin Emulator Project -// Licensed under GPLv2+ -// Refer to the license.txt file included. - -#pragma once - -#include "Common/CommonTypes.h" -#include "VideoCommon/VideoCommon.h" - -namespace DX12 -{ -// Maximum number of bytes that can occur in a texture block-row generated by -// the encoder -static constexpr unsigned int MAX_BYTES_PER_BLOCK_ROW = (EFB_WIDTH / 4) * 64; -// The maximum amount of data that the texture encoder can generate in one call -static constexpr unsigned int MAX_BYTES_PER_ENCODE = MAX_BYTES_PER_BLOCK_ROW * (EFB_HEIGHT / 4); - -class TextureEncoder -{ -public: - virtual ~TextureEncoder() {} - virtual void Init() = 0; - virtual void Shutdown() = 0; - // Returns size in bytes of encoded block of memory - virtual void Encode(u8* dst, u32 format, u32 native_width, u32 bytes_per_row, u32 num_blocks_y, - u32 memory_stride, bool is_depth_copy, const EFBRectangle& src_rect, - bool is_intensity, bool scale_by_half) = 0; -}; -}