From e48bf0bb4a813c50c7592badc70580e0b493769a Mon Sep 17 00:00:00 2001 From: Merry Date: Sun, 21 Jan 2024 17:16:49 +0000 Subject: [PATCH] android: Add accelerated boot configuration option --- .../features/settings/model/BooleanSetting.kt | 1 + .../settings/model/view/SettingsItem.kt | 30 +++++++++++++++++++ .../app/src/main/res/values/strings.xml | 1 + 3 files changed, 32 insertions(+) diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.kt index 86bd336726..9051aba1a4 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.kt @@ -10,6 +10,7 @@ enum class BooleanSetting(override val key: String) : AbstractBooleanSetting { CPU_DEBUG_MODE("cpu_debug_mode"), FASTMEM("cpuopt_fastmem"), FASTMEM_EXCLUSIVES("cpuopt_fastmem_exclusives"), + MULTIBLOCK_COMPILATION("cpuopt_multiblock_compilation"), RENDERER_USE_SPEED_LIMIT("use_speed_limit"), USE_DOCKED_MODE("use_docked_mode"), RENDERER_USE_DISK_SHADER_CACHE("use_disk_shader_cache"), diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt index 12f7aa1ab2..e893f55db5 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt @@ -328,6 +328,36 @@ abstract class SettingsItem( override fun reset() = setBoolean(defaultValue) } put(SwitchSetting(fastmem, R.string.fastmem, 0)) + + val multiblock_compilation = object : AbstractBooleanSetting { + override fun getBoolean(needsGlobal: Boolean): Boolean = + BooleanSetting.MULTIBLOCK_COMPILATION.getBoolean() + + override fun setBoolean(value: Boolean) { + BooleanSetting.MULTIBLOCK_COMPILATION.setBoolean(value) + } + + override val key: String = MULTIBLOCK_COMPILATION + override val isRuntimeModifiable: Boolean = false + override val pairedSettingKey = BooleanSetting.CPU_DEBUG_MODE.key + override val defaultValue: Boolean = true + override val isSwitchable: Boolean = true + override var global: Boolean + get() { + return BooleanSetting.MULTIBLOCK_COMPILATION.global + } + set(value) { + BooleanSetting.MULTIBLOCK_COMPILATION.global = value + } + + override val isSaveable = true + + override fun getValueAsString(needsGlobal: Boolean): String = + getBoolean().toString() + + override fun reset() = setBoolean(defaultValue) + } + put(SwitchSetting(multiblock_compilation, R.string.multiblock_compilation, 0)) } } } diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml index bfcbb58120..a850294595 100644 --- a/src/android/app/src/main/res/values/strings.xml +++ b/src/android/app/src/main/res/values/strings.xml @@ -246,6 +246,7 @@ Graphics debugging Sets the graphics API to a slow debugging mode. Fastmem + Accelerated boot Output engine