From 04f319066dd13917dc652855eec3614bc79c56f7 Mon Sep 17 00:00:00 2001 From: degasus Date: Mon, 26 Dec 2016 20:54:37 +0100 Subject: TextureCache: Extract BP enum check to VideoCommon. We have TOO many video backends. --- Source/Core/VideoCommon/TextureCacheBase.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'Source/Core/VideoCommon/TextureCacheBase.h') diff --git a/Source/Core/VideoCommon/TextureCacheBase.h b/Source/Core/VideoCommon/TextureCacheBase.h index d0cea2a566..c635689692 100644 --- a/Source/Core/VideoCommon/TextureCacheBase.h +++ b/Source/Core/VideoCommon/TextureCacheBase.h @@ -128,9 +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, PEControl::PixelFormat srcFormat, - const EFBRectangle& srcRect, bool scaleByHalf, - unsigned int cbufid, const float* colmat) = 0; + virtual void FromRenderTarget(u8* dst, 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; @@ -154,8 +153,8 @@ public: virtual TCacheEntryBase* CreateTexture(const TCacheEntryConfig& config) = 0; virtual void CopyEFB(u8* dst, u32 format, u32 native_width, u32 bytes_per_row, u32 num_blocks_y, - u32 memory_stride, PEControl::PixelFormat srcFormat, - const EFBRectangle& srcRect, bool isIntensity, bool scaleByHalf) = 0; + u32 memory_stride, bool is_depth_copy, const EFBRectangle& srcRect, + bool isIntensity, bool scaleByHalf) = 0; virtual bool CompileShaders() = 0; virtual void DeleteShaders() = 0; @@ -164,8 +163,8 @@ public: void UnbindTextures(); virtual void BindTextures(); void CopyRenderTargetToTexture(u32 dstAddr, unsigned int dstFormat, u32 dstStride, - PEControl::PixelFormat srcFormat, const EFBRectangle& srcRect, - bool isIntensity, bool scaleByHalf); + bool is_depth_copy, const EFBRectangle& srcRect, bool isIntensity, + bool scaleByHalf); virtual void ConvertTexture(TCacheEntryBase* entry, TCacheEntryBase* unconverted, void* palette, TlutFormat format) = 0; -- cgit v1.2.3 From abf9bb170bf954220a50921a10f57eaa30e17779 Mon Sep 17 00:00:00 2001 From: degasus Date: Mon, 26 Dec 2016 21:33:57 +0100 Subject: TextureCache: Drop unused parameter in backend API. --- Source/Core/VideoCommon/TextureCacheBase.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/Core/VideoCommon/TextureCacheBase.h') 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; -- cgit v1.2.3