ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1129 from lioncash/casing 

VideoCommon: Fix function casing in FrameBufferManagerBase
This commit is contained in:
skidau 2014-09-21 15:56:17 +10:00
parent a5f4e4ad25 a6ffa55215
commit 536582b2eb
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/VideoCommon/FramebufferManagerBase.cpp
View File

@ -99,7 +99,7 @@ const XFBSourceBase* const* FramebufferManagerBase::GetVirtualXFBSource(u32 xfbA
u32 dstLower = vxfb->xfbAddr; u32 dstLower = vxfb->xfbAddr;
u32 dstUpper = vxfb->xfbAddr + 2 * vxfb->xfbWidth * vxfb->xfbHeight; 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; m_overlappingXFBArray[xfbCount] = vxfb->xfbSource;
++xfbCount; ++xfbCount;
@ -213,7 +213,7 @@ void FramebufferManagerBase::ReplaceVirtualXFB()
it->xfbHeight = 0; it->xfbHeight = 0;
it->xfbWidth = 0; it->xfbWidth = 0;
} }
else if (addrRangesOverlap(srcLower, srcUpper, dstLower, dstUpper)) else if (AddressRangesOverlap(srcLower, srcUpper, dstLower, dstUpper))
{ {
s32 upperOverlap = (srcUpper - dstLower) / lineSize; s32 upperOverlap = (srcUpper - dstLower) / lineSize;
s32 lowerOverlap = (dstUpper - srcLower) / lineSize; s32 lowerOverlap = (dstUpper - srcLower) / lineSize;

2
Source/Core/VideoCommon/FramebufferManagerBase.h
View File

@ -4,7 +4,7 @@
#include "VideoCommon/VideoCommon.h" #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)); return !((aLower >= bUpper) || (bLower >= aUpper));
} }

2
Source/Core/VideoCommon/MainBase.cpp
View File

@ -93,7 +93,7 @@ void VideoFifo_CheckSwapRequestAt(u32 xfbAddr, u32 fbWidth, u32 fbHeight)
u32 bLower = s_beginFieldArgs.xfbAddr; u32 bLower = s_beginFieldArgs.xfbAddr;
u32 bUpper = s_beginFieldArgs.xfbAddr + 2 * s_beginFieldArgs.fbStride * s_beginFieldArgs.fbHeight; 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(); VideoFifo_CheckSwapRequest();
} }
} }