diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2017-02-04 08:21:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-04 08:21:52 +0100 |
| commit | 72d887cb2075578fe826d8197966c1bd8d68f725 (patch) | |
| tree | 2ba31057aaf1714931cea75341668fa5ac0f39b4 /Source/Core/VideoBackends/OGL/FramebufferManager.cpp | |
| parent | ced00440593c4f93a60329fa731edb76f4d2716e (diff) | |
| parent | c85e0a2586029f1093539c68d84f7c2599d3a75e (diff) | |
Merge pull request #4816 from lioncash/pair
FramebufferManagerBase: Return a std::pair from GetTargetSize
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) |