From 34692ab826abc8f8faa61bdb2280b742424528f1 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sat, 7 Dec 2013 15:14:29 -0500 Subject: Remove unnecessary Src/ folders --- .../Core/VideoBackends/Software/SWVideoConfig.cpp | 84 ++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 Source/Core/VideoBackends/Software/SWVideoConfig.cpp (limited to 'Source/Core/VideoBackends/Software/SWVideoConfig.cpp') diff --git a/Source/Core/VideoBackends/Software/SWVideoConfig.cpp b/Source/Core/VideoBackends/Software/SWVideoConfig.cpp new file mode 100644 index 0000000000..eb7cb79d40 --- /dev/null +++ b/Source/Core/VideoBackends/Software/SWVideoConfig.cpp @@ -0,0 +1,84 @@ +// Copyright 2013 Dolphin Emulator Project +// Licensed under GPLv2 +// Refer to the license.txt file included. + +#include "FileUtil.h" +#include "IniFile.h" +#include "SWVideoConfig.h" + +SWVideoConfig g_SWVideoConfig; + +SWVideoConfig::SWVideoConfig() +{ + bFullscreen = false; + bHideCursor = false; + renderToMainframe = false; + + bHwRasterizer = false; + + bShowStats = false; + + bDumpTextures = false; + bDumpObjects = false; + bDumpFrames = false; + + bZComploc = true; + bZFreeze = true; + + bDumpTevStages = false; + bDumpTevTextureFetches = false; + + drawStart = 0; + drawEnd = 100000; +} + +void SWVideoConfig::Load(const char* ini_file) +{ + IniFile iniFile; + iniFile.Load(ini_file); + + iniFile.Get("Hardware", "Fullscreen", &bFullscreen, 0); // Hardware + iniFile.Get("Hardware", "RenderToMainframe", &renderToMainframe, false); + + iniFile.Get("Rendering", "HwRasterizer", &bHwRasterizer, false); + iniFile.Get("Rendering", "ZComploc", &bZComploc, true); + iniFile.Get("Rendering", "ZFreeze", &bZFreeze, true); + + iniFile.Get("Info", "ShowStats", &bShowStats, false); + + iniFile.Get("Utility", "DumpTexture", &bDumpTextures, false); + iniFile.Get("Utility", "DumpObjects", &bDumpObjects, false); + iniFile.Get("Utility", "DumpFrames", &bDumpFrames, false); + iniFile.Get("Utility", "DumpTevStages", &bDumpTevStages, false); + iniFile.Get("Utility", "DumpTevTexFetches", &bDumpTevTextureFetches, false); + + iniFile.Get("Misc", "DrawStart", &drawStart, 0); + iniFile.Get("Misc", "DrawEnd", &drawEnd, 100000); +} + +void SWVideoConfig::Save(const char* ini_file) +{ + IniFile iniFile; + iniFile.Load(ini_file); + + iniFile.Set("Hardware", "Fullscreen", bFullscreen); + iniFile.Set("Hardware", "RenderToMainframe", renderToMainframe); + + iniFile.Set("Rendering", "HwRasterizer", bHwRasterizer); + iniFile.Set("Rendering", "ZComploc", bZComploc); + iniFile.Set("Rendering", "ZFreeze", bZFreeze); + + iniFile.Set("Info", "ShowStats", bShowStats); + + iniFile.Set("Utility", "DumpTexture", bDumpTextures); + iniFile.Set("Utility", "DumpObjects", bDumpObjects); + iniFile.Set("Utility", "DumpFrames", bDumpFrames); + iniFile.Set("Utility", "DumpTevStages", bDumpTevStages); + iniFile.Set("Utility", "DumpTevTexFetches", bDumpTevTextureFetches); + + iniFile.Set("Misc", "DrawStart", drawStart); + iniFile.Set("Misc", "DrawEnd", drawEnd); + + iniFile.Save(ini_file); +} + -- cgit v1.2.3 From 2afe2152712981e21d6bda6f029292ed2b1cf91e Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 17 Feb 2014 05:18:15 -0500 Subject: Convert all includes to relative paths. --- Source/Core/VideoBackends/Software/SWVideoConfig.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Source/Core/VideoBackends/Software/SWVideoConfig.cpp') diff --git a/Source/Core/VideoBackends/Software/SWVideoConfig.cpp b/Source/Core/VideoBackends/Software/SWVideoConfig.cpp index 36f91265cb..091eab35fa 100644 --- a/Source/Core/VideoBackends/Software/SWVideoConfig.cpp +++ b/Source/Core/VideoBackends/Software/SWVideoConfig.cpp @@ -2,9 +2,9 @@ // Licensed under GPLv2 // Refer to the license.txt file included. -#include "FileUtil.h" -#include "IniFile.h" -#include "SWVideoConfig.h" +#include "Common/FileUtil.h" +#include "Common/IniFile.h" +#include "VideoBackends/Software/SWVideoConfig.h" SWVideoConfig g_SWVideoConfig; -- cgit v1.2.3 From f05d3f6e5d6da8be530c0cd4ffaaec0382240ec5 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 16 Jun 2014 01:12:43 -0400 Subject: Use only section-based ini reading. --- .../Core/VideoBackends/Software/SWVideoConfig.cpp | 82 ++++++++++++---------- 1 file changed, 46 insertions(+), 36 deletions(-) (limited to 'Source/Core/VideoBackends/Software/SWVideoConfig.cpp') diff --git a/Source/Core/VideoBackends/Software/SWVideoConfig.cpp b/Source/Core/VideoBackends/Software/SWVideoConfig.cpp index 091eab35fa..0e4338eb84 100644 --- a/Source/Core/VideoBackends/Software/SWVideoConfig.cpp +++ b/Source/Core/VideoBackends/Software/SWVideoConfig.cpp @@ -38,24 +38,29 @@ void SWVideoConfig::Load(const char* ini_file) IniFile iniFile; iniFile.Load(ini_file); - iniFile.Get("Hardware", "Fullscreen", &bFullscreen, 0); // Hardware - iniFile.Get("Hardware", "RenderToMainframe", &renderToMainframe, false); - - iniFile.Get("Rendering", "HwRasterizer", &bHwRasterizer, false); - iniFile.Get("Rendering", "BypassXFB", &bBypassXFB, false); - iniFile.Get("Rendering", "ZComploc", &bZComploc, true); - iniFile.Get("Rendering", "ZFreeze", &bZFreeze, true); - - iniFile.Get("Info", "ShowStats", &bShowStats, false); - - iniFile.Get("Utility", "DumpTexture", &bDumpTextures, false); - iniFile.Get("Utility", "DumpObjects", &bDumpObjects, false); - iniFile.Get("Utility", "DumpFrames", &bDumpFrames, false); - iniFile.Get("Utility", "DumpTevStages", &bDumpTevStages, false); - iniFile.Get("Utility", "DumpTevTexFetches", &bDumpTevTextureFetches, false); - - iniFile.Get("Misc", "DrawStart", &drawStart, 0); - iniFile.Get("Misc", "DrawEnd", &drawEnd, 100000); + IniFile::Section* hardware = iniFile.GetOrCreateSection("Hardware"); + hardware->Get("Fullscreen", &bFullscreen, 0); // Hardware + hardware->Get("RenderToMainframe", &renderToMainframe, false); + + IniFile::Section* rendering = iniFile.GetOrCreateSection("Rendering"); + rendering->Get("HwRasterizer", &bHwRasterizer, false); + rendering->Get("BypassXFB", &bBypassXFB, false); + rendering->Get("ZComploc", &bZComploc, true); + rendering->Get("ZFreeze", &bZFreeze, true); + + IniFile::Section* info = iniFile.GetOrCreateSection("Info"); + info->Get("ShowStats", &bShowStats, false); + + 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); + + IniFile::Section* misc = iniFile.GetOrCreateSection("Misc"); + misc->Get("DrawStart", &drawStart, 0); + misc->Get("DrawEnd", &drawEnd, 100000); } void SWVideoConfig::Save(const char* ini_file) @@ -63,24 +68,29 @@ void SWVideoConfig::Save(const char* ini_file) IniFile iniFile; iniFile.Load(ini_file); - iniFile.Set("Hardware", "Fullscreen", bFullscreen); - iniFile.Set("Hardware", "RenderToMainframe", renderToMainframe); - - iniFile.Set("Rendering", "HwRasterizer", bHwRasterizer); - iniFile.Set("Rendering", "BypassXFB", bBypassXFB); - iniFile.Set("Rendering", "ZComploc", bZComploc); - iniFile.Set("Rendering", "ZFreeze", bZFreeze); - - iniFile.Set("Info", "ShowStats", bShowStats); - - iniFile.Set("Utility", "DumpTexture", bDumpTextures); - iniFile.Set("Utility", "DumpObjects", bDumpObjects); - iniFile.Set("Utility", "DumpFrames", bDumpFrames); - iniFile.Set("Utility", "DumpTevStages", bDumpTevStages); - iniFile.Set("Utility", "DumpTevTexFetches", bDumpTevTextureFetches); - - iniFile.Set("Misc", "DrawStart", drawStart); - iniFile.Set("Misc", "DrawEnd", drawEnd); + IniFile::Section* hardware = iniFile.GetOrCreateSection("Hardware"); + hardware->Set("Fullscreen", bFullscreen); + hardware->Set("RenderToMainframe", renderToMainframe); + + IniFile::Section* rendering = iniFile.GetOrCreateSection("Rendering"); + rendering->Set("HwRasterizer", bHwRasterizer); + rendering->Set("BypassXFB", bBypassXFB); + rendering->Set("ZComploc", bZComploc); + rendering->Set("ZFreeze", bZFreeze); + + IniFile::Section* info = iniFile.GetOrCreateSection("Info"); + info->Set("ShowStats", bShowStats); + + 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); + + IniFile::Section* misc = iniFile.GetOrCreateSection("Misc"); + misc->Set("DrawStart", drawStart); + misc->Set("DrawEnd", drawEnd); iniFile.Save(ini_file); } -- cgit v1.2.3 From cd0c784d5a9b046e30fe4a334a26b234e7f8bcd8 Mon Sep 17 00:00:00 2001 From: Fog Date: Sat, 11 Oct 2014 23:33:09 -0400 Subject: Changed Dump Frames References --- Source/Core/VideoBackends/Software/SWVideoConfig.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'Source/Core/VideoBackends/Software/SWVideoConfig.cpp') 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); -- cgit v1.2.3 From 8d424b114ae98243744a118e44d38e0a40645682 Mon Sep 17 00:00:00 2001 From: Fog Date: Sun, 12 Oct 2014 23:53:10 -0400 Subject: Move bDumpFrames to SConfig (and it's references) --- Source/Core/VideoBackends/Software/SWVideoConfig.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'Source/Core/VideoBackends/Software/SWVideoConfig.cpp') diff --git a/Source/Core/VideoBackends/Software/SWVideoConfig.cpp b/Source/Core/VideoBackends/Software/SWVideoConfig.cpp index 408cef6a2e..d283ccdb95 100644 --- a/Source/Core/VideoBackends/Software/SWVideoConfig.cpp +++ b/Source/Core/VideoBackends/Software/SWVideoConfig.cpp @@ -21,7 +21,6 @@ SWVideoConfig::SWVideoConfig() bDumpTextures = false; bDumpObjects = false; - bDumpFrames = false; bZComploc = true; bZFreeze = true; -- cgit v1.2.3 From cefcb0ace9d363b3679b4e93bcc9ec05f1e5f4f8 Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Mon, 18 May 2015 01:08:10 +0200 Subject: Update license headers to GPLv2+ --- Source/Core/VideoBackends/Software/SWVideoConfig.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/VideoBackends/Software/SWVideoConfig.cpp') diff --git a/Source/Core/VideoBackends/Software/SWVideoConfig.cpp b/Source/Core/VideoBackends/Software/SWVideoConfig.cpp index d283ccdb95..65b91d181d 100644 --- a/Source/Core/VideoBackends/Software/SWVideoConfig.cpp +++ b/Source/Core/VideoBackends/Software/SWVideoConfig.cpp @@ -1,5 +1,5 @@ // Copyright 2013 Dolphin Emulator Project -// Licensed under GPLv2 +// Licensed under GPLv2+ // Refer to the license.txt file included. #include "Common/FileUtil.h" -- cgit v1.2.3 From 30ebb2459eb97ba544547183854775df8460b475 Mon Sep 17 00:00:00 2001 From: Tillmann Karras Date: Sun, 24 May 2015 06:55:12 +0200 Subject: Set copyright year to when a file was created --- Source/Core/VideoBackends/Software/SWVideoConfig.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/VideoBackends/Software/SWVideoConfig.cpp') diff --git a/Source/Core/VideoBackends/Software/SWVideoConfig.cpp b/Source/Core/VideoBackends/Software/SWVideoConfig.cpp index 65b91d181d..0d5fd12489 100644 --- a/Source/Core/VideoBackends/Software/SWVideoConfig.cpp +++ b/Source/Core/VideoBackends/Software/SWVideoConfig.cpp @@ -1,4 +1,4 @@ -// Copyright 2013 Dolphin Emulator Project +// Copyright 2009 Dolphin Emulator Project // Licensed under GPLv2+ // Refer to the license.txt file included. -- cgit v1.2.3