diff options
| author | Matthew Parlane <parlane@gmail.com> | 2013-04-25 01:41:45 +1200 |
|---|---|---|
| committer | Matthew Parlane <parlane@gmail.com> | 2013-04-25 01:41:45 +1200 |
| commit | c3dbbe011d4d9e06d6b4badc6e42e830b35fabd2 (patch) | |
| tree | bb57013c56f8e4336d3a81cb28608f663f678fe8 /Source/Core/VideoCommon/Src/FramebufferManagerBase.cpp | |
| parent | e98069b647029417abf6b26d7bd30e0c3ea77863 (diff) | |
| parent | 62ebfa0a78f2cbb8d40d2ae974ee9d404ddf6721 (diff) | |
Merge branch 'master' into wii-network
Diffstat (limited to 'Source/Core/VideoCommon/Src/FramebufferManagerBase.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/Src/FramebufferManagerBase.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Source/Core/VideoCommon/Src/FramebufferManagerBase.cpp b/Source/Core/VideoCommon/Src/FramebufferManagerBase.cpp index 335344e229..a975da624c 100644 --- a/Source/Core/VideoCommon/Src/FramebufferManagerBase.cpp +++ b/Source/Core/VideoCommon/Src/FramebufferManagerBase.cpp @@ -36,7 +36,8 @@ FramebufferManagerBase::~FramebufferManagerBase() const XFBSourceBase* const* FramebufferManagerBase::GetXFBSource(u32 xfbAddr, u32 fbWidth, u32 fbHeight, u32 &xfbCount) { - if (!g_ActiveConfig.bUseXFB) return NULL; + if (!g_ActiveConfig.bUseXFB) + return NULL; if (g_ActiveConfig.bUseRealXFB) return GetRealXFBSource(xfbAddr, fbWidth, fbHeight, xfbCount); @@ -237,7 +238,9 @@ int FramebufferManagerBase::ScaleToVirtualXfbWidth(int x, unsigned int backbuffe return x * (int)backbuffer_width / (int)FramebufferManagerBase::LastXfbWidth(); } else + { return x * (int)Renderer::GetTargetRectangle().GetWidth() / (int)FramebufferManagerBase::LastXfbWidth(); + } } int FramebufferManagerBase::ScaleToVirtualXfbHeight(int y, unsigned int backbuffer_height) @@ -251,5 +254,7 @@ int FramebufferManagerBase::ScaleToVirtualXfbHeight(int y, unsigned int backbuff return y * (int)backbuffer_height / (int)FramebufferManagerBase::LastXfbHeight(); } else + { return y * (int)Renderer::GetTargetRectangle().GetHeight() / (int)FramebufferManagerBase::LastXfbHeight(); + } } |