diff options
| author | Lioncash <mathew1800@gmail.com> | 2017-02-03 12:31:20 -0500 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2017-02-03 15:27:53 -0500 |
| commit | c85e0a2586029f1093539c68d84f7c2599d3a75e (patch) | |
| tree | 7091059e46867ba61b80c03d55b8e6d8488b7e9f /Source/Core/VideoCommon/FramebufferManagerBase.cpp | |
| parent | 28357f16e2b3e767b4b2e489f5e29da4c43a6f4d (diff) | |
FramebufferManagerBase: Return a std::pair from GetTargetSize
Keeps associated data together. It also eliminates the possibility of out
parameters not being initialized properly. For example, consider the
following example:
-- some FramebufferManager implementation --
void FBMgrImpl::GetTargetSize(u32* width, u32* height) override
{
// Do nothing
}
-- somewhere else where the function is used --
u32 width, height;
framebuffer_manager_instance->GetTargetSize(&width, &height);
if (texture_width != width) <-- Uninitialized variable usage
{
...
}
It makes it much more obvious to spot any initialization issues, because
it requires something to be returned, as opposed to allowing an
implementation to just not do anything.
Diffstat (limited to 'Source/Core/VideoCommon/FramebufferManagerBase.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/FramebufferManagerBase.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/Core/VideoCommon/FramebufferManagerBase.cpp b/Source/Core/VideoCommon/FramebufferManagerBase.cpp index b9cf3eb4d6..33c8015f76 100644 --- a/Source/Core/VideoCommon/FramebufferManagerBase.cpp +++ b/Source/Core/VideoCommon/FramebufferManagerBase.cpp @@ -3,9 +3,12 @@ // Refer to the license.txt file included. #include "VideoCommon/FramebufferManagerBase.h" + #include <algorithm> #include <array> #include <memory> +#include <tuple> + #include "VideoCommon/RenderBase.h" #include "VideoCommon/VideoConfig.h" @@ -158,8 +161,8 @@ void FramebufferManagerBase::CopyToVirtualXFB(u32 xfbAddr, u32 fbStride, u32 fbH if (m_virtualXFBList.begin() != vxfb) m_virtualXFBList.splice(m_virtualXFBList.begin(), m_virtualXFBList, vxfb); - unsigned int target_width, target_height; - g_framebuffer_manager->GetTargetSize(&target_width, &target_height); + u32 target_width, target_height; + std::tie(target_width, target_height) = g_framebuffer_manager->GetTargetSize(); // recreate if needed if (vxfb->xfbSource && |
