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/VideoBackends/OGL/FramebufferManager.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/VideoBackends/OGL/FramebufferManager.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/FramebufferManager.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/Core/VideoBackends/OGL/FramebufferManager.cpp b/Source/Core/VideoBackends/OGL/FramebufferManager.cpp index ef85560875..45a4b196a0 100644 --- a/Source/Core/VideoBackends/OGL/FramebufferManager.cpp +++ b/Source/Core/VideoBackends/OGL/FramebufferManager.cpp @@ -668,10 +668,9 @@ std::unique_ptr<XFBSourceBase> FramebufferManager::CreateXFBSource(unsigned int return std::make_unique<XFBSource>(texture, layers); } -void FramebufferManager::GetTargetSize(unsigned int* width, unsigned int* height) +std::pair<u32, u32> FramebufferManager::GetTargetSize() const { - *width = m_targetWidth; - *height = m_targetHeight; + return std::make_pair(m_targetWidth, m_targetHeight); } void FramebufferManager::PokeEFB(EFBAccessType type, const EfbPokeData* points, size_t num_points) |
