From cd0c784d5a9b046e30fe4a334a26b234e7f8bcd8 Mon Sep 17 00:00:00 2001 From: Fog Date: Sat, 11 Oct 2014 23:33:09 -0400 Subject: [PATCH] Changed Dump Frames References --- Source/Core/DolphinWX/FrameTools.cpp | 5 ++++- Source/Core/VideoBackends/Software/SWVideoConfig.cpp | 2 -- Source/Core/VideoCommon/VideoConfig.cpp | 2 -- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Source/Core/DolphinWX/FrameTools.cpp b/Source/Core/DolphinWX/FrameTools.cpp index dcd8300073..4cb00431c7 100644 --- a/Source/Core/DolphinWX/FrameTools.cpp +++ b/Source/Core/DolphinWX/FrameTools.cpp @@ -82,6 +82,8 @@ #include "InputCommon/ControllerInterface/ControllerInterface.h" +#include "VideoBackends/Software/SWVideoConfig.h" + #include "VideoCommon/VideoBackendBase.h" #include "VideoCommon/VideoConfig.h" @@ -727,7 +729,8 @@ void CFrame::OnTogglePauseMovie(wxCommandEvent& WXUNUSED (event)) void CFrame::OnToggleDumpFrames(wxCommandEvent& WXUNUSED(event)) { - g_ActiveConfig.bDumpFrames = !g_ActiveConfig.bDumpFrames; + g_Config.bDumpFrames = !g_Config.bDumpFrames; + g_SWVideoConfig.bDumpFrames = !g_SWVideoConfig.bDumpFrames; } void CFrame::OnToggleDumpAudio(wxCommandEvent& WXUNUSED(event)) diff --git a/Source/Core/VideoBackends/Software/SWVideoConfig.cpp b/Source/Core/VideoBackends/Software/SWVideoConfig.cpp index 0e4338eb84..408cef6a2e 100644 --- a/Source/Core/VideoBackends/Software/SWVideoConfig.cpp +++ b/Source/Core/VideoBackends/Software/SWVideoConfig.cpp @@ -54,7 +54,6 @@ void SWVideoConfig::Load(const char* ini_file) IniFile::Section* utility = iniFile.GetOrCreateSection("Utility"); utility->Get("DumpTexture", &bDumpTextures, false); utility->Get("DumpObjects", &bDumpObjects, false); - utility->Get("DumpFrames", &bDumpFrames, false); utility->Get("DumpTevStages", &bDumpTevStages, false); utility->Get("DumpTevTexFetches", &bDumpTevTextureFetches, false); @@ -84,7 +83,6 @@ void SWVideoConfig::Save(const char* ini_file) IniFile::Section* utility = iniFile.GetOrCreateSection("Utility"); utility->Set("DumpTexture", bDumpTextures); utility->Set("DumpObjects", bDumpObjects); - utility->Set("DumpFrames", bDumpFrames); utility->Set("DumpTevStages", bDumpTevStages); utility->Set("DumpTevTexFetches", bDumpTevTextureFetches); diff --git a/Source/Core/VideoCommon/VideoConfig.cpp b/Source/Core/VideoCommon/VideoConfig.cpp index 1c9c94b283..0a1333b3a0 100644 --- a/Source/Core/VideoCommon/VideoConfig.cpp +++ b/Source/Core/VideoCommon/VideoConfig.cpp @@ -65,7 +65,6 @@ void VideoConfig::Load(const std::string& ini_file) settings->Get("DumpTextures", &bDumpTextures, 0); settings->Get("HiresTextures", &bHiresTextures, 0); settings->Get("DumpEFBTarget", &bDumpEFBTarget, 0); - settings->Get("DumpFrames", &bDumpFrames, 0); settings->Get("FreeLook", &bFreeLook, 0); settings->Get("UseFFV1", &bUseFFV1, 0); settings->Get("AnaglyphStereo", &bAnaglyphStereo, false); @@ -234,7 +233,6 @@ void VideoConfig::Save(const std::string& ini_file) settings->Set("DumpTextures", bDumpTextures); settings->Set("HiresTextures", bHiresTextures); settings->Set("DumpEFBTarget", bDumpEFBTarget); - settings->Set("DumpFrames", bDumpFrames); settings->Set("FreeLook", bFreeLook); settings->Set("UseFFV1", bUseFFV1); settings->Set("AnaglyphStereo", bAnaglyphStereo);