diff options
author | bunnei <bunneidev@gmail.com> | 2014-10-28 03:51:10 +0100 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2014-10-28 03:51:10 +0100 |
commit | 48f80bb79efc3b27f8ff965c43aafeffff99e0e1 (patch) | |
tree | 3d08f714f3392ba6aadb0641bac420d8f24c29dc /src/citra | |
parent | Merge pull request #141 from archshift/crash-hunt (diff) | |
parent | Added `gpu_refresh_rate` config setting for the new interpreter speed hack. (diff) | |
download | yuzu-48f80bb79efc3b27f8ff965c43aafeffff99e0e1.tar yuzu-48f80bb79efc3b27f8ff965c43aafeffff99e0e1.tar.gz yuzu-48f80bb79efc3b27f8ff965c43aafeffff99e0e1.tar.bz2 yuzu-48f80bb79efc3b27f8ff965c43aafeffff99e0e1.tar.lz yuzu-48f80bb79efc3b27f8ff965c43aafeffff99e0e1.tar.xz yuzu-48f80bb79efc3b27f8ff965c43aafeffff99e0e1.tar.zst yuzu-48f80bb79efc3b27f8ff965c43aafeffff99e0e1.zip |
Diffstat (limited to '')
-rw-r--r-- | src/citra/config.cpp | 7 | ||||
-rw-r--r-- | src/citra/config.h | 1 | ||||
-rw-r--r-- | src/citra/default_ini.h | 4 | ||||
-rw-r--r-- | src/citra_qt/config.cpp | 17 | ||||
-rw-r--r-- | src/citra_qt/config.h | 3 |
5 files changed, 31 insertions, 1 deletions
diff --git a/src/citra/config.cpp b/src/citra/config.cpp index 03a0ce606..c5ce8a164 100644 --- a/src/citra/config.cpp +++ b/src/citra/config.cpp @@ -7,6 +7,7 @@ #include "citra/default_ini.h" #include "common/file_util.h" #include "core/settings.h" +#include "core/core.h" #include "config.h" @@ -55,6 +56,11 @@ void Config::ReadControls() { Settings::values.pad_sright_key = glfw_config->GetInteger("Controls", "pad_sright", GLFW_KEY_RIGHT); } +void Config::ReadCore() { + Settings::values.cpu_core = glfw_config->GetInteger("Core", "cpu_core", Core::CPU_Interpreter); + Settings::values.gpu_refresh_rate = glfw_config->GetInteger("Core", "gpu_refresh_rate", 60); +} + void Config::ReadData() { Settings::values.use_virtual_sd = glfw_config->GetBoolean("Data Storage", "use_virtual_sd", true); } @@ -62,6 +68,7 @@ void Config::ReadData() { void Config::Reload() { LoadINI(glfw_config, glfw_config_loc.c_str(), DefaultINI::glfw_config_file); ReadControls(); + ReadCore(); ReadData(); } diff --git a/src/citra/config.h b/src/citra/config.h index c4fac2459..4f6551876 100644 --- a/src/citra/config.h +++ b/src/citra/config.h @@ -16,6 +16,7 @@ class Config { bool LoadINI(INIReader* config, const char* location, const std::string& default_contents="", bool retry=true); void ReadControls(); + void ReadCore(); void ReadData(); public: Config(); diff --git a/src/citra/default_ini.h b/src/citra/default_ini.h index e7e45f4a9..7352c70c2 100644 --- a/src/citra/default_ini.h +++ b/src/citra/default_ini.h @@ -26,6 +26,10 @@ pad_sdown = pad_sleft = pad_sright = +[Core] +cpu_core = ## 0: Interpreter (default), 1: FastInterpreter (experimental) +gpu_refresh_rate = ## 60 (default), 1024 or 2048 may work better on the FastInterpreter + [Data Storage] use_virtual_sd = )"; diff --git a/src/citra_qt/config.cpp b/src/citra_qt/config.cpp index 0c4f75a96..63d396439 100644 --- a/src/citra_qt/config.cpp +++ b/src/citra_qt/config.cpp @@ -6,6 +6,7 @@ #include <QStringList> #include "core/settings.h" +#include "core/core.h" #include "common/file_util.h" #include "config.h" @@ -64,6 +65,20 @@ void Config::SaveControls() { qt_config->endGroup(); } +void Config::ReadCore() { + qt_config->beginGroup("Core"); + Settings::values.cpu_core = qt_config->value("cpu_core", Core::CPU_Interpreter).toInt(); + Settings::values.gpu_refresh_rate = qt_config->value("gpu_refresh_rate", 60).toInt(); + qt_config->endGroup(); +} + +void Config::SaveCore() { + qt_config->beginGroup("Core"); + qt_config->setValue("cpu_core", Settings::values.cpu_core); + qt_config->setValue("gpu_refresh_rate", Settings::values.gpu_refresh_rate); + qt_config->endGroup(); +} + void Config::ReadData() { qt_config->beginGroup("Data Storage"); Settings::values.use_virtual_sd = qt_config->value("use_virtual_sd", true).toBool(); @@ -78,11 +93,13 @@ void Config::SaveData() { void Config::Reload() { ReadControls(); + ReadCore(); ReadData(); } void Config::Save() { SaveControls(); + SaveCore(); SaveData(); } diff --git a/src/citra_qt/config.h b/src/citra_qt/config.h index 74c9ff11d..782c26287 100644 --- a/src/citra_qt/config.h +++ b/src/citra_qt/config.h @@ -14,7 +14,8 @@ class Config { void ReadControls(); void SaveControls(); - + void ReadCore(); + void SaveCore(); void ReadData(); void SaveData(); public: |