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/Software/SWmain.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/Software/SWmain.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/Software/SWmain.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/Core/VideoBackends/Software/SWmain.cpp b/Source/Core/VideoBackends/Software/SWmain.cpp index 80cb3fc814..adbe5046b6 100644 --- a/Source/Core/VideoBackends/Software/SWmain.cpp +++ b/Source/Core/VideoBackends/Software/SWmain.cpp @@ -4,6 +4,7 @@ #include <memory> #include <string> +#include <utility> #include "Common/CommonTypes.h" @@ -101,7 +102,8 @@ class FramebufferManager : public FramebufferManagerBase { return std::make_unique<XFBSource>(); } - void GetTargetSize(unsigned int* width, unsigned int* height) override{}; + + std::pair<u32, u32> GetTargetSize() const override { return std::make_pair(0, 0); } void CopyToRealXFB(u32 xfbAddr, u32 fbStride, u32 fbHeight, const EFBRectangle& sourceRc, float Gamma = 1.0f) override { |