VERY experimental Nintendo Switch 2 emulator
C++
[android] Allow manual overlay toggle even with controller connected + move async GPU options to hacks (#3862)
PavelBARABANOV6c76908ddbf6
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.ktindex 9a218dc2a2..542215fa97 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@@ -284,8 +284,6 @@ class SettingsFragmentPresenter(add(BooleanSetting.SYNC_MEMORY_OPERATIONS.key)add(BooleanSetting.RENDERER_USE_DISK_SHADER_CACHE.key)add(BooleanSetting.RENDERER_FORCE_MAX_CLOCK.key)- add(BooleanSetting.RENDERER_ASYNCHRONOUS_GPU_EMULATION.key)- add(BooleanSetting.RENDERER_ASYNC_PRESENTATION.key)add(BooleanSetting.RENDERER_REACTIVE_FLUSHING.key)add(BooleanSetting.ENABLE_BUFFER_HISTORY.key)add(BooleanSetting.USE_OPTIMIZED_VERTEX_BUFFERS.key)@@ -296,6 +294,8 @@ class SettingsFragmentPresenter(add(BooleanSetting.SKIP_CPU_INNER_INVALIDATION.key)add(BooleanSetting.FIX_BLOOM_EFFECTS.key)add(BooleanSetting.RENDERER_ASYNCHRONOUS_SHADERS.key)+ add(BooleanSetting.RENDERER_ASYNCHRONOUS_GPU_EMULATION.key)+ add(BooleanSetting.RENDERER_ASYNC_PRESENTATION.key)add(SettingsItem.GPU_UNSWIZZLE_COMBINED)add(HeaderSetting(R.string.extensions))diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.ktindex 19dbe288bb..120bafdd14 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt@@ -2509,7 +2509,6 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {fun toggleOverlay(enable: Boolean) {if (!isAdded || _binding == null) return- if (enable && hasPhysicalControllerConnected && !args.overlayGamelessEditMode) returnif (enable == !BooleanSetting.SHOW_INPUT_OVERLAY.getBoolean()) {// Reset controller input flag so controller can hide overlay againif (!enable) {@@ -2547,7 +2546,8 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {if (binding.surfaceInputOverlay.isGamelessMode()) returnif (hasConnectedControllers) {- if (BooleanSetting.SHOW_INPUT_OVERLAY.getBoolean()) {+ if (BooleanSetting.SHOW_INPUT_OVERLAY.getBoolean() &&+ BooleanSetting.HIDE_OVERLAY_ON_CONTROLLER_INPUT.getBoolean()) {overlayHiddenByPhysicalController = truetoggleOverlay(false)}diff --git a/src/android/app/src/main/jni/android_settings.h b/src/android/app/src/main/jni/android_settings.hindex 8628021f75..37da651519 100644--- a/src/android/app/src/main/jni/android_settings.h+++ b/src/android/app/src/main/jni/android_settings.h@@ -95,7 +95,7 @@ namespace AndroidSettings {Settings::Setting<u32> input_overlay_auto_hide{linkage, 5, "input_overlay_auto_hide",Settings::Category::Overlay,Settings::Specialization::Default, true, true, &enable_input_overlay_auto_hide};- Settings::Setting<bool> hide_overlay_on_controller_input{linkage, false,+ Settings::Setting<bool> hide_overlay_on_controller_input{linkage, true,"hide_overlay_on_controller_input",Settings::Category::Overlay,Settings::Specialization::Default, true,