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

Additional cleanup/fixes from VideoCommon merge

1 files changed, 8 insertions, 6 deletions

diff --git a/Source/Core/VideoBackends/Software/TextureCache.h b/Source/Core/VideoBackends/Software/TextureCache.h
index 62f9198dcc..9ffa8fa4f4 100644
--- a/Source/Core/VideoBackends/Software/TextureCache.h
+++ b/Source/Core/VideoBackends/Software/TextureCache.h
@@ -11,16 +11,18 @@ class TextureCache : public TextureCacheBase
 {
 protected:
   void 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, const EFBCopyFilterCoefficients& filter_coefficients) override
+               u32 bytes_per_row, u32 num_blocks_y, 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) override
   {
     TextureEncoder::Encode(dst, params, native_width, bytes_per_row, num_blocks_y, memory_stride,
                            src_rect, scale_by_half, y_scale, gamma);
   }
-  void 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,
+  void CopyEFBToCacheEntry(TCacheEntry* entry, bool is_depth_copy,
+                           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) override
   {
     // TODO: If we ever want to "fake" vram textures, we would need to implement this