From 09e19f9f1ee2e965a581e70b30cbc357f4b5ad21 Mon Sep 17 00:00:00 2001 From: archshift Date: Mon, 27 Oct 2014 18:56:08 -0700 Subject: Added `gpu_refresh_rate` config setting for the new interpreter speed hack. --- src/citra/config.cpp | 1 + src/citra/default_ini.h | 3 ++- src/citra_qt/config.cpp | 2 ++ src/core/hw/gpu.cpp | 11 +---------- src/core/settings.h | 1 + 5 files changed, 7 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/citra/config.cpp b/src/citra/config.cpp index 3e5e986c..c5ce8a16 100644 --- a/src/citra/config.cpp +++ b/src/citra/config.cpp @@ -58,6 +58,7 @@ void Config::ReadControls() { 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() { diff --git a/src/citra/default_ini.h b/src/citra/default_ini.h index 4a016d48..7352c70c 100644 --- a/src/citra/default_ini.h +++ b/src/citra/default_ini.h @@ -27,7 +27,8 @@ pad_sleft = pad_sright = [Core] -cpu_core = ## 0: Interpreter (default), 1: DynCom Interpreter +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 ded44ea8..63d39643 100644 --- a/src/citra_qt/config.cpp +++ b/src/citra_qt/config.cpp @@ -68,12 +68,14 @@ void Config::SaveControls() { 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(); } diff --git a/src/core/hw/gpu.cpp b/src/core/hw/gpu.cpp index 94768b10..76dbe3fd 100644 --- a/src/core/hw/gpu.cpp +++ b/src/core/hw/gpu.cpp @@ -218,16 +218,7 @@ void Update() { /// Initialize hardware void Init() { - switch (Settings::values.cpu_core) { - case Core::CPU_FastInterpreter: - kFrameCycles = 268123480 / 2048; - break; - case Core::CPU_Interpreter: - default: - kFrameCycles = 268123480 / 60; - break; - } - + kFrameCycles = 268123480 / Settings::values.gpu_refresh_rate; kFrameTicks = kFrameCycles / 3; g_cur_line = 0; diff --git a/src/core/settings.h b/src/core/settings.h index 3e478188..6a6265e1 100644 --- a/src/core/settings.h +++ b/src/core/settings.h @@ -28,6 +28,7 @@ struct Values { // Core int cpu_core; + int gpu_refresh_rate; // Data Storage bool use_virtual_sd; -- cgit v1.2.3