Android: Switch 2 fixes from an Odin 3 (Mario Kart World, Fire Emblem: Fortune's Weave)

externals/CMakeLists.txt

@@ -282,6 +282,11 @@ if (ENABLE_WEB_SERVICE OR ENABLE_UPDATE_CHECKER)
     AddJsonPackage(cpp-jwt)
 endif()
 
+# libgav1 (AV1 video decoding where FFmpeg has no libdav1d: Android)
+if (ANDROID)
+    add_subdirectory(libgav1)
+endif()
+
 # FFMpeg
 if (YUZU_USE_EXTERNAL_FFMPEG OR YUZU_USE_BUNDLED_FFMPEG)
     add_subdirectory(ffmpeg)

externals/libgav1/CMakeLists.txt

@@ -0,0 +1,22 @@
+# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+# libgav1 decodes the AV1 movies of Switch 2 titles (nx2 video decoder) where the bundled FFmpeg
+# has no libdav1d (Android's package); with libdav1d, FFmpeg decodes them.
+
+include(FetchContent)
+
+set(LIBGAV1_ENABLE_TESTS OFF)
+set(LIBGAV1_ENABLE_EXAMPLES OFF)
+# std::mutex in its thread pool: no Abseil (it is only needed for absl::Mutex, tests and examples)
+set(LIBGAV1_THREADPOOL_USE_STD_MUTEX 1)
+# 8 and 10-bit streams only, which leaves the 12-bit DSP code out
+set(LIBGAV1_MAX_BITDEPTH 10)
+FetchContent_Declare(libgav1
+    GIT_REPOSITORY https://chromium.googlesource.com/codecs/libgav1
+    GIT_TAG c1deec657b32b911920c78e078cfd089faa77200
+)
+FetchContent_MakeAvailable(libgav1)
+
+set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_NAMES libgav1)
+set_property(GLOBAL APPEND PROPERTY CPM_PACKAGE_URLS https://chromium.googlesource.com/codecs/libgav1)

src/CMakeLists.txt

@@ -153,6 +153,10 @@ else()
             $<$<COMPILE_LANGUAGE:C,CXX>:-pipe>
             # Disable RTTI (C++ only)
             $<$<COMPILE_LANGUAGE:CXX>:-fno-rtti>)
+    else()
+        # clang-cl: like the MSVC branch, or windows.h (included by vulkan.h) defines min/max
+        # macros that break std::min/std::max calls
+        add_compile_definitions(NOMINMAX)
     endif()
 
     if (ENABLE_WERROR)

src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt

@@ -106,9 +106,17 @@ object NativeLibrary {
         if (DocumentsTree.isNativePath(path)) {
             YuzuApplication.documentsTree!!.getParentDirectory(path)
         } else {
-            path
+            FileUtil.getParentUri(path) ?: path
         }
 
+    /**
+     * Children of a content URI directory, four strings each: "d" or "f", size (-1 if unknown),
+     * display name and document URI. Native code finds files next to a loose ExeFS with it.
+     */
+    @Keep
+    @JvmStatic
+    fun listChildren(path: String): Array<String> = FileUtil.listChildren(path)
+
     @Keep
     @JvmStatic
     fun getFilename(path: String): String =

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/BooleanSetting.kt

@@ -26,6 +26,13 @@ enum class BooleanSetting(override val key: String) : AbstractBooleanSetting {
     RENDERER_FORCE_MAX_CLOCK("force_max_clock"),
     RENDERER_ASYNCHRONOUS_GPU_EMULATION("use_asynchronous_gpu_emulation"),
     RENDERER_ASYNCHRONOUS_SHADERS("use_asynchronous_shaders"),
+    RENDERER_REDUCE_TEXTURE_RESOLUTION("reduce_texture_resolution"),
+    RENDERER_RELEASE_GPU_ONLY_MEMORY("release_gpu_only_memory"),
+    RENDERER_NX2_COMMAND_LISTS("nx2_command_lists"),
+    RENDERER_MKW_30FPS("mkw_30fps"),
+    RENDERER_MKW_60FPS("mkw_60fps"),
+    RENDERER_MKW_LOD_DISTANCE("mkw_lod_distance"),
+    RENDERER_MKW_SHADOW_CASCADES("mkw_shadow_cascades"),
     RENDERER_REACTIVE_FLUSHING("use_reactive_flushing"),
     ENABLE_BUFFER_HISTORY("enable_buffer_history"),
     USE_OPTIMIZED_VERTEX_BUFFERS("use_optimized_vertex_buffers"),

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt

@@ -778,6 +778,55 @@ abstract class SettingsItem(
                     descriptionId = R.string.renderer_asynchronous_shaders_description
                 )
             )
+            put(
+                SwitchSetting(
+                    BooleanSetting.RENDERER_REDUCE_TEXTURE_RESOLUTION,
+                    titleId = R.string.renderer_reduce_texture_resolution,
+                    descriptionId = R.string.renderer_reduce_texture_resolution_description
+                )
+            )
+            put(
+                SwitchSetting(
+                    BooleanSetting.RENDERER_RELEASE_GPU_ONLY_MEMORY,
+                    titleId = R.string.renderer_release_gpu_only_memory,
+                    descriptionId = R.string.renderer_release_gpu_only_memory_description
+                )
+            )
+            put(
+                SwitchSetting(
+                    BooleanSetting.RENDERER_NX2_COMMAND_LISTS,
+                    titleId = R.string.renderer_nx2_command_lists,
+                    descriptionId = R.string.renderer_nx2_command_lists_description
+                )
+            )
+            put(
+                SwitchSetting(
+                    BooleanSetting.RENDERER_MKW_30FPS,
+                    titleId = R.string.renderer_mkw_30fps,
+                    descriptionId = R.string.renderer_mkw_30fps_description
+                )
+            )
+            put(
+                SwitchSetting(
+                    BooleanSetting.RENDERER_MKW_60FPS,
+                    titleId = R.string.renderer_mkw_60fps,
+                    descriptionId = R.string.renderer_mkw_60fps_description
+                )
+            )
+            put(
+                SwitchSetting(
+                    BooleanSetting.RENDERER_MKW_LOD_DISTANCE,
+                    titleId = R.string.renderer_mkw_lod_distance,
+                    descriptionId = R.string.renderer_mkw_lod_distance_description
+                )
+            )
+            put(
+                SwitchSetting(
+                    BooleanSetting.RENDERER_MKW_SHADOW_CASCADES,
+                    titleId = R.string.renderer_mkw_shadow_cascades,
+                    descriptionId = R.string.renderer_mkw_shadow_cascades_description
+                )
+            )
             put(
                 SingleChoiceSetting(
                     IntSetting.FAST_GPU_TIME,

src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt

@@ -558,6 +558,13 @@ class SettingsFragmentPresenter(
             add(BooleanSetting.FIX_BLOOM_EFFECTS.key)
             add(BooleanSetting.EMULATE_BGR565.key)
             add(BooleanSetting.RENDERER_ASYNCHRONOUS_SHADERS.key)
+            add(BooleanSetting.RENDERER_REDUCE_TEXTURE_RESOLUTION.key)
+            add(BooleanSetting.RENDERER_RELEASE_GPU_ONLY_MEMORY.key)
+            add(BooleanSetting.RENDERER_NX2_COMMAND_LISTS.key)
+            add(BooleanSetting.RENDERER_MKW_30FPS.key)
+            add(BooleanSetting.RENDERER_MKW_60FPS.key)
+            add(BooleanSetting.RENDERER_MKW_LOD_DISTANCE.key)
+            add(BooleanSetting.RENDERER_MKW_SHADOW_CASCADES.key)
             add(IntSetting.ANDROID_PIPELINE_WORKERS.key)
             add(BooleanSetting.RENDERER_ASYNCHRONOUS_GPU_EMULATION.key)
             add(SettingsItem.GPU_UNSWIZZLE_COMBINED)

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt

@@ -239,7 +239,9 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
             handleEmuReadyIntent(intent)
             return
         } else if (intentUri != null) {
-            intentGame = if (Game.extensions.contains(FileUtil.getExtension(intentUri))) {
+            intentGame = if (Game.extensions.contains(FileUtil.getExtension(intentUri)) ||
+                FileUtil.getFilename(intentUri) == "main" // a loose ExeFS
+            ) {
                 GameHelper.getGame(requireActivity().intent.data!!, false)
             } else {
                 null

src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt

@@ -258,6 +258,14 @@ class HomeSettingsFragment : Fragment() {
                     }
                 )
             )
+            add(
+                HomeSetting(
+                    R.string.load_file,
+                    R.string.load_file_description,
+                    R.drawable.ic_folder_open,
+                    { mainActivity.loadGameFile.launch(arrayOf("*/*")) }
+                )
+            )
             add(
                 HomeSetting(
                     R.string.verify_installed_content,

src/android/app/src/main/java/org/yuzu/yuzu_emu/model/Game.kt

@@ -100,7 +100,7 @@ class Game(
 
     companion object {
         val extensions: Set<String> = HashSet(
-            listOf("xci", "nsp", "nca", "nro", "nsz", "xcz")
+            listOf("xci", "nsp", "nca", "nro", "nsz", "xcz", "nx2", "nup")
         )
     }
 }

src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt

@@ -33,6 +33,8 @@ import org.yuzu.yuzu_emu.dialogs.NetPlayDialog
 import org.yuzu.yuzu_emu.features.settings.model.Settings
 import org.yuzu.yuzu_emu.fragments.AddGameFolderDialogFragment
 import org.yuzu.yuzu_emu.fragments.MessageDialogFragment
+import org.yuzu.yuzu_emu.fragments.ProgressDialogFragment
+import org.yuzu.yuzu_emu.HomeNavigationDirections
 import org.yuzu.yuzu_emu.model.AddonViewModel
 import org.yuzu.yuzu_emu.model.DriverViewModel
 import org.yuzu.yuzu_emu.model.GamesViewModel
@@ -405,6 +407,87 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
             }
         }
 
+    // "Load file": boots a picked file without adding it to the library. A loose ExeFS main also
+    // needs its folder (main.npdm, sdk, subsdk*, romfs/), which picking one file does not grant:
+    // it boots when a granted tree holds it, else the folder is asked for.
+    val loadGameFile =
+        registerForActivityResult(ActivityResultContracts.OpenDocument()) { result ->
+            if (result != null) {
+                processLoadGameFile(result)
+            }
+        }
+
+    val loadLooseExeFsFolder =
+        registerForActivityResult(ActivityResultContracts.OpenDocumentTree()) { result ->
+            if (result != null) {
+                processLooseExeFsFolder(result)
+            }
+        }
+
+    private fun processLoadGameFile(result: Uri) {
+        val filename = FileUtil.getFilename(result)
+        if (filename != "main" && filename != "main.npdm") {
+            try {
+                contentResolver.takePersistableUriPermission(
+                    result,
+                    Intent.FLAG_GRANT_READ_URI_PERMISSION
+                )
+            } catch (e: SecurityException) {
+                // Not persistable: the grant still lasts while the app runs
+            }
+            bootGameUri { result }
+            return
+        }
+
+        val treeUri = FileUtil.getTreeDocumentUri(result)
+        if (treeUri == null) {
+            MessageDialogFragment.newInstance(
+                this,
+                titleId = R.string.loose_exefs_folder_access,
+                descriptionId = R.string.loose_exefs_folder_access_description,
+                positiveAction = { loadLooseExeFsFolder.launch(null) }
+            ).show(supportFragmentManager, MessageDialogFragment.TAG)
+            return
+        }
+        bootGameUri {
+            FileUtil.getParentUri(treeUri.toString())?.let {
+                GameHelper.findLooseExeFsMain(FileUtil.listFiles(it.toUri()))
+            }
+        }
+    }
+
+    private fun processLooseExeFsFolder(result: Uri) {
+        contentResolver.takePersistableUriPermission(
+            result,
+            Intent.FLAG_GRANT_READ_URI_PERMISSION
+        )
+        bootGameUri { GameHelper.findLooseExeFsMain(FileUtil.listFiles(result)) }
+    }
+
+    // Identifies the game off the main thread (a loose ExeFS indexes its whole RomFS through the
+    // document provider, which takes a while) and boots it.
+    private fun bootGameUri(findGameUri: () -> Uri?) {
+        ProgressDialogFragment.newInstance(this, R.string.loading_game) { _, _ ->
+            val gameUri = findGameUri()
+                ?: return@newInstance MessageDialogFragment.newInstance(
+                    titleId = R.string.load_file_failed,
+                    descriptionId = R.string.loose_exefs_not_found
+                )
+            val game = GameHelper.getGame(gameUri, false)
+                ?: return@newInstance MessageDialogFragment.newInstance(
+                    titleId = R.string.load_file_failed,
+                    descriptionId = R.string.load_file_invalid
+                )
+            withContext(Dispatchers.Main) {
+                val navHostFragment = supportFragmentManager
+                    .findFragmentById(R.id.fragment_container) as NavHostFragment
+                navHostFragment.navController.navigate(
+                    HomeNavigationDirections.actionGlobalEmulationActivity(game, true)
+                )
+            }
+        }.show(supportFragmentManager, ProgressDialogFragment.TAG)
+    }
+
     fun processGamesDir(result: Uri, calledFromGameFragment: Boolean = false) {
         contentResolver.takePersistableUriPermission(
             result,