diff options
| author | skidau <skidau@gmail.com> | 2014-10-05 12:14:04 +1100 |
|---|---|---|
| committer | skidau <skidau@gmail.com> | 2014-10-05 12:14:04 +1100 |
| commit | 871d308b88235c115e49267ca79e4f1d48fba0f7 (patch) | |
| tree | 71073098f0902886bbe5271a9d725567de41f3f9 /Source/Core/VideoCommon/FramebufferManagerBase.cpp | |
| parent | 47bf698b70668f72f8495da209ffe68091d89bcf (diff) | |
| parent | 7f6284c2fcea9d543b0eec44ea0f3ad36bd0c0aa (diff) | |
Merge pull request #1206 from comex/amperspocalypse
Change a bunch of reference function arguments to pointers.
Diffstat (limited to 'Source/Core/VideoCommon/FramebufferManagerBase.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/FramebufferManagerBase.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/Source/Core/VideoCommon/FramebufferManagerBase.cpp b/Source/Core/VideoCommon/FramebufferManagerBase.cpp index 16e96e3892..ea865cd275 100644 --- a/Source/Core/VideoCommon/FramebufferManagerBase.cpp +++ b/Source/Core/VideoCommon/FramebufferManagerBase.cpp @@ -31,20 +31,20 @@ FramebufferManagerBase::~FramebufferManagerBase() delete m_realXFBSource; } -const XFBSourceBase* const* FramebufferManagerBase::GetXFBSource(u32 xfbAddr, u32 fbWidth, u32 fbHeight, u32 &xfbCount) +const XFBSourceBase* const* FramebufferManagerBase::GetXFBSource(u32 xfbAddr, u32 fbWidth, u32 fbHeight, u32* xfbCountP) { if (!g_ActiveConfig.bUseXFB) return nullptr; if (g_ActiveConfig.bUseRealXFB) - return GetRealXFBSource(xfbAddr, fbWidth, fbHeight, xfbCount); + return GetRealXFBSource(xfbAddr, fbWidth, fbHeight, xfbCountP); else - return GetVirtualXFBSource(xfbAddr, fbWidth, fbHeight, xfbCount); + return GetVirtualXFBSource(xfbAddr, fbWidth, fbHeight, xfbCountP); } -const XFBSourceBase* const* FramebufferManagerBase::GetRealXFBSource(u32 xfbAddr, u32 fbWidth, u32 fbHeight, u32 &xfbCount) +const XFBSourceBase* const* FramebufferManagerBase::GetRealXFBSource(u32 xfbAddr, u32 fbWidth, u32 fbHeight, u32* xfbCountP) { - xfbCount = 1; + *xfbCountP = 1; // recreate if needed if (m_realXFBSource && (m_realXFBSource->texWidth != fbWidth || m_realXFBSource->texHeight != fbHeight)) @@ -79,9 +79,9 @@ const XFBSourceBase* const* FramebufferManagerBase::GetRealXFBSource(u32 xfbAddr return &m_overlappingXFBArray[0]; } -const XFBSourceBase* const* FramebufferManagerBase::GetVirtualXFBSource(u32 xfbAddr, u32 fbWidth, u32 fbHeight, u32 &xfbCount) +const XFBSourceBase* const* FramebufferManagerBase::GetVirtualXFBSource(u32 xfbAddr, u32 fbWidth, u32 fbHeight, u32* xfbCountP) { - xfbCount = 0; + u32 xfbCount = 0; if (m_virtualXFBList.empty()) // no Virtual XFBs available return nullptr; @@ -106,6 +106,7 @@ const XFBSourceBase* const* FramebufferManagerBase::GetVirtualXFBSource(u32 xfbA } } + *xfbCountP = xfbCount; return &m_overlappingXFBArray[0]; } |