From abf9bb170bf954220a50921a10f57eaa30e17779 Mon Sep 17 00:00:00 2001 From: degasus Date: Mon, 26 Dec 2016 21:33:57 +0100 Subject: [PATCH] TextureCache: Drop unused parameter in backend API. --- Source/Core/VideoBackends/D3D/TextureCache.cpp | 6 +++--- Source/Core/VideoBackends/D3D/TextureCache.h | 4 ++-- Source/Core/VideoBackends/D3D12/TextureCache.cpp | 6 +++--- Source/Core/VideoBackends/D3D12/TextureCache.h | 4 ++-- Source/Core/VideoBackends/Null/TextureCache.h | 4 ++-- Source/Core/VideoBackends/OGL/TextureCache.cpp | 6 +++--- Source/Core/VideoBackends/OGL/TextureCache.h | 4 ++-- Source/Core/VideoBackends/Software/SWmain.cpp | 4 ++-- Source/Core/VideoBackends/Vulkan/TextureCache.cpp | 6 +++--- Source/Core/VideoBackends/Vulkan/TextureCache.h | 4 ++-- Source/Core/VideoCommon/TextureCacheBase.cpp | 2 +- Source/Core/VideoCommon/TextureCacheBase.h | 4 ++-- 12 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Source/Core/VideoBackends/D3D/TextureCache.cpp b/Source/Core/VideoBackends/D3D/TextureCache.cpp index 5dbf58ffbc..f9057fc13f 100644 --- a/Source/Core/VideoBackends/D3D/TextureCache.cpp +++ b/Source/Core/VideoBackends/D3D/TextureCache.cpp @@ -179,9 +179,9 @@ TextureCacheBase::TCacheEntryBase* TextureCache::CreateTexture(const TCacheEntry } } -void TextureCache::TCacheEntry::FromRenderTarget(u8* dst, bool is_depth_copy, - const EFBRectangle& srcRect, bool scaleByHalf, - unsigned int cbufid, const float* colmat) +void TextureCache::TCacheEntry::FromRenderTarget(bool is_depth_copy, const EFBRectangle& srcRect, + bool scaleByHalf, unsigned int cbufid, + const float* colmat) { // When copying at half size, in multisampled mode, resolve the color/depth buffer first. // This is because multisampled texture reads go through Load, not Sample, and the linear diff --git a/Source/Core/VideoBackends/D3D/TextureCache.h b/Source/Core/VideoBackends/D3D/TextureCache.h index 9158762647..a8273f03f0 100644 --- a/Source/Core/VideoBackends/D3D/TextureCache.h +++ b/Source/Core/VideoBackends/D3D/TextureCache.h @@ -34,8 +34,8 @@ private: void Load(const u8* buffer, u32 width, u32 height, u32 expanded_width, u32 levels) override; - void FromRenderTarget(u8* dst, bool is_depth_copy, const EFBRectangle& srcRect, - bool scaleByHalf, unsigned int cbufid, const float* colmat) override; + void FromRenderTarget(bool is_depth_copy, const EFBRectangle& srcRect, bool scaleByHalf, + unsigned int cbufid, const float* colmat) override; void Bind(unsigned int stage) override; bool Save(const std::string& filename, unsigned int level) override; diff --git a/Source/Core/VideoBackends/D3D12/TextureCache.cpp b/Source/Core/VideoBackends/D3D12/TextureCache.cpp index 11ba46733c..f30c6abd7d 100644 --- a/Source/Core/VideoBackends/D3D12/TextureCache.cpp +++ b/Source/Core/VideoBackends/D3D12/TextureCache.cpp @@ -229,9 +229,9 @@ TextureCacheBase::TCacheEntryBase* TextureCache::CreateTexture(const TCacheEntry } } -void TextureCache::TCacheEntry::FromRenderTarget(u8* dst, bool is_depth_copy, - const EFBRectangle& srcRect, bool scale_by_half, - unsigned int cbuf_id, const float* colmat) +void TextureCache::TCacheEntry::FromRenderTarget(bool is_depth_copy, const EFBRectangle& srcRect, + bool scale_by_half, unsigned int cbuf_id, + const float* colmat) { // When copying at half size, in multisampled mode, resolve the color/depth buffer first. // This is because multisampled texture reads go through Load, not Sample, and the linear diff --git a/Source/Core/VideoBackends/D3D12/TextureCache.h b/Source/Core/VideoBackends/D3D12/TextureCache.h index 45453019c3..87c3107960 100644 --- a/Source/Core/VideoBackends/D3D12/TextureCache.h +++ b/Source/Core/VideoBackends/D3D12/TextureCache.h @@ -41,8 +41,8 @@ private: void Load(const u8* buffer, u32 width, u32 height, u32 expanded_width, u32 levels) override; - void FromRenderTarget(u8* dst, bool is_depth_copy, const EFBRectangle& src_rect, - bool scale_by_half, unsigned int cbuf_id, const float* colmat) override; + void FromRenderTarget(bool is_depth_copy, const EFBRectangle& src_rect, bool scale_by_half, + unsigned int cbuf_id, const float* colmat) override; void Bind(unsigned int stage) override; bool Save(const std::string& filename, unsigned int level) override; diff --git a/Source/Core/VideoBackends/Null/TextureCache.h b/Source/Core/VideoBackends/Null/TextureCache.h index cf6d60846e..ff21422e69 100644 --- a/Source/Core/VideoBackends/Null/TextureCache.h +++ b/Source/Core/VideoBackends/Null/TextureCache.h @@ -32,8 +32,8 @@ private: TCacheEntry(const TCacheEntryConfig& _config) : TCacheEntryBase(_config) {} ~TCacheEntry() {} void Load(const u8* buffer, u32 width, u32 height, u32 expanded_width, u32 level) override {} - void FromRenderTarget(u8* dst, bool is_depth_copy, const EFBRectangle& src_rect, - bool scale_by_half, unsigned int cbufid, const float* colmat) override + void FromRenderTarget(bool is_depth_copy, const EFBRectangle& src_rect, bool scale_by_half, + unsigned int cbufid, const float* colmat) override { } diff --git a/Source/Core/VideoBackends/OGL/TextureCache.cpp b/Source/Core/VideoBackends/OGL/TextureCache.cpp index 5d3a443509..8408a1f1b3 100644 --- a/Source/Core/VideoBackends/OGL/TextureCache.cpp +++ b/Source/Core/VideoBackends/OGL/TextureCache.cpp @@ -204,9 +204,9 @@ void TextureCache::TCacheEntry::Load(const u8* buffer, u32 width, u32 height, u3 TextureCache::SetStage(); } -void TextureCache::TCacheEntry::FromRenderTarget(u8* dstPointer, bool is_depth_copy, - const EFBRectangle& srcRect, bool scaleByHalf, - unsigned int cbufid, const float* colmat) +void TextureCache::TCacheEntry::FromRenderTarget(bool is_depth_copy, const EFBRectangle& srcRect, + bool scaleByHalf, unsigned int cbufid, + const float* colmat) { g_renderer->ResetAPIState(); // reset any game specific settings diff --git a/Source/Core/VideoBackends/OGL/TextureCache.h b/Source/Core/VideoBackends/OGL/TextureCache.h index 7eba67329c..d7b3439a43 100644 --- a/Source/Core/VideoBackends/OGL/TextureCache.h +++ b/Source/Core/VideoBackends/OGL/TextureCache.h @@ -41,8 +41,8 @@ private: void Load(const u8* buffer, u32 width, u32 height, u32 expanded_width, u32 level) override; - void FromRenderTarget(u8* dst, bool is_depth_copy, const EFBRectangle& srcRect, - bool scaleByHalf, unsigned int cbufid, const float* colmat) override; + void FromRenderTarget(bool is_depth_copy, const EFBRectangle& srcRect, bool scaleByHalf, + unsigned int cbufid, const float* colmat) override; void Bind(unsigned int stage) override; bool Save(const std::string& filename, unsigned int level) override; diff --git a/Source/Core/VideoBackends/Software/SWmain.cpp b/Source/Core/VideoBackends/Software/SWmain.cpp index 5d725d28fa..80cb3fc814 100644 --- a/Source/Core/VideoBackends/Software/SWmain.cpp +++ b/Source/Core/VideoBackends/Software/SWmain.cpp @@ -65,8 +65,8 @@ private: TCacheEntry(const TCacheEntryConfig& _config) : TCacheEntryBase(_config) {} ~TCacheEntry() {} void Load(const u8* buffer, u32 width, u32 height, u32 expanded_width, u32 level) override {} - void FromRenderTarget(u8* dst, bool is_depth_copy, const EFBRectangle& srcRect, - bool scaleByHalf, unsigned int cbufid, const float* colmat) override + void FromRenderTarget(bool is_depth_copy, const EFBRectangle& srcRect, bool scaleByHalf, + unsigned int cbufid, const float* colmat) override { EfbCopy::CopyEfb(); } diff --git a/Source/Core/VideoBackends/Vulkan/TextureCache.cpp b/Source/Core/VideoBackends/Vulkan/TextureCache.cpp index edd2d4165d..5a73106476 100644 --- a/Source/Core/VideoBackends/Vulkan/TextureCache.cpp +++ b/Source/Core/VideoBackends/Vulkan/TextureCache.cpp @@ -431,9 +431,9 @@ void TextureCache::TCacheEntry::Load(const u8* buffer, unsigned int width, unsig } } -void TextureCache::TCacheEntry::FromRenderTarget(u8* dst, bool is_depth_copy, - const EFBRectangle& src_rect, bool scale_by_half, - unsigned int cbufid, const float* colmat) +void TextureCache::TCacheEntry::FromRenderTarget(bool is_depth_copy, const EFBRectangle& src_rect, + bool scale_by_half, unsigned int cbufid, + const float* colmat) { // A better way of doing this would be nice. FramebufferManager* framebuffer_mgr = diff --git a/Source/Core/VideoBackends/Vulkan/TextureCache.h b/Source/Core/VideoBackends/Vulkan/TextureCache.h index 56fa3bb402..f014492d7b 100644 --- a/Source/Core/VideoBackends/Vulkan/TextureCache.h +++ b/Source/Core/VideoBackends/Vulkan/TextureCache.h @@ -29,8 +29,8 @@ public: VkFramebuffer GetFramebuffer() const { return m_framebuffer; } void Load(const u8* buffer, unsigned int width, unsigned int height, unsigned int expanded_width, unsigned int level) override; - void FromRenderTarget(u8* dst, bool is_depth_copy, const EFBRectangle& src_rect, - bool scale_by_half, unsigned int cbufid, const float* colmat) 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& src_rect, const MathUtil::Rectangle& dst_rect) override; diff --git a/Source/Core/VideoCommon/TextureCacheBase.cpp b/Source/Core/VideoCommon/TextureCacheBase.cpp index 4d63e52a0a..b70cfd8391 100644 --- a/Source/Core/VideoCommon/TextureCacheBase.cpp +++ b/Source/Core/VideoCommon/TextureCacheBase.cpp @@ -1320,7 +1320,7 @@ void TextureCacheBase::CopyRenderTargetToTexture(u32 dstAddr, unsigned int dstFo entry->SetEfbCopy(dstStride); entry->is_custom_tex = false; - entry->FromRenderTarget(dst, is_depth_copy, srcRect, scaleByHalf, cbufid, colmat); + entry->FromRenderTarget(is_depth_copy, srcRect, scaleByHalf, cbufid, colmat); u64 hash = entry->CalculateHash(); entry->SetHashes(hash, hash); diff --git a/Source/Core/VideoCommon/TextureCacheBase.h b/Source/Core/VideoCommon/TextureCacheBase.h index c635689692..0d101ea616 100644 --- a/Source/Core/VideoCommon/TextureCacheBase.h +++ b/Source/Core/VideoCommon/TextureCacheBase.h @@ -128,8 +128,8 @@ public: const MathUtil::Rectangle& dstrect) = 0; virtual void Load(const u8* buffer, u32 width, u32 height, u32 expanded_width, u32 level) = 0; - virtual void FromRenderTarget(u8* dst, bool is_depth_copy, const EFBRectangle& srcRect, - bool scaleByHalf, unsigned int cbufid, const float* colmat) = 0; + virtual void FromRenderTarget(bool is_depth_copy, const EFBRectangle& srcRect, bool scaleByHalf, + unsigned int cbufid, const float* colmat) = 0; bool OverlapsMemoryRange(u32 range_address, u32 range_size) const;