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/D3D/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/D3D/FramebufferManager.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/D3D/FramebufferManager.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/Core/VideoBackends/D3D/FramebufferManager.cpp b/Source/Core/VideoBackends/D3D/FramebufferManager.cpp index e95b2ab70e..20e90d20f7 100644 --- a/Source/Core/VideoBackends/D3D/FramebufferManager.cpp +++ b/Source/Core/VideoBackends/D3D/FramebufferManager.cpp @@ -2,13 +2,15 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "VideoBackends/D3D/FramebufferManager.h" + #include <memory> +#include "Common/CommonTypes.h" #include "Core/HW/Memmap.h" #include "VideoBackends/D3D/D3DBase.h" #include "VideoBackends/D3D/D3DState.h" #include "VideoBackends/D3D/D3DUtil.h" -#include "VideoBackends/D3D/FramebufferManager.h" #include "VideoBackends/D3D/GeometryShaderCache.h" #include "VideoBackends/D3D/PixelShaderCache.h" #include "VideoBackends/D3D/Render.h" @@ -292,10 +294,9 @@ std::unique_ptr<XFBSourceBase> FramebufferManager::CreateXFBSource(unsigned int layers); } -void FramebufferManager::GetTargetSize(unsigned int* width, unsigned int* height) +std::pair<u32, u32> FramebufferManager::GetTargetSize() const { - *width = m_target_width; - *height = m_target_height; + return std::make_pair(m_target_width, m_target_height); } void XFBSource::DecodeToTexture(u32 xfbAddr, u32 fbWidth, u32 fbHeight) |