summaryrefslogtreecommitdiff
path: root/src/android/app
diff options
context:
space:
mode:
authorGravatar GPUCode2023-11-18 16:10:39 +0200
committerGravatar t8952023-11-25 00:47:28 -0500
commit8fab363237083a8130a7b2a023cd9c5dd83f8f4f (patch)
treefa94b90be48a5debe83b414119da5b8419dd463c /src/android/app
parentarm: Implement native code execution backend (diff)
downloadyuzu-8fab363237083a8130a7b2a023cd9c5dd83f8f4f.tar.gz
yuzu-8fab363237083a8130a7b2a023cd9c5dd83f8f4f.tar.xz
yuzu-8fab363237083a8130a7b2a023cd9c5dd83f8f4f.zip
android: Add cpu bakend gui toggle
Diffstat (limited to 'src/android/app')
-rw-r--r--src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/IntSetting.kt1
-rw-r--r--src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt9
-rw-r--r--src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt1
-rw-r--r--src/android/app/src/main/res/values/arrays.xml10
-rw-r--r--src/android/app/src/main/res/values/strings.xml5
5 files changed, 26 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 151362124..ef10b209f 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
@@ -10,6 +10,7 @@ enum class IntSetting(
10 override val category: Settings.Category, 10 override val category: Settings.Category,
11 override val androidDefault: Int? = null 11 override val androidDefault: Int? = null
12) : AbstractIntSetting { 12) : AbstractIntSetting {
13 CPU_BACKEND("cpu_backend", Settings.Category.Cpu),
13 CPU_ACCURACY("cpu_accuracy", Settings.Category.Cpu), 14 CPU_ACCURACY("cpu_accuracy", Settings.Category.Cpu),
14 REGION_INDEX("region_index", Settings.Category.System), 15 REGION_INDEX("region_index", Settings.Category.System),
15 LANGUAGE_INDEX("language_index", Settings.Category.System), 16 LANGUAGE_INDEX("language_index", Settings.Category.System),
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 6aba69dbe..1f090424b 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
@@ -79,6 +79,15 @@ abstract class SettingsItem(
79 ) 79 )
80 put( 80 put(
81 SingleChoiceSetting( 81 SingleChoiceSetting(
82 IntSetting.CPU_BACKEND,
83 R.string.cpu_backend,
84 0,
85 R.array.cpuBackendNames,
86 R.array.cpuBackendValues
87 )
88 )
89 put(
90 SingleChoiceSetting(
82 IntSetting.CPU_ACCURACY, 91 IntSetting.CPU_ACCURACY,
83 R.string.cpu_accuracy, 92 R.string.cpu_accuracy,
84 0, 93 0,
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 8b71e32f3..7425728c6 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
@@ -269,6 +269,7 @@ class SettingsFragmentPresenter(
269 add(BooleanSetting.RENDERER_DEBUG.key) 269 add(BooleanSetting.RENDERER_DEBUG.key)
270 270
271 add(HeaderSetting(R.string.cpu)) 271 add(HeaderSetting(R.string.cpu))
272 add(IntSetting.CPU_BACKEND.key)
272 add(IntSetting.CPU_ACCURACY.key) 273 add(IntSetting.CPU_ACCURACY.key)
273 add(BooleanSetting.CPU_DEBUG_MODE.key) 274 add(BooleanSetting.CPU_DEBUG_MODE.key)
274 add(SettingsItem.FASTMEM_COMBINED) 275 add(SettingsItem.FASTMEM_COMBINED)
diff --git a/src/android/app/src/main/res/values/arrays.xml b/src/android/app/src/main/res/values/arrays.xml
index 51bcc49a3..2756e5cc9 100644
--- a/src/android/app/src/main/res/values/arrays.xml
+++ b/src/android/app/src/main/res/values/arrays.xml
@@ -175,6 +175,16 @@
175 <item>2</item> 175 <item>2</item>
176 </integer-array> 176 </integer-array>
177 177
178 <string-array name="cpuBackendNames">
179 <item>@string/cpu_backend_dynarmic</item>
180 <item>@string/cpu_backend_nce</item>
181 </string-array>
182
183 <integer-array name="cpuBackendValues">
184 <item>0</item>
185 <item>1</item>
186 </integer-array>
187
178 <string-array name="cpuAccuracyNames"> 188 <string-array name="cpuAccuracyNames">
179 <item>@string/auto</item> 189 <item>@string/auto</item>
180 <item>@string/cpu_accuracy_accurate</item> 190 <item>@string/cpu_accuracy_accurate</item>
diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml
index 471af8795..f07121f6a 100644
--- a/src/android/app/src/main/res/values/strings.xml
+++ b/src/android/app/src/main/res/values/strings.xml
@@ -185,6 +185,7 @@
185 <string name="frame_limit_enable_description">Limits emulation speed to a specified percentage of normal speed.</string> 185 <string name="frame_limit_enable_description">Limits emulation speed to a specified percentage of normal speed.</string>
186 <string name="frame_limit_slider">Limit speed percent</string> 186 <string name="frame_limit_slider">Limit speed percent</string>
187 <string name="frame_limit_slider_description">Specifies the percentage to limit emulation speed. 100% is the normal speed. Values higher or lower will increase or decrease the speed limit.</string> 187 <string name="frame_limit_slider_description">Specifies the percentage to limit emulation speed. 100% is the normal speed. Values higher or lower will increase or decrease the speed limit.</string>
188 <string name="cpu_backend">CPU Backend</string>
188 <string name="cpu_accuracy">CPU accuracy</string> 189 <string name="cpu_accuracy">CPU accuracy</string>
189 <string name="value_with_units">%1$s%2$s</string> 190 <string name="value_with_units">%1$s%2$s</string>
190 191
@@ -416,6 +417,10 @@
416 <string name="ratio_force_sixteen_ten">Force 16:10</string> 417 <string name="ratio_force_sixteen_ten">Force 16:10</string>
417 <string name="ratio_stretch">Stretch to window</string> 418 <string name="ratio_stretch">Stretch to window</string>
418 419
420 <!-- CPU Backend -->
421 <string name="cpu_backend_dynarmic">Dynarmic (Slow)</string>
422 <string name="cpu_backend_nce">Native code execution (NCE)</string>
423
419 <!-- CPU Accuracy --> 424 <!-- CPU Accuracy -->
420 <string name="cpu_accuracy_accurate">Accurate</string> 425 <string name="cpu_accuracy_accurate">Accurate</string>
421 <string name="cpu_accuracy_unsafe">Unsafe</string> 426 <string name="cpu_accuracy_unsafe">Unsafe</string>