diff --git a/Source/Core/VideoCommon/FramebufferManagerBase.cpp b/Source/Core/VideoCommon/FramebufferManagerBase.cpp index d3dd0b92fd..16e96e3892 100644 --- a/Source/Core/VideoCommon/FramebufferManagerBase.cpp +++ b/Source/Core/VideoCommon/FramebufferManagerBase.cpp @@ -99,7 +99,7 @@ const XFBSourceBase* const* FramebufferManagerBase::GetVirtualXFBSource(u32 xfbA u32 dstLower = vxfb->xfbAddr; u32 dstUpper = vxfb->xfbAddr + 2 * vxfb->xfbWidth * vxfb->xfbHeight; - if (addrRangesOverlap(srcLower, srcUpper, dstLower, dstUpper)) + if (AddressRangesOverlap(srcLower, srcUpper, dstLower, dstUpper)) { m_overlappingXFBArray[xfbCount] = vxfb->xfbSource; ++xfbCount; @@ -213,7 +213,7 @@ void FramebufferManagerBase::ReplaceVirtualXFB() it->xfbHeight = 0; it->xfbWidth = 0; } - else if (addrRangesOverlap(srcLower, srcUpper, dstLower, dstUpper)) + else if (AddressRangesOverlap(srcLower, srcUpper, dstLower, dstUpper)) { s32 upperOverlap = (srcUpper - dstLower) / lineSize; s32 lowerOverlap = (dstUpper - srcLower) / lineSize; diff --git a/Source/Core/VideoCommon/FramebufferManagerBase.h b/Source/Core/VideoCommon/FramebufferManagerBase.h index 4cfbbcacba..d8bf0afdd5 100644 --- a/Source/Core/VideoCommon/FramebufferManagerBase.h +++ b/Source/Core/VideoCommon/FramebufferManagerBase.h @@ -4,7 +4,7 @@ #include "VideoCommon/VideoCommon.h" -inline bool addrRangesOverlap(u32 aLower, u32 aUpper, u32 bLower, u32 bUpper) +inline bool AddressRangesOverlap(u32 aLower, u32 aUpper, u32 bLower, u32 bUpper) { return !((aLower >= bUpper) || (bLower >= aUpper)); } diff --git a/Source/Core/VideoCommon/MainBase.cpp b/Source/Core/VideoCommon/MainBase.cpp index aa08c932e7..99fac60eae 100644 --- a/Source/Core/VideoCommon/MainBase.cpp +++ b/Source/Core/VideoCommon/MainBase.cpp @@ -93,7 +93,7 @@ void VideoFifo_CheckSwapRequestAt(u32 xfbAddr, u32 fbWidth, u32 fbHeight) u32 bLower = s_beginFieldArgs.xfbAddr; u32 bUpper = s_beginFieldArgs.xfbAddr + 2 * s_beginFieldArgs.fbStride * s_beginFieldArgs.fbHeight; - if (addrRangesOverlap(aLower, aUpper, bLower, bUpper)) + if (AddressRangesOverlap(aLower, aUpper, bLower, bUpper)) VideoFifo_CheckSwapRequest(); } }