summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/android/app/src/main/jni/config.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/android/app/src/main/jni/config.cpp b/src/android/app/src/main/jni/config.cpp
index 43e8aa72a..2a06ca024 100644
--- a/src/android/app/src/main/jni/config.cpp
+++ b/src/android/app/src/main/jni/config.cpp
@@ -150,15 +150,17 @@ void Config::ReadValues() {
if (rng_seed_enabled) {
Settings::values.rng_seed.SetValue(config->GetInteger("System", "rng_seed", 0));
} else {
- Settings::values.rng_seed.SetValue(std::nullopt);
+ Settings::values.rng_seed.SetValue(0);
}
+ Settings::values.rng_seed_enabled.SetValue(rng_seed_enabled);
const auto custom_rtc_enabled = config->GetBoolean("System", "custom_rtc_enabled", false);
if (custom_rtc_enabled) {
Settings::values.custom_rtc = config->GetInteger("System", "custom_rtc", 0);
} else {
- Settings::values.custom_rtc = std::nullopt;
+ Settings::values.custom_rtc = 0;
}
+ Settings::values.custom_rtc_enabled = custom_rtc_enabled;
ReadSetting("System", Settings::values.language_index);
ReadSetting("System", Settings::values.region_index);
@@ -226,10 +228,10 @@ void Config::ReadValues() {
"Renderer", "gpu_accuracy", static_cast<u32>(Settings::GPUAccuracy::Normal)));
// Use GPU default anisotropic filtering on Android
- Settings::values.max_anisotropy = config->GetInteger("Renderer", "max_anisotropy", 1);
+ Settings::values.max_anisotropy = static_cast<Settings::AnisotropyMode>(config->GetInteger("Renderer", "max_anisotropy", 1));
// Disable ASTC compute by default on Android
- Settings::values.accelerate_astc = config->GetBoolean("Renderer", "accelerate_astc", false);
+ Settings::values.accelerate_astc.SetValue(config->GetBoolean("Renderer", "accelerate_astc", false) ? Settings::AstcDecodeMode::GPU : Settings::AstcDecodeMode::CPU);
// Enable asynchronous presentation by default on Android
Settings::values.async_presentation =