From 3a452f3cc50be2e7c9e6321e8c283ace66afc5a6 Mon Sep 17 00:00:00 2001 From: degasus Date: Tue, 17 May 2016 22:57:25 +0200 Subject: [PATCH] VideoSW: Fix XFB config. --- Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp | 4 ++-- Source/Core/VideoBackends/Software/SWRenderer.cpp | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp b/Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp index 86f55d391b..71c35003e8 100644 --- a/Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp +++ b/Source/Core/DolphinWX/SoftwareVideoConfigDialog.cpp @@ -35,7 +35,7 @@ SoftwareVideoConfigDialog::SoftwareVideoConfigDialog(wxWindow* parent, const std wxDialog(parent, wxID_ANY, wxString(wxString::Format(_("Dolphin %s Graphics Configuration"), title))) { - VideoConfig& vconfig = g_ActiveConfig; + VideoConfig& vconfig = g_Config; if (File::Exists(File::GetUserPath(D_CONFIG_IDX) + "GFX.ini")) vconfig.Load(File::GetUserPath(D_CONFIG_IDX) + "GFX.ini"); @@ -139,5 +139,5 @@ SoftwareVideoConfigDialog::SoftwareVideoConfigDialog(wxWindow* parent, const std SoftwareVideoConfigDialog::~SoftwareVideoConfigDialog() { - g_ActiveConfig.Save((File::GetUserPath(D_CONFIG_IDX) + "GFX.ini").c_str()); + g_Config.Save((File::GetUserPath(D_CONFIG_IDX) + "GFX.ini").c_str()); } 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)