diff options
| author | lizzie <lizzie@eden-emu.dev> | 2026-01-21 01:17:10 +0100 |
|---|---|---|
| committer | crueter <crueter@eden-emu.dev> | 2026-01-21 01:17:10 +0100 |
| commit | a3fa666510384e597e7cab55d0a74da4a206da0d (patch) | |
| tree | 6cab8cf7e8a25baa30ebcf3faab06672f255fe3b /src/android | |
| parent | cb40b310f567d0e890dd31c3ece143f841fd1d13 (diff) | |
[android] fix discrepancy of MAXTEXTURE v. TEXTURE in setting string set (#3360)
Signed-off-by: lizzie <lizzie@eden-emu.dev>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3360
Reviewed-by: crueter <crueter@eden-emu.dev>
Reviewed-by: MaranBr <maranbr@eden-emu.dev>
Reviewed-by: DraVee <dravee@eden-emu.dev>
Co-authored-by: lizzie <lizzie@eden-emu.dev>
Co-committed-by: lizzie <lizzie@eden-emu.dev>
Diffstat (limited to 'src/android')
4 files changed, 24 insertions, 24 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 e9a489d2e8..96db3cf7c0 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 @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later // SPDX-FileCopyrightText: 2023 yuzu Emulator Project @@ -46,9 +46,9 @@ enum class IntSetting(override val key: String) : AbstractIntSetting { FAST_CPU_TIME("fast_cpu_time"), CPU_TICKS("cpu_ticks"), FAST_GPU_TIME("fast_gpu_time"), - GPU_UNZWIZZLE_MAXTEXTURE_SIZE("gpu_unzwizzle_maxtexture_size"), - GPU_UNZWIZZLE_STREAM_SIZE("gpu_unzwizzle_stream_size"), - GPU_UNZWIZZLE_CHUNK_SIZE("gpu_unzwizzle_chunk_size"), + GPU_UNSWIZZLE_TEXTURE_SIZE("gpu_unswizzle_texture_size"), + GPU_UNSWIZZLE_STREAM_SIZE("gpu_unswizzle_stream_size"), + GPU_UNSWIZZLE_CHUNK_SIZE("gpu_unswizzle_chunk_size"), BAT_TEMPERATURE_UNIT("bat_temperature_unit"), CABINET_APPLET("cabinet_applet_mode"), CONTROLLER_APPLET("controller_applet_mode"), 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 0b72cd52ad..0c3f7c39f0 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 @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later // SPDX-FileCopyrightText: 2023 yuzu Emulator Project @@ -648,27 +648,27 @@ abstract class SettingsItem( ) put( SingleChoiceSetting( - IntSetting.GPU_UNZWIZZLE_MAXTEXTURE_SIZE, - titleId = R.string.gpu_unzwizzle_maxtexture_size, - descriptionId = R.string.gpu_unzwizzle_maxtexture_size_description, + IntSetting.GPU_UNSWIZZLE_TEXTURE_SIZE, + titleId = R.string.gpu_unswizzle_texture_size, + descriptionId = R.string.gpu_unswizzle_texture_size_description, choicesId = R.array.gpuTextureSizeSwizzleEntries, valuesId = R.array.gpuTextureSizeSwizzleValues ) ) put( SingleChoiceSetting( - IntSetting.GPU_UNZWIZZLE_STREAM_SIZE, - titleId = R.string.gpu_unzwizzle_stream_size, - descriptionId = R.string.gpu_unzwizzle_stream_size_description, + IntSetting.GPU_UNSWIZZLE_STREAM_SIZE, + titleId = R.string.gpu_unswizzle_stream_size, + descriptionId = R.string.gpu_unswizzle_stream_size_description, choicesId = R.array.gpuSwizzleEntries, valuesId = R.array.gpuSwizzleValues ) ) put( SingleChoiceSetting( - IntSetting.GPU_UNZWIZZLE_CHUNK_SIZE, - titleId = R.string.gpu_unzwizzle_chunk_size, - descriptionId = R.string.gpu_unzwizzle_chunk_size_description, + IntSetting.GPU_UNSWIZZLE_CHUNK_SIZE, + titleId = R.string.gpu_unswizzle_chunk_size, + descriptionId = R.string.gpu_unswizzle_chunk_size_description, choicesId = R.array.gpuSwizzleChunkEntries, valuesId = R.array.gpuSwizzleChunkValues ) 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 c03bd2a950..919d27aadd 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 @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later package org.yuzu.yuzu_emu.features.settings.ui @@ -279,9 +279,9 @@ class SettingsFragmentPresenter( add(IntSetting.FAST_GPU_TIME.key) add(BooleanSetting.SKIP_CPU_INNER_INVALIDATION.key) add(BooleanSetting.RENDERER_ASYNCHRONOUS_SHADERS.key) - add(IntSetting.GPU_UNZWIZZLE_MAXTEXTURE_SIZE.key) - add(IntSetting.GPU_UNZWIZZLE_STREAM_SIZE.key) - add(IntSetting.GPU_UNZWIZZLE_CHUNK_SIZE.key) + add(IntSetting.GPU_UNSWIZZLE_TEXTURE_SIZE.key) + add(IntSetting.GPU_UNSWIZZLE_STREAM_SIZE.key) + add(IntSetting.GPU_UNSWIZZLE_CHUNK_SIZE.key) add(HeaderSetting(R.string.extensions)) diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml index bd0655d77c..1f0da34213 100644 --- a/src/android/app/src/main/res/values/strings.xml +++ b/src/android/app/src/main/res/values/strings.xml @@ -497,12 +497,12 @@ <string name="skip_cpu_inner_invalidation_description">Skips certain CPU-side cache invalidations during memory updates, reducing CPU usage and improving it\'s performance. This may cause glitches or crashes on some games.</string> <string name="renderer_asynchronous_shaders">Use asynchronous shaders</string> <string name="renderer_asynchronous_shaders_description">Compiles shaders asynchronously. This may reduce stutters but may also introduce glitches.</string> - <string name="gpu_unzwizzle_maxtexture_size">GPU Unswizzle Max Texture Size</string> - <string name="gpu_unzwizzle_maxtexture_size_description">Sets the maximum size (MB) for GPU-based texture unswizzling. While the GPU is faster for medium and large textures, the CPU may be more efficient for very small ones. Adjust this to find the balance between GPU acceleration and CPU overhead.</string> - <string name="gpu_unzwizzle_stream_size">GPU Unswizzle Stream Size</string> - <string name="gpu_unzwizzle_stream_size_description">Sets the data limit per frame for unswizzling large textures. Higher values speed up texture loading at the cost of higher frame latency; lower values reduce GPU overhead but may cause visible texture pop-in.</string> - <string name="gpu_unzwizzle_chunk_size">GPU Unswizzle Chunk Size</string> - <string name="gpu_unzwizzle_chunk_size_description">Defines the number of depth slices processed per batch for 3D textures. Increasing this improves throughput efficiency on powerful GPUs but may cause stuttering or driver timeouts on weaker hardware.</string> + <string name="gpu_unswizzle_texture_size">GPU Unswizzle Max Texture Size</string> + <string name="gpu_unswizzle_texture_size_description">Sets the maximum size (MB) for GPU-based texture unswizzling. While the GPU is faster for medium and large textures, the CPU may be more efficient for very small ones. Adjust this to find the balance between GPU acceleration and CPU overhead.</string> + <string name="gpu_unswizzle_stream_size">GPU Unswizzle Stream Size</string> + <string name="gpu_unswizzle_stream_size_description">Sets the data limit per frame for unswizzling large textures. Higher values speed up texture loading at the cost of higher frame latency; lower values reduce GPU overhead but may cause visible texture pop-in.</string> + <string name="gpu_unswizzle_chunk_size">GPU Unswizzle Chunk Size</string> + <string name="gpu_unswizzle_chunk_size_description">Defines the number of depth slices processed per batch for 3D textures. Increasing this improves throughput efficiency on powerful GPUs but may cause stuttering or driver timeouts on weaker hardware.</string> <string name="extensions">Extensions</string> |
