diff options
| author | 2023-06-12 17:56:44 -0700 | |
|---|---|---|
| committer | 2023-06-12 17:56:44 -0700 | |
| commit | f8a33f85eff5e7c7ee00a85a133e7a6619a285ab (patch) | |
| tree | dade980c503f8193ea714a30f59c1d62a1c4f731 /src | |
| parent | android: res: Remove translated strings that no longer exist. (diff) | |
| download | yuzu-f8a33f85eff5e7c7ee00a85a133e7a6619a285ab.tar.gz yuzu-f8a33f85eff5e7c7ee00a85a133e7a6619a285ab.tar.xz yuzu-f8a33f85eff5e7c7ee00a85a133e7a6619a285ab.zip | |
android: settings: Add reactive flushing as a default-disabled setting.
Diffstat (limited to 'src')
5 files changed, 24 insertions, 0 deletions
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/IntSetting.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/IntSetting.kt index c5722a5a1..2178746d6 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/IntSetting.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/IntSetting.kt | |||
| @@ -33,6 +33,11 @@ enum class IntSetting( | |||
| 33 | Settings.SECTION_RENDERER, | 33 | Settings.SECTION_RENDERER, |
| 34 | 0 | 34 | 0 |
| 35 | ), | 35 | ), |
| 36 | RENDERER_REACTIVE_FLUSHING( | ||
| 37 | "use_reactive_flushing", | ||
| 38 | Settings.SECTION_RENDERER, | ||
| 39 | 0 | ||
| 40 | ), | ||
| 36 | RENDERER_DEBUG( | 41 | RENDERER_DEBUG( |
| 37 | "debug", | 42 | "debug", |
| 38 | Settings.SECTION_RENDERER, | 43 | Settings.SECTION_RENDERER, |
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 061046b2e..1ceaa6fb4 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 | |||
| @@ -321,6 +321,15 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView) | |||
| 321 | IntSetting.RENDERER_ASYNCHRONOUS_SHADERS.defaultValue | 321 | IntSetting.RENDERER_ASYNCHRONOUS_SHADERS.defaultValue |
| 322 | ) | 322 | ) |
| 323 | ) | 323 | ) |
| 324 | add( | ||
| 325 | SwitchSetting( | ||
| 326 | IntSetting.RENDERER_REACTIVE_FLUSHING, | ||
| 327 | R.string.renderer_reactive_flushing, | ||
| 328 | R.string.renderer_reactive_flushing_description, | ||
| 329 | IntSetting.RENDERER_REACTIVE_FLUSHING.key, | ||
| 330 | IntSetting.RENDERER_REACTIVE_FLUSHING.defaultValue | ||
| 331 | ) | ||
| 332 | ) | ||
| 324 | } | 333 | } |
| 325 | } | 334 | } |
| 326 | 335 | ||
diff --git a/src/android/app/src/main/jni/config.cpp b/src/android/app/src/main/jni/config.cpp index 2d622a048..e0b4772da 100644 --- a/src/android/app/src/main/jni/config.cpp +++ b/src/android/app/src/main/jni/config.cpp | |||
| @@ -239,6 +239,10 @@ void Config::ReadValues() { | |||
| 239 | Settings::values.renderer_force_max_clock = | 239 | Settings::values.renderer_force_max_clock = |
| 240 | config->GetBoolean("Renderer", "force_max_clock", true); | 240 | config->GetBoolean("Renderer", "force_max_clock", true); |
| 241 | 241 | ||
| 242 | // Disable use_reactive_flushing by default on Android | ||
| 243 | Settings::values.use_reactive_flushing = | ||
| 244 | config->GetBoolean("Renderer", "use_reactive_flushing", false); | ||
| 245 | |||
| 242 | // Audio | 246 | // Audio |
| 243 | ReadSetting("Audio", Settings::values.sink_id); | 247 | ReadSetting("Audio", Settings::values.sink_id); |
| 244 | ReadSetting("Audio", Settings::values.audio_output_device_id); | 248 | ReadSetting("Audio", Settings::values.audio_output_device_id); |
diff --git a/src/android/app/src/main/jni/default_ini.h b/src/android/app/src/main/jni/default_ini.h index c5dfaff54..c92998858 100644 --- a/src/android/app/src/main/jni/default_ini.h +++ b/src/android/app/src/main/jni/default_ini.h | |||
| @@ -328,6 +328,10 @@ shader_backend = | |||
| 328 | # 0 (default): Off, 1: On | 328 | # 0 (default): Off, 1: On |
| 329 | use_asynchronous_shaders = | 329 | use_asynchronous_shaders = |
| 330 | 330 | ||
| 331 | # Uses reactive flushing instead of predictive flushing. Allowing a more accurate syncing of memory. | ||
| 332 | # 0 (default): Off, 1: On | ||
| 333 | use_reactive_flushing = | ||
| 334 | |||
| 331 | # NVDEC emulation. | 335 | # NVDEC emulation. |
| 332 | # 0: Disabled, 1: CPU Decoding, 2 (default): GPU Decoding | 336 | # 0: Disabled, 1: CPU Decoding, 2 (default): GPU Decoding |
| 333 | nvdec_emulation = | 337 | nvdec_emulation = |
diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml index 7dae63dcb..c236811fa 100644 --- a/src/android/app/src/main/res/values/strings.xml +++ b/src/android/app/src/main/res/values/strings.xml | |||
| @@ -169,6 +169,8 @@ | |||
| 169 | <string name="renderer_force_max_clock_description">Forces the GPU to run at the maximum possible clocks (thermal constraints will still be applied).</string> | 169 | <string name="renderer_force_max_clock_description">Forces the GPU to run at the maximum possible clocks (thermal constraints will still be applied).</string> |
| 170 | <string name="renderer_asynchronous_shaders">Use asynchronous shaders</string> | 170 | <string name="renderer_asynchronous_shaders">Use asynchronous shaders</string> |
| 171 | <string name="renderer_asynchronous_shaders_description">Compiles shaders asynchronously, reducing stutter but may introduce glitches.</string> | 171 | <string name="renderer_asynchronous_shaders_description">Compiles shaders asynchronously, reducing stutter but may introduce glitches.</string> |
| 172 | <string name="renderer_reactive_flushing">Use reactive flushing</string> | ||
| 173 | <string name="renderer_reactive_flushing_description">Improves rendering accuracy in some games at the cost of performance.</string> | ||
| 172 | <string name="renderer_debug">Graphics debugging</string> | 174 | <string name="renderer_debug">Graphics debugging</string> |
| 173 | <string name="renderer_debug_description">Sets the graphics API to a slow debugging mode.</string> | 175 | <string name="renderer_debug_description">Sets the graphics API to a slow debugging mode.</string> |
| 174 | <string name="use_disk_shader_cache">Disk shader cache</string> | 176 | <string name="use_disk_shader_cache">Disk shader cache</string> |