ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Config: Port PerfMapDir setting to new config system.

This commit is contained in:
Admiral H. Curtiss 2022-01-05 23:56:15 +01:00
parent fb47035f97
commit 68688e7903
No known key found for this signature in database
GPG Key ID: F051B4C4044F33FB
4 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/Core/ConfigLoaders/IsSettingSaveable.cpp
View File

@ -98,6 +98,7 @@ bool IsSettingSaveable(const Config::Location& config_location)
&Config::GetInfoForSimulateKonga(2).GetLocation(), &Config::GetInfoForSimulateKonga(2).GetLocation(),
&Config::GetInfoForSimulateKonga(3).GetLocation(), &Config::GetInfoForSimulateKonga(3).GetLocation(),
&Config::MAIN_EMULATION_SPEED.GetLocation(), &Config::MAIN_EMULATION_SPEED.GetLocation(),
&Config::MAIN_PERF_MAP_DIR.GetLocation(),
// UI.General // UI.General

2
Source/Core/Core/ConfigManager.cpp
View File

@ -121,7 +121,6 @@ void SConfig::SaveCoreSettings(IniFile& ini)
core->Set("WiimoteControllerInterface", connect_wiimotes_for_ciface); core->Set("WiimoteControllerInterface", connect_wiimotes_for_ciface);
core->Set("MMU", bMMU); core->Set("MMU", bMMU);
core->Set("GPUDeterminismMode", m_strGPUDeterminismMode); core->Set("GPUDeterminismMode", m_strGPUDeterminismMode);
core->Set("PerfMapDir", m_perfDir);
} }
void SConfig::LoadSettings() void SConfig::LoadSettings()
@ -165,7 +164,6 @@ void SConfig::LoadCoreSettings(IniFile& ini)
core->Get("FastDiscSpeed", &bFastDiscSpeed, false); core->Get("FastDiscSpeed", &bFastDiscSpeed, false);
core->Get("DisableICache", &bDisableICache, false); core->Get("DisableICache", &bDisableICache, false);
core->Get("GPUDeterminismMode", &m_strGPUDeterminismMode, "auto"); core->Get("GPUDeterminismMode", &m_strGPUDeterminismMode, "auto");
core->Get("PerfMapDir", &m_perfDir, "");
} }
void SConfig::ResetRunningGameMetadata() void SConfig::ResetRunningGameMetadata()

2
Source/Core/Core/ConfigManager.h
View File

@ -103,8 +103,6 @@ struct SConfig
std::string m_strBootROM; std::string m_strBootROM;
std::string m_strSRAM; std::string m_strSRAM;
std::string m_perfDir;
std::string m_debugger_game_id; std::string m_debugger_game_id;
// TODO: remove this as soon as the ticket view hack in IOS/ES/Views is dropped. // TODO: remove this as soon as the ticket view hack in IOS/ES/Views is dropped.
bool m_disc_booted_from_game_list = false; bool m_disc_booted_from_game_list = false;

4
Source/Core/Core/PowerPC/JitCommon/JitCache.cpp
View File

@ -13,7 +13,7 @@
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/JitRegister.h" #include "Common/JitRegister.h"
#include "Core/ConfigManager.h" #include "Core/Config/MainSettings.h"
#include "Core/Core.h" #include "Core/Core.h"
#include "Core/PowerPC/JitCommon/JitBase.h" #include "Core/PowerPC/JitCommon/JitBase.h"
#include "Core/PowerPC/MMU.h" #include "Core/PowerPC/MMU.h"
@ -40,7 +40,7 @@ JitBaseBlockCache::~JitBaseBlockCache() = default;
void JitBaseBlockCache::Init() void JitBaseBlockCache::Init()
{ {
JitRegister::Init(SConfig::GetInstance().m_perfDir); JitRegister::Init(Config::Get(Config::MAIN_PERF_MAP_DIR));
Clear(); Clear();
} }