diff --git a/android/app/src/cpp/android_host_interface.cpp b/android/app/src/cpp/android_host_interface.cpp index 01cc460a9..1fb763767 100644 --- a/android/app/src/cpp/android_host_interface.cpp +++ b/android/app/src/cpp/android_host_interface.cpp @@ -175,6 +175,13 @@ void AndroidHostInterface::LoadAndConvertSettings() const std::string msaa_str = m_settings_interface.GetStringValue("GPU", "MSAA", "1"); g_settings.gpu_multisamples = std::max(StringUtil::FromChars(msaa_str).value_or(1), 1); g_settings.gpu_per_sample_shading = StringUtil::EndsWith(msaa_str, "-ssaa"); + + // turn percentage into fraction for overclock + const u32 overclock_percent = static_cast(std::max(m_settings_interface.GetIntValue("CPU", "Overclock", 100), 1)); + Settings::CPUOverclockPercentToFraction(overclock_percent, &g_settings.cpu_overclock_numerator, + &g_settings.cpu_overclock_denominator); + g_settings.cpu_overclock_enable = (overclock_percent != 100); + g_settings.UpdateOverclockActive(); } void AndroidHostInterface::UpdateInputMap() diff --git a/android/app/src/main/res/values/arrays.xml b/android/app/src/main/res/values/arrays.xml index c7b91ec45..1335cde70 100644 --- a/android/app/src/main/res/values/arrays.xml +++ b/android/app/src/main/res/values/arrays.xml @@ -339,4 +339,52 @@ 9.0 10.0 + + 25% (8MHz) + 50% (16MHz) + 75% (24MHz) + 100% (33MHz, Default) + 125% (41MHz) + 150% (49MHz) + 175% (57MHz) + 200% (66MHz) + 225% (74MHz) + 250% (82MHz) + 275% (90MHz) + 300% (99MHz) + 350% (115MHz) + 400% (132MHz) + 450% (148MHz) + 500% (165MHz) + 500% (165MHz) + 600% (198MHz) + 700% (231MHz) + 800% (264MHz) + 900% (297MHz) + 1000% (330MHz) + + + 25 + 50 + 75 + 100 + 125 + 150 + 175 + 200 + 225 + 250 + 275 + 300 + 350 + 400 + 450 + 500 + 500 + 600 + 700 + 800 + 900 + 1000 + diff --git a/android/app/src/main/res/xml/advanced_preferences.xml b/android/app/src/main/res/xml/advanced_preferences.xml index 433a6d15a..da5d699c8 100644 --- a/android/app/src/main/res/xml/advanced_preferences.xml +++ b/android/app/src/main/res/xml/advanced_preferences.xml @@ -16,6 +16,14 @@ +