VERY experimental Nintendo Switch 2 emulator
C++
[android,settings] fix for *_combined (fastmem, gpu unswizzle) kotlin side only settings being unnecesarily requested to native (#3724)
xbzk4a60085a7660
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/GpuUnswizzleSetting.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/GpuUnswizzleSetting.ktindex 5d6535e81e..a9a40f6903 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/GpuUnswizzleSetting.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/GpuUnswizzleSetting.kt@@ -27,6 +27,20 @@ class GpuUnswizzleSetting(override val isSaveable = trueoverride val isRuntimeModifiable = trueoverride val isSwitchable = true+ override val pairedSettingKey: String = ""+ override var global: Boolean+ get() {+ return BooleanSetting.GPU_UNSWIZZLE_ENABLED.global &&+ IntSetting.GPU_UNSWIZZLE_TEXTURE_SIZE.global &&+ IntSetting.GPU_UNSWIZZLE_STREAM_SIZE.global &&+ IntSetting.GPU_UNSWIZZLE_CHUNK_SIZE.global+ }+ set(value) {+ BooleanSetting.GPU_UNSWIZZLE_ENABLED.global = value+ IntSetting.GPU_UNSWIZZLE_TEXTURE_SIZE.global = value+ IntSetting.GPU_UNSWIZZLE_STREAM_SIZE.global = value+ IntSetting.GPU_UNSWIZZLE_CHUNK_SIZE.global = value+ }override fun getValueAsString(needsGlobal: Boolean): String = "combined"override fun reset() {BooleanSetting.GPU_UNSWIZZLE_ENABLED.reset()@@ -72,4 +86,4 @@ class GpuUnswizzleSetting(IntSetting.GPU_UNSWIZZLE_CHUNK_SIZE.setInt(value)fun reset() = setting.reset()-}\ No newline at end of file+}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.ktindex a8bd44983b..a20858f0a9 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@@ -989,6 +989,7 @@ abstract class SettingsItem(override val isRuntimeModifiable: Boolean = falseoverride val defaultValue: Boolean = trueoverride val isSwitchable: Boolean = true+ override val pairedSettingKey: String = ""override var global: Booleanget() {return BooleanSetting.FASTMEM.global &&