VERY experimental Nintendo Switch 2 emulator
C++
android: Fix waiting for driver install on startup
t895b24bd8193870
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 82f8e3b505..d17e087fef 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@@ -38,7 +38,6 @@ import androidx.window.layout.WindowLayoutInfoimport com.google.android.material.dialog.MaterialAlertDialogBuilderimport com.google.android.material.slider.Sliderimport kotlinx.coroutines.Dispatchers-import kotlinx.coroutines.flow.collectimport kotlinx.coroutines.flow.collectLatestimport kotlinx.coroutines.launchimport org.yuzu.yuzu_emu.HomeNavigationDirections@@ -141,7 +140,9 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {// So this fragment doesn't restart on configuration changes; i.e. rotation.retainInstance = true- emulationState = EmulationState(game.path)+ emulationState = EmulationState(game.path) {+ return@EmulationState driverViewModel.isInteractionAllowed.value+ }}/**@@ -370,6 +371,15 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {}}}+ launch {+ repeatOnLifecycle(Lifecycle.State.RESUMED) {+ driverViewModel.isInteractionAllowed.collect {+ if (it) {+ startEmulation()+ }+ }+ }+ }launch {repeatOnLifecycle(Lifecycle.State.CREATED) {emulationViewModel.emulationStarted.collectLatest {@@ -398,19 +408,10 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {}}}- launch {- repeatOnLifecycle(Lifecycle.State.RESUMED) {- driverViewModel.isInteractionAllowed.collect {- if (it) {- onEmulationStart()- }- }- }- }}}- private fun onEmulationStart() {+ private fun startEmulation() {if (!NativeLibrary.isRunning() && !NativeLibrary.isPaused()) {if (!DirectoryInitialization.areDirectoriesReady) {DirectoryInitialization.start()@@ -810,7 +811,10 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {}}- private class EmulationState(private val gamePath: String) {+ private class EmulationState(+ private val gamePath: String,+ private val emulationCanStart: () -> Boolean+ ) {private var state: Stateprivate var surface: Surface? = null@@ -904,6 +908,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {State.PAUSED -> Log.warning("[EmulationFragment] Surface cleared while emulation paused.")+else -> Log.warning("[EmulationFragment] Surface cleared while emulation stopped.")@@ -913,6 +918,10 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {private fun runWithValidSurface() {NativeLibrary.surfaceChanged(surface)+ if (!emulationCanStart.invoke()) {+ return+ }+when (state) {State.STOPPED -> {val emulationThread = Thread({diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/DriverViewModel.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/DriverViewModel.ktindex 15ae3a42b4..5ed754c96c 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/DriverViewModel.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/DriverViewModel.kt@@ -144,6 +144,7 @@ class DriverViewModel : ViewModel() {val selectedDriverFile = File(StringSetting.DRIVER_PATH.getString())val selectedDriverMetadata = GpuDriverHelper.customDriverSettingDataif (GpuDriverHelper.installedCustomDriverData == selectedDriverMetadata) {+ setDriverReady()return}diff --git a/src/android/app/src/main/jni/native.cpp b/src/android/app/src/main/jni/native.cppindex c6c55b20c1..c20c2d2b89 100644--- a/src/android/app/src/main/jni/native.cpp+++ b/src/android/app/src/main/jni/native.cpp@@ -247,6 +247,7 @@ Core::SystemResultStatus EmulationSession::InitializeEmulation(const std::stringm_system.GetCpuManager().OnGpuReady();m_system.RegisterExitCallback([&] { HaltEmulation(); });+ OnEmulationStarted();return Core::SystemResultStatus::Success;}