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/VideoCommon/RenderBase.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/VideoCommon/RenderBase.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/RenderBase.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp index 77b57c2f48..f47288ea4e 100644 --- a/Source/Core/VideoCommon/RenderBase.cpp +++ b/Source/Core/VideoCommon/RenderBase.cpp @@ -12,11 +12,14 @@ // Next frame, that one is scanned out and the other one gets the copy. = double buffering. // --------------------------------------------------------------------------------------------- +#include "VideoCommon/RenderBase.h" + #include <cinttypes> #include <cmath> #include <memory> #include <mutex> #include <string> +#include <tuple> #include "Common/Assert.h" #include "Common/CommonTypes.h" @@ -48,7 +51,6 @@ #include "VideoCommon/ImageWrite.h" #include "VideoCommon/OnScreenDisplay.h" #include "VideoCommon/PostProcessing.h" -#include "VideoCommon/RenderBase.h" #include "VideoCommon/Statistics.h" #include "VideoCommon/TextureCacheBase.h" #include "VideoCommon/TextureDecoder.h" @@ -509,8 +511,8 @@ TargetRectangle Renderer::CalculateFrameDumpDrawRectangle() } // Grab the dimensions of the EFB textures, we scale either of these depending on the ratio. - unsigned int efb_width, efb_height; - g_framebuffer_manager->GetTargetSize(&efb_width, &efb_height); + u32 efb_width, efb_height; + std::tie(efb_width, efb_height) = g_framebuffer_manager->GetTargetSize(); float draw_width, draw_height; std::tie(draw_width, draw_height) = ScaleToDisplayAspectRatio(efb_width, efb_height); |