Merge pull request #8000 from stenzek/more-videocommon-cleanup

Additional cleanup/fixes from VideoCommon merge

1 files changed, 10 insertions, 9 deletions

diff --git a/Source/Core/VideoCommon/TextureCacheBase.cpp b/Source/Core/VideoCommon/TextureCacheBase.cpp
index 4e0d2547f2..01d7a675eb 100644
--- a/Source/Core/VideoCommon/TextureCacheBase.cpp
+++ b/Source/Core/VideoCommon/TextureCacheBase.cpp
@@ -1527,8 +1527,9 @@ bool TextureCacheBase::NeedsCopyFilterInShader(const EFBCopyFilterCoefficients&
 
 void TextureCacheBase::CopyRenderTargetToTexture(
     u32 dstAddr, EFBCopyFormat dstFormat, u32 width, u32 height, u32 dstStride, bool is_depth_copy,
-    const EFBRectangle& srcRect, bool isIntensity, bool scaleByHalf, float y_scale, float gamma,
-    bool clamp_top, bool clamp_bottom, const CopyFilterCoefficients::Values& filter_coefficients)
+    const MathUtil::Rectangle<int>& srcRect, bool isIntensity, bool scaleByHalf, float y_scale,
+    float gamma, bool clamp_top, bool clamp_bottom,
+    const CopyFilterCoefficients::Values& filter_coefficients)
 {
   // Emulation methods:
   //
@@ -2158,10 +2159,10 @@ bool TextureCacheBase::CreateUtilityTextures()
 }
 
 void TextureCacheBase::CopyEFBToCacheEntry(TCacheEntry* entry, bool is_depth_copy,
-                                           const EFBRectangle& src_rect, bool scale_by_half,
-                                           bool linear_filter, EFBCopyFormat dst_format,
-                                           bool is_intensity, float gamma, bool clamp_top,
-                                           bool clamp_bottom,
+                                           const MathUtil::Rectangle<int>& src_rect,
+                                           bool scale_by_half, bool linear_filter,
+                                           EFBCopyFormat dst_format, bool is_intensity, float gamma,
+                                           bool clamp_top, bool clamp_bottom,
                                            const EFBCopyFilterCoefficients& filter_coefficients)
 {
   // Flush EFB pokes first, as they're expected to be included.
@@ -2229,9 +2230,9 @@ void TextureCacheBase::CopyEFBToCacheEntry(TCacheEntry* entry, bool is_depth_cop
 
 void TextureCacheBase::CopyEFB(AbstractStagingTexture* dst, const EFBCopyParams& params,
                                u32 native_width, u32 bytes_per_row, u32 num_blocks_y,
-                               u32 memory_stride, const EFBRectangle& src_rect, bool scale_by_half,
-                               bool linear_filter, float y_scale, float gamma, bool clamp_top,
-                               bool clamp_bottom,
+                               u32 memory_stride, const MathUtil::Rectangle<int>& src_rect,
+                               bool scale_by_half, bool linear_filter, float y_scale, float gamma,
+                               bool clamp_top, bool clamp_bottom,
                                const EFBCopyFilterCoefficients& filter_coefficients)
 {
   // Flush EFB pokes first, as they're expected to be included.