From 30bf5d5b07f3d9918c1d5634287125174aefb74c Mon Sep 17 00:00:00 2001 From: bunnei Date: Sun, 9 Apr 2023 19:39:38 -0700 Subject: [PATCH] android: config: Change docked mode and GPU accuracy to favor performance on Android. --- .../features/settings/ui/SettingsFragmentPresenter.kt | 4 ++-- src/android/app/src/main/jni/config.cpp | 10 +++++++--- src/android/app/src/main/jni/default_ini.h | 4 ++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt index e2b1326f8..f04b81335 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt @@ -158,7 +158,7 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView) dockedMode, R.string.use_docked_mode, R.string.use_docked_mode_description, - true, + false, ) ) add( @@ -223,7 +223,7 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView) 0, R.array.rendererAccuracyNames, R.array.rendererAccuracyValues, - 1 + 0 ) ) add( diff --git a/src/android/app/src/main/jni/config.cpp b/src/android/app/src/main/jni/config.cpp index a9e6fcdbf..d882688f1 100644 --- a/src/android/app/src/main/jni/config.cpp +++ b/src/android/app/src/main/jni/config.cpp @@ -139,12 +139,13 @@ void Config::ReadValues() { ReadSetting("Data Storage", Settings::values.gamecard_path); // System - ReadSetting("System", Settings::values.use_docked_mode); - ReadSetting("System", Settings::values.current_user); Settings::values.current_user = std::clamp(Settings::values.current_user.GetValue(), 0, Service::Account::MAX_USERS - 1); + // Disable docked mode by default on Android + Settings::values.use_docked_mode = config->GetBoolean("System", "use_docked_mode", false); + const auto rng_seed_enabled = config->GetBoolean("System", "rng_seed_enabled", false); if (rng_seed_enabled) { Settings::values.rng_seed.SetValue(config->GetInteger("System", "rng_seed", 0)); @@ -208,7 +209,6 @@ void Config::ReadValues() { ReadSetting("Renderer", Settings::values.use_speed_limit); ReadSetting("Renderer", Settings::values.speed_limit); ReadSetting("Renderer", Settings::values.use_disk_shader_cache); - ReadSetting("Renderer", Settings::values.gpu_accuracy); ReadSetting("Renderer", Settings::values.use_asynchronous_gpu_emulation); ReadSetting("Renderer", Settings::values.vsync_mode); ReadSetting("Renderer", Settings::values.shader_backend); @@ -218,6 +218,10 @@ void Config::ReadValues() { ReadSetting("Renderer", Settings::values.use_fast_gpu_time); ReadSetting("Renderer", Settings::values.use_vulkan_driver_pipeline_cache); + // Use GPU accuracy normal by default on Android + Settings::values.gpu_accuracy = static_cast(config->GetInteger( + "Renderer", "gpu_accuracy", static_cast(Settings::GPUAccuracy::Normal))); + ReadSetting("Renderer", Settings::values.bg_red); ReadSetting("Renderer", Settings::values.bg_green); ReadSetting("Renderer", Settings::values.bg_blue); diff --git a/src/android/app/src/main/jni/default_ini.h b/src/android/app/src/main/jni/default_ini.h index 25ec140de..cbbe8e9de 100644 --- a/src/android/app/src/main/jni/default_ini.h +++ b/src/android/app/src/main/jni/default_ini.h @@ -345,7 +345,7 @@ speed_limit = use_disk_shader_cache = # Which gpu accuracy level to use -# 0: Normal, 1 (default): High, 2: Extreme (Very slow) +# 0 (default): Normal, 1: High, 2: Extreme (Very slow) gpu_accuracy = # Whether to use asynchronous GPU emulation @@ -388,7 +388,7 @@ volume = [Data Storage] # Whether to create a virtual SD card. -# 1 (default): Yes, 0: No +# 1: Yes, 0 (default): No use_virtual_sd = # Whether or not to enable gamecard emulation