diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2016-05-18 20:14:55 +0200 |
|---|---|---|
| committer | Markus Wick <degasus@users.noreply.github.com> | 2016-05-18 20:14:55 +0200 |
| commit | 682af0a86a191ccde04dddeaa1d51da8c165a4fc (patch) | |
| tree | 25eebaddf516d510e0c51699c440e2114d7edebe /Source/Core/VideoBackends/Software | |
| parent | da3b03c61d971d90bc18e9b5f3f943bd906cfac4 (diff) | |
| parent | 3a452f3cc50be2e7c9e6321e8c283ace66afc5a6 (diff) | |
Merge pull request #3846 from degasus/videosw
VideoSW: Fix XFB config.
Diffstat (limited to 'Source/Core/VideoBackends/Software')
| -rw-r--r-- | Source/Core/VideoBackends/Software/EfbCopy.cpp | 3 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/Software/SWRenderer.cpp | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Source/Core/VideoBackends/Software/EfbCopy.cpp b/Source/Core/VideoBackends/Software/EfbCopy.cpp index 34032437c8..b076cb3d35 100644 --- a/Source/Core/VideoBackends/Software/EfbCopy.cpp +++ b/Source/Core/VideoBackends/Software/EfbCopy.cpp @@ -3,7 +3,6 @@ // Refer to the license.txt file included. #include "Common/CommonTypes.h" -#include "Common/GL/GLInterfaceBase.h" #include "Common/Logging/Log.h" #include "Core/HW/Memmap.h" #include "VideoBackends/Software/EfbCopy.h" @@ -25,8 +24,6 @@ namespace EfbCopy { static void CopyToXfb(u32 xfbAddr, u32 fbWidth, u32 fbHeight, const EFBRectangle& sourceRc, float Gamma) { - GLInterface->Update(); // update the render window position and the backbuffer size - INFO_LOG(VIDEO, "xfbaddr: %x, fbwidth: %i, fbheight: %i, source: (%i, %i, %i, %i), Gamma %f", xfbAddr, fbWidth, fbHeight, sourceRc.top, sourceRc.left, sourceRc.bottom, sourceRc.right, Gamma); diff --git a/Source/Core/VideoBackends/Software/SWRenderer.cpp b/Source/Core/VideoBackends/Software/SWRenderer.cpp index 312a315ec7..04f82415a0 100644 --- a/Source/Core/VideoBackends/Software/SWRenderer.cpp +++ b/Source/Core/VideoBackends/Software/SWRenderer.cpp @@ -152,6 +152,10 @@ void SWRenderer::SwapImpl(u32 xfbAddr, u32 fbWidth, u32 fbStride, u32 fbHeight, SWOGLWindow::s_instance->ShowImage(GetCurrentColorTexture(), fbWidth * 4, fbWidth, fbHeight, 1.0); UpdateActiveConfig(); + + // virtual XFB is not supported + if (g_ActiveConfig.bUseXFB) + g_ActiveConfig.bUseRealXFB = true; } u32 SWRenderer::AccessEFB(EFBAccessType type, u32 x, u32 y, u32 InputData) |