From 1a1c3560ceb9c6d1db7b460e843998d504871bb1 Mon Sep 17 00:00:00 2001 From: iwubcode Date: Mon, 2 Oct 2017 00:33:47 -0500 Subject: [PATCH] Software Backend: Rename 'copy_region' to 'CopyRegion' --- Source/Core/VideoBackends/Software/CopyRegion.h | 4 ++-- Source/Core/VideoBackends/Software/EfbInterface.cpp | 6 +++--- Source/Core/VideoBackends/Software/SWTexture.cpp | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Source/Core/VideoBackends/Software/CopyRegion.h b/Source/Core/VideoBackends/Software/CopyRegion.h index 987ec77951..fd695b8d3a 100644 --- a/Source/Core/VideoBackends/Software/CopyRegion.h +++ b/Source/Core/VideoBackends/Software/CopyRegion.h @@ -9,8 +9,8 @@ namespace SW // Modified from // http://tech-algorithm.com/articles/nearest-neighbor-image-scaling/ template -void copy_region(const T* const source, const MathUtil::Rectangle& srcrect, T* destination, - const MathUtil::Rectangle& dstrect) +void CopyRegion(const T* const source, const MathUtil::Rectangle& srcrect, T* destination, + const MathUtil::Rectangle& dstrect) { double x_ratio = srcrect.GetWidth() / static_cast(dstrect.GetWidth()); double y_ratio = srcrect.GetHeight() / static_cast(dstrect.GetHeight()); diff --git a/Source/Core/VideoBackends/Software/EfbInterface.cpp b/Source/Core/VideoBackends/Software/EfbInterface.cpp index e667a7e584..55462ce33f 100644 --- a/Source/Core/VideoBackends/Software/EfbInterface.cpp +++ b/Source/Core/VideoBackends/Software/EfbInterface.cpp @@ -556,9 +556,9 @@ void EncodeXFB(yuv422_packed* xfb_in_ram, u32 memory_stride, const EFBRectangle& } // Apply y scaling and copy to the xfb memory location - SW::copy_region(source.data(), source_rect, xfb_in_ram, - EFBRectangle{source_rect.left, source_rect.top, source_rect.right, - static_cast(static_cast(source_rect.bottom) * y_scale)}); + SW::CopyRegion(source.data(), source_rect, xfb_in_ram, + EFBRectangle{source_rect.left, source_rect.top, source_rect.right, + static_cast(static_cast(source_rect.bottom) * y_scale)}); } bool ZCompare(u16 x, u16 y, u32 z) diff --git a/Source/Core/VideoBackends/Software/SWTexture.cpp b/Source/Core/VideoBackends/Software/SWTexture.cpp index 66e76f09a5..2ca31343f4 100644 --- a/Source/Core/VideoBackends/Software/SWTexture.cpp +++ b/Source/Core/VideoBackends/Software/SWTexture.cpp @@ -44,8 +44,8 @@ void SWTexture::CopyRectangleFromTexture(const AbstractTexture* source, } else { - copy_region(reinterpret_cast(software_source_texture->GetData()), srcrect, - reinterpret_cast(GetData()), dstrect); + CopyRegion(reinterpret_cast(software_source_texture->GetData()), srcrect, + reinterpret_cast(GetData()), dstrect); } }