Android #47

CMakeLists.txt

@@ -49,7 +49,7 @@ option(YUZU_TESTS "Compile tests" "${BUILD_TESTING}")
 
 option(YUZU_USE_PRECOMPILED_HEADERS "Use precompiled headers" ON)
 
-CMAKE_DEPENDENT_OPTION(YUZU_ROOM "Compile LDN room server" ON "NOT ANDROID" OFF)
+cmake_dependent_option(YUZU_ROOM "Compile LDN room server" ON "NOT ANDROID" OFF)
 
 CMAKE_DEPENDENT_OPTION(YUZU_CRASH_DUMPS "Compile Windows crash dump (Minidump) support" OFF "WIN32" OFF)
 
@@ -63,8 +63,6 @@ option(YUZU_DOWNLOAD_TIME_ZONE_DATA "Always download time zone binaries" OFF)
 
 CMAKE_DEPENDENT_OPTION(YUZU_USE_FASTER_LD "Check if a faster linker is available" ON "NOT WIN32" OFF)
 
-CMAKE_DEPENDENT_OPTION(USE_SYSTEM_MOLTENVK "Use the system MoltenVK lib (instead of the bundled one)" OFF "APPLE" OFF)
-
 set(DEFAULT_ENABLE_OPENSSL ON)
 if (ANDROID OR WIN32 OR APPLE)
     # - Windows defaults to the Schannel backend.
@@ -524,7 +522,7 @@ if (ENABLE_SDL2)
     if (YUZU_USE_BUNDLED_SDL2)
         # Detect toolchain and platform
         if ((MSVC_VERSION GREATER_EQUAL 1920 AND MSVC_VERSION LESS 1940) AND ARCHITECTURE_x86_64)
-            set(SDL2_VER "SDL2-2.28.2")
+            set(SDL2_VER "SDL2-2.28.1")
         else()
             message(FATAL_ERROR "No bundled SDL2 binaries for your toolchain. Disable YUZU_USE_BUNDLED_SDL2 and provide your own.")
         endif()

CMakeModules/DownloadExternals.cmake

@@ -36,21 +36,3 @@ endif()
 message(STATUS "Using bundled binaries at ${prefix}")
 set(${prefix_var} "${prefix}" PARENT_SCOPE)
 endfunction()
-
-function(download_moltenvk_external platform version)
-    set(MOLTENVK_DIR "${CMAKE_BINARY_DIR}/externals/MoltenVK")
-    set(MOLTENVK_TAR "${CMAKE_BINARY_DIR}/externals/MoltenVK.tar")
-    if (NOT EXISTS ${MOLTENVK_DIR})
-        if (NOT EXISTS ${MOLTENVK_TAR})
-            file(DOWNLOAD https://github.com/KhronosGroup/MoltenVK/releases/download/${version}/MoltenVK-${platform}.tar
-                ${MOLTENVK_TAR} SHOW_PROGRESS)
-        endif()
-
-        execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf "${MOLTENVK_TAR}"
-            WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/externals")
-    endif()
-
-    # Add the MoltenVK library path to the prefix so find_library can locate it.
-    list(APPEND CMAKE_PREFIX_PATH "${MOLTENVK_DIR}/MoltenVK/dylib/${platform}")
-    set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} PARENT_SCOPE)
-endfunction()

dist/qt_themes/default/style.qss

@@ -78,11 +78,6 @@ QPushButton#buttonRefreshDevices {
     max-height: 21px;
 }
 
-QPushButton#button_reset_defaults {
-    min-width: 57px;
-    padding: 4px 8px;
-}
-
 QWidget#bottomPerGameInput,
 QWidget#topControllerApplet,
 QWidget#bottomControllerApplet,

dist/qt_themes/qdarkstyle_midnight_blue/style.qss

@@ -2228,10 +2228,6 @@ QPushButton#buttonRefreshDevices {
   padding: 0px 0px;
 }
 
-QPushButton#button_reset_defaults {
-    padding: 3px 6px;
-}
-
 QSpinBox#spinboxLStickRange,
 QSpinBox#spinboxRStickRange,
 QSpinBox#vibrationSpinPlayer1,

externals/CMakeLists.txt

@@ -42,11 +42,6 @@ endif()
 # mbedtls
 add_subdirectory(mbedtls)
 target_include_directories(mbedtls PUBLIC ./mbedtls/include)
-if (NOT MSVC)
-    target_compile_options(mbedcrypto PRIVATE
-        -Wno-unused-but-set-variable
-        -Wno-string-concatenation)
-endif()
 
 # MicroProfile
 add_library(microprofile INTERFACE)
@@ -99,12 +94,6 @@ if (ENABLE_CUBEB AND NOT TARGET cubeb::cubeb)
     set(BUILD_TOOLS OFF)
     add_subdirectory(cubeb)
     add_library(cubeb::cubeb ALIAS cubeb)
-    if (NOT MSVC)
-        if (TARGET speex)
-            target_compile_options(speex PRIVATE -Wno-sign-compare)
-        endif()
-        target_compile_options(cubeb PRIVATE -Wno-implicit-const-int-float-conversion)
-    endif()
 endif()
 
 # DiscordRPC
@@ -162,9 +151,6 @@ endif()
 if (NOT TARGET LLVM::Demangle)
     add_library(demangle demangle/ItaniumDemangle.cpp)
     target_include_directories(demangle PUBLIC ./demangle)
-    if (NOT MSVC)
-        target_compile_options(demangle PRIVATE -Wno-deprecated-declarations) # std::is_pod
-    endif()
     add_library(LLVM::Demangle ALIAS demangle)
 endif()
 

externals/ffmpeg/CMakeLists.txt

@@ -164,7 +164,7 @@ if (NOT WIN32 AND NOT ANDROID)
                 --enable-decoder=h264
                 --enable-decoder=vp8
                 --enable-decoder=vp9
-                --enable-filter=yadif,scale
+                --enable-filter=yadif
                 --cc="${FFmpeg_CC}"
                 --cxx="${FFmpeg_CXX}"
                 ${FFmpeg_HWACCEL_FLAGS}
@@ -254,7 +254,7 @@ elseif(ANDROID)
     set(FFmpeg_INCLUDE_DIR "${FFmpeg_INCLUDE_DIR}" PARENT_SCOPE)
 elseif(WIN32)
     # Use yuzu FFmpeg binaries
-    set(FFmpeg_EXT_NAME "ffmpeg-6.0")
+    set(FFmpeg_EXT_NAME "ffmpeg-5.1.3")
     set(FFmpeg_PATH "${CMAKE_BINARY_DIR}/externals/${FFmpeg_EXT_NAME}")
     download_bundled_external("ffmpeg/" ${FFmpeg_EXT_NAME} "")
     set(FFmpeg_FOUND YES)

src/CMakeLists.txt

@@ -114,18 +114,15 @@ else()
         -Wno-attributes
         -Wno-invalid-offsetof
         -Wno-unused-parameter
-    )
 
-    if (CMAKE_CXX_COMPILER_ID MATCHES Clang) # Clang or AppleClang
-        add_compile_options(
-            -Wno-braced-scalar-init
-            -Wno-unused-private-field
-            -Wno-nullability-completeness
-            -Werror=shadow-uncaptured-local
-            -Werror=implicit-fallthrough
-            -Werror=type-limits
-        )
-    endif()
+        $<$<CXX_COMPILER_ID:Clang>:-Wno-braced-scalar-init>
+        $<$<CXX_COMPILER_ID:Clang>:-Wno-unused-private-field>
+        $<$<CXX_COMPILER_ID:Clang>:-Werror=shadow-uncaptured-local>
+        $<$<CXX_COMPILER_ID:Clang>:-Werror=implicit-fallthrough>
+        $<$<CXX_COMPILER_ID:Clang>:-Werror=type-limits>
+        $<$<CXX_COMPILER_ID:AppleClang>:-Wno-braced-scalar-init>
+        $<$<CXX_COMPILER_ID:AppleClang>:-Wno-unused-private-field>
+    )
 
     if (ARCHITECTURE_x86_64)
         add_compile_options("-mcx16")

src/android/app/build.gradle.kts

@@ -95,7 +95,6 @@ android {
         // builds a release build that doesn't need signing
         // Attaches 'debug' suffix to version and package name, allowing installation alongside the release build.
         register("relWithDebInfo") {
-            isDefault = true
             resValue("string", "app_name_suffixed", "yuzu Debug Release")
             signingConfig = signingConfigs.getByName("debug")
             isMinifyEnabled = true
@@ -123,7 +122,6 @@ android {
     flavorDimensions.add("version")
     productFlavors {
         create("mainline") {
-            isDefault = true
             dimension = "version"
             buildConfigField("Boolean", "PREMIUM", "false")
         }
@@ -162,11 +160,6 @@ android {
     }
 }
 
-tasks.create<Delete>("ktlintReset") {
-    delete(File(buildDir.path + File.separator + "intermediates/ktLint"))
-}
-
-tasks.getByPath("loadKtlintReporters").dependsOn("ktlintReset")
 tasks.getByPath("preBuild").dependsOn("ktlintCheck")
 
 ktlint {

src/android/app/src/main/AndroidManifest.xml

@@ -25,7 +25,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
         android:hasFragileUserData="false"
         android:supportsRtl="true"
         android:isGame="true"
-        android:appCategory="game"
         android:localeConfig="@xml/locales_config"
         android:banner="@drawable/tv_banner"
         android:extractNativeLibs="true"
@@ -56,6 +55,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
             android:name="org.yuzu.yuzu_emu.activities.EmulationActivity"
             android:theme="@style/Theme.Yuzu.Main"
             android:launchMode="singleTop"
+            android:screenOrientation="userLandscape"
             android:supportsPictureInPicture="true"
             android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|uiMode"
             android:exported="true">
@@ -66,14 +66,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
                 <data android:mimeType="application/octet-stream" />
             </intent-filter>
 
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data
-                    android:mimeType="application/octet-stream"
-                    android:scheme="content"/>
-            </intent-filter>
-
             <meta-data
                 android:name="android.nfc.action.TECH_DISCOVERED"
                 android:resource="@xml/nfc_tech_filter" />

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

@@ -11,6 +11,7 @@ import android.view.View
 import android.view.ViewGroup.MarginLayoutParams
 import android.widget.Toast
 import androidx.activity.OnBackPressedCallback
+import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.ViewCompat
@@ -245,5 +246,17 @@ class SettingsActivity : AppCompatActivity(), SettingsActivityView {
             settings.putExtra(ARG_GAME_ID, gameId)
             context.startActivity(settings)
         }
+
+        fun launch(
+            context: Context,
+            launcher: ActivityResultLauncher<Intent>,
+            menuTag: String?,
+            gameId: String?
+        ) {
+            val settings = Intent(context, SettingsActivity::class.java)
+            settings.putExtra(ARG_MENU_TAG, menuTag)
+            settings.putExtra(ARG_GAME_ID, gameId)
+            launcher.launch(settings)
+        }
     }
 }

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

@@ -7,11 +7,11 @@ import android.annotation.SuppressLint
 import android.app.AlertDialog
 import android.content.Context
 import android.content.DialogInterface
+import android.content.Intent
 import android.content.SharedPreferences
 import android.content.pm.ActivityInfo
 import android.content.res.Configuration
 import android.graphics.Color
-import android.net.Uri
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
@@ -19,6 +19,8 @@ import android.util.Rational
 import android.view.*
 import android.widget.TextView
 import androidx.activity.OnBackPressedCallback
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.widget.PopupMenu
 import androidx.core.content.res.ResourcesCompat
 import androidx.core.graphics.Insets
@@ -48,7 +50,6 @@ import org.yuzu.yuzu_emu.features.settings.model.IntSetting
 import org.yuzu.yuzu_emu.features.settings.model.Settings
 import org.yuzu.yuzu_emu.features.settings.ui.SettingsActivity
 import org.yuzu.yuzu_emu.features.settings.utils.SettingsFile
-import org.yuzu.yuzu_emu.model.Game
 import org.yuzu.yuzu_emu.overlay.InputOverlay
 import org.yuzu.yuzu_emu.utils.*
 
@@ -61,12 +62,12 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
     private var _binding: FragmentEmulationBinding? = null
     private val binding get() = _binding!!
 
-    private val args by navArgs<EmulationFragmentArgs>()
-
-    private lateinit var game: Game
+    val args by navArgs<EmulationFragmentArgs>()
 
     private var isInFoldableLayout = false
 
+    private lateinit var onReturnFromSettings: ActivityResultLauncher<Intent>
+
     override fun onAttach(context: Context) {
         super.onAttach(context)
         if (context is EmulationActivity) {
@@ -80,6 +81,11 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                         .collect { updateFoldableLayout(context, it) }
                 }
             }
+
+            onReturnFromSettings = context.activityResultRegistry.register(
+                "SettingsResult",
+                ActivityResultContracts.StartActivityForResult()
+            ) { updateScreenLayout() }
         } else {
             throw IllegalStateException("EmulationFragment must have EmulationActivity parent")
         }
@@ -91,25 +97,10 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        val intentUri: Uri? = requireActivity().intent.data
-        var intentGame: Game? = null
-        if (intentUri != null) {
-            intentGame = if (Game.extensions.contains(FileUtil.getExtension(intentUri))) {
-                GameHelper.getGame(requireActivity().intent.data!!, false)
-            } else {
-                null
-            }
-        }
-        game = if (args.game != null) {
-            args.game!!
-        } else {
-            intentGame ?: error("[EmulationFragment] No bootable game present!")
-        }
-
         // So this fragment doesn't restart on configuration changes; i.e. rotation.
         retainInstance = true
         preferences = PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext)
-        emulationState = EmulationState(game.path)
+        emulationState = EmulationState(args.game.path)
     }
 
     /**
@@ -133,7 +124,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
         updateShowFpsOverlay()
 
         binding.inGameMenu.getHeaderView(0).findViewById<TextView>(R.id.text_game_title).text =
-            game.title
+            args.game.title
         binding.inGameMenu.setNavigationItemSelectedListener {
             when (it.itemId) {
                 R.id.menu_pause_emulation -> {
@@ -158,7 +149,12 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                 }
 
                 R.id.menu_settings -> {
-                    SettingsActivity.launch(requireContext(), SettingsFile.FILE_NAME_CONFIG, "")
+                    SettingsActivity.launch(
+                        requireContext(),
+                        onReturnFromSettings,
+                        SettingsFile.FILE_NAME_CONFIG,
+                        ""
+                    )
                     true
                 }
 

src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GameHelper.kt

@@ -11,7 +11,6 @@ import kotlinx.serialization.json.Json
 import org.yuzu.yuzu_emu.NativeLibrary
 import org.yuzu.yuzu_emu.YuzuApplication
 import org.yuzu.yuzu_emu.model.Game
-import org.yuzu.yuzu_emu.model.MinimalDocumentFile
 
 object GameHelper {
     const val KEY_GAME_PATH = "game_path"
@@ -30,7 +29,15 @@ object GameHelper {
         // Ensure keys are loaded so that ROM metadata can be decrypted.
         NativeLibrary.reloadKeys()
 
-        addGamesRecursive(games, FileUtil.listFiles(context, gamesUri), 3)
+        val children = FileUtil.listFiles(context, gamesUri)
+        for (file in children) {
+            if (!file.isDirectory) {
+                // Check that the file has an extension we care about before trying to read out of it.
+                if (Game.extensions.contains(FileUtil.getExtension(file.uri))) {
+                    games.add(getGame(file.uri))
+                }
+            }
+        }
 
         // Cache list of games found on disk
         val serializedGames = mutableSetOf<String>()
@@ -45,31 +52,7 @@ object GameHelper {
         return games.toList()
     }
 
-    private fun addGamesRecursive(
-        games: MutableList<Game>,
-        files: Array<MinimalDocumentFile>,
-        depth: Int
-    ) {
-        if (depth <= 0) {
-            return
-        }
-
-        files.forEach {
-            if (it.isDirectory) {
-                addGamesRecursive(
-                    games,
-                    FileUtil.listFiles(YuzuApplication.appContext, it.uri),
-                    depth - 1
-                )
-            } else {
-                if (Game.extensions.contains(FileUtil.getExtension(it.uri))) {
-                    games.add(getGame(it.uri, true))
-                }
-            }
-        }
-    }
-
-    fun getGame(uri: Uri, addedToLibrary: Boolean): Game {
+    private fun getGame(uri: Uri): Game {
         val filePath = uri.toString()
         var name = NativeLibrary.getTitle(filePath)
 
@@ -94,13 +77,11 @@ object GameHelper {
             NativeLibrary.isHomebrew(filePath)
         )
 
-        if (addedToLibrary) {
-            val addedTime = preferences.getLong(newGame.keyAddedToLibraryTime, 0L)
-            if (addedTime == 0L) {
-                preferences.edit()
-                    .putLong(newGame.keyAddedToLibraryTime, System.currentTimeMillis())
-                    .apply()
-            }
+        val addedTime = preferences.getLong(newGame.keyAddedToLibraryTime, 0L)
+        if (addedTime == 0L) {
+            preferences.edit()
+                .putLong(newGame.keyAddedToLibraryTime, System.currentTimeMillis())
+                .apply()
         }
 
         return newGame

src/android/app/src/main/java/org/yuzu/yuzu_emu/views/FixedRatioSurfaceView.kt

@@ -7,6 +7,7 @@ import android.content.Context
 import android.util.AttributeSet
 import android.util.Rational
 import android.view.SurfaceView
+import kotlin.math.roundToInt
 
 class FixedRatioSurfaceView @JvmOverloads constructor(
     context: Context,
@@ -21,44 +22,27 @@ class FixedRatioSurfaceView @JvmOverloads constructor(
      */
     fun setAspectRatio(ratio: Rational?) {
         aspectRatio = ratio?.toFloat() ?: 0f
-        requestLayout()
     }
 
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-        val displayWidth: Float = MeasureSpec.getSize(widthMeasureSpec).toFloat()
-        val displayHeight: Float = MeasureSpec.getSize(heightMeasureSpec).toFloat()
-        if (aspectRatio != 0f) {
-            val displayAspect = displayWidth / displayHeight
-            if (displayAspect < aspectRatio) {
-                // Max out width
-                val halfHeight = displayHeight / 2
-                val surfaceHeight = displayWidth / aspectRatio
-                val newTop: Float = halfHeight - (surfaceHeight / 2)
-                val newBottom: Float = halfHeight + (surfaceHeight / 2)
-                super.onMeasure(
-                    widthMeasureSpec,
-                    MeasureSpec.makeMeasureSpec(
-                        newBottom.toInt() - newTop.toInt(),
-                        MeasureSpec.EXACTLY
-                    )
-                )
-                return
-            } else {
-                // Max out height
-                val halfWidth = displayWidth / 2
-                val surfaceWidth = displayHeight * aspectRatio
-                val newLeft: Float = halfWidth - (surfaceWidth / 2)
-                val newRight: Float = halfWidth + (surfaceWidth / 2)
-                super.onMeasure(
-                    MeasureSpec.makeMeasureSpec(
-                        newRight.toInt() - newLeft.toInt(),
-                        MeasureSpec.EXACTLY
-                    ),
-                    heightMeasureSpec
-                )
-                return
-            }
-        }
         super.onMeasure(widthMeasureSpec, heightMeasureSpec)
+        val width = MeasureSpec.getSize(widthMeasureSpec)
+        val height = MeasureSpec.getSize(heightMeasureSpec)
+        if (aspectRatio != 0f) {
+            val newWidth: Int
+            val newHeight: Int
+            if (height * aspectRatio < width) {
+                newWidth = (height * aspectRatio).roundToInt()
+                newHeight = height
+            } else {
+                newWidth = width
+                newHeight = (width / aspectRatio).roundToInt()
+            }
+            val left = (width - newWidth) / 2
+            val top = (height - newHeight) / 2
+            setLeftTopRightBottom(left, top, left + newWidth, top + newHeight)
+        } else {
+            setLeftTopRightBottom(0, 0, width, height)
+        }
     }
 }

src/android/app/src/main/jni/config.cpp

@@ -11,7 +11,6 @@
 #include "common/fs/path_util.h"
 #include "common/logging/log.h"
 #include "common/settings.h"
-#include "common/settings_enums.h"
 #include "core/hle/service/acc/profile_manager.h"
 #include "input_common/main.h"
 #include "jni/config.h"
@@ -145,9 +144,7 @@ void Config::ReadValues() {
                                                     Service::Account::MAX_USERS - 1);
 
     // Disable docked mode by default on Android
-    Settings::values.use_docked_mode.SetValue(config->GetBoolean("System", "use_docked_mode", false)
-                                                  ? Settings::ConsoleMode::Docked
-                                                  : Settings::ConsoleMode::Handheld);
+    Settings::values.use_docked_mode = config->GetBoolean("System", "use_docked_mode", false);
 
     const auto rng_seed_enabled = config->GetBoolean("System", "rng_seed_enabled", false);
     if (rng_seed_enabled) {

src/android/app/src/main/jni/native.cpp

@@ -30,7 +30,6 @@
 #include "core/cpu_manager.h"
 #include "core/crypto/key_manager.h"
 #include "core/file_sys/card_image.h"
-#include "core/file_sys/content_archive.h"
 #include "core/file_sys/registered_cache.h"
 #include "core/file_sys/submission_package.h"
 #include "core/file_sys/vfs.h"
@@ -225,42 +224,6 @@ public:
         m_system.Renderer().NotifySurfaceChanged();
     }
 
-    void ConfigureFilesystemProvider(const std::string& filepath) {
-        const auto file = m_system.GetFilesystem()->OpenFile(filepath, FileSys::Mode::Read);
-        if (!file) {
-            return;
-        }
-
-        auto loader = Loader::GetLoader(m_system, file);
-        if (!loader) {
-            return;
-        }
-
-        const auto file_type = loader->GetFileType();
-        if (file_type == Loader::FileType::Unknown || file_type == Loader::FileType::Error) {
-            return;
-        }
-
-        u64 program_id = 0;
-        const auto res2 = loader->ReadProgramId(program_id);
-        if (res2 == Loader::ResultStatus::Success && file_type == Loader::FileType::NCA) {
-            m_manual_provider->AddEntry(FileSys::TitleType::Application,
-                                        FileSys::GetCRTypeFromNCAType(FileSys::NCA{file}.GetType()),
-                                        program_id, file);
-        } else if (res2 == Loader::ResultStatus::Success &&
-                   (file_type == Loader::FileType::XCI || file_type == Loader::FileType::NSP)) {
-            const auto nsp = file_type == Loader::FileType::NSP
-                                 ? std::make_shared<FileSys::NSP>(file)
-                                 : FileSys::XCI{file}.GetSecurePartitionNSP();
-            for (const auto& title : nsp->GetNCAs()) {
-                for (const auto& entry : title.second) {
-                    m_manual_provider->AddEntry(entry.first.first, entry.first.second, title.first,
-                                                entry.second->GetBaseFile());
-                }
-            }
-        }
-    }
-
     Core::SystemResultStatus InitializeEmulation(const std::string& filepath) {
         std::scoped_lock lock(m_mutex);
 
@@ -291,14 +254,8 @@ public:
             std::move(android_keyboard), // Software Keyboard
             nullptr,                     // Web Browser
         });
-
-        // Initialize filesystem.
-        m_manual_provider = std::make_unique<FileSys::ManualContentProvider>();
         m_system.SetContentProvider(std::make_unique<FileSys::ContentProviderUnion>());
-        m_system.RegisterContentProvider(FileSys::ContentProviderUnionSlot::FrontendManual,
-                                         m_manual_provider.get());
         m_system.GetFileSystemController().CreateFactories(*m_vfs);
-        ConfigureFilesystemProvider(filepath);
 
         // Initialize account manager
         m_profile_manager = std::make_unique<Service::Account::ProfileManager>();
@@ -420,7 +377,7 @@ public:
             return false;
         }
 
-        return !Settings::IsDockedMode();
+        return !Settings::values.use_docked_mode.GetValue();
     }
 
     void SetDeviceType([[maybe_unused]] int index, int type) {
@@ -532,7 +489,6 @@ private:
     bool m_is_paused{};
     SoftwareKeyboard::AndroidKeyboard* m_software_keyboard{};
     std::unique_ptr<Service::Account::ProfileManager> m_profile_manager;
-    std::unique_ptr<FileSys::ManualContentProvider> m_manual_provider;
 
     // GPU driver parameters
     std::shared_ptr<Common::DynamicLibrary> m_vulkan_library;

src/android/app/src/main/res/navigation/emulation_navigation.xml

@@ -12,9 +12,7 @@
         tools:layout="@layout/fragment_emulation" >
         <argument
             android:name="game"
-            app:argType="org.yuzu.yuzu_emu.model.Game"
-            app:nullable="true"
-            android:defaultValue="@null" />
+            app:argType="org.yuzu.yuzu_emu.model.Game" />
     </fragment>
 
 </navigation>

src/android/app/src/main/res/navigation/home_navigation.xml

@@ -62,9 +62,7 @@
         android:label="EmulationActivity">
         <argument
             android:name="game"
-            app:argType="org.yuzu.yuzu_emu.model.Game"
-            app:nullable="true"
-            android:defaultValue="@null" />
+            app:argType="org.yuzu.yuzu_emu.model.Game" />
     </activity>
 
     <action

src/audio_core/renderer/system.cpp

@@ -778,7 +778,7 @@ u32 System::DropVoices(CommandBuffer& command_buffer, u32 estimated_process_time
     while (i < command_buffer.count) {
         const auto node_id{cmd->node_id};
         const auto node_id_type{cmd->node_id >> 28};
-        const auto node_id_base{(cmd->node_id >> 16) & 0xFFF};
+        const auto node_id_base{cmd->node_id & 0xFFF};
 
         // If the new estimated process time falls below the limit, we're done dropping.
         if (estimated_process_time <= time_limit) {

src/audio_core/sink/cubeb_sink.cpp

@@ -8,7 +8,6 @@
 #include "audio_core/sink/cubeb_sink.h"
 #include "audio_core/sink/sink_stream.h"
 #include "common/logging/log.h"
-#include "common/scope_exit.h"
 #include "core/core.h"
 
 #ifdef _WIN32
@@ -333,38 +332,25 @@ std::vector<std::string> ListCubebSinkDevices(bool capture) {
     return device_list;
 }
 
-namespace {
-static long TmpDataCallback(cubeb_stream*, void*, const void*, void*, long) {
-    return TargetSampleCount;
-}
-static void TmpStateCallback(cubeb_stream*, void*, cubeb_state) {}
-} // namespace
-
-bool IsCubebSuitable() {
-#if !defined(HAVE_CUBEB)
-    return false;
-#else
-    cubeb* ctx{nullptr};
+u32 GetCubebLatency() {
+    cubeb* ctx;
 
 #ifdef _WIN32
     auto com_init_result = CoInitializeEx(nullptr, COINIT_MULTITHREADED);
 #endif
 
-    // Init cubeb
     if (cubeb_init(&ctx, "yuzu Latency Getter", nullptr) != CUBEB_OK) {
-        LOG_ERROR(Audio_Sink, "Cubeb failed to init, it is not suitable.");
-        return false;
+        LOG_CRITICAL(Audio_Sink, "cubeb_init failed");
+        // Return a large latency so we choose SDL instead.
+        return 10000u;
     }
 
-    SCOPE_EXIT({ cubeb_destroy(ctx); });
-
 #ifdef _WIN32
     if (SUCCEEDED(com_init_result)) {
         CoUninitialize();
     }
 #endif
 
-    // Get min latency
     cubeb_stream_params params{};
     params.rate = TargetSampleRate;
     params.channels = 2;
@@ -375,27 +361,12 @@ bool IsCubebSuitable() {
     u32 latency{0};
     const auto latency_error = cubeb_get_min_latency(ctx, &params, &latency);
     if (latency_error != CUBEB_OK) {
-        LOG_ERROR(Audio_Sink, "Cubeb could not get min latency, it is not suitable.");
-        return false;
+        LOG_CRITICAL(Audio_Sink, "Error getting minimum latency, error: {}", latency_error);
+        latency = TargetSampleCount * 2;
     }
     latency = std::max(latency, TargetSampleCount * 2);
-
-    // Test opening a device with standard parameters
-    cubeb_devid output_device{0};
-    cubeb_devid input_device{0};
-    std::string name{"Yuzu test"};
-    cubeb_stream* stream{nullptr};
-
-    if (cubeb_stream_init(ctx, &stream, name.c_str(), input_device, nullptr, output_device, &params,
-                          latency, &TmpDataCallback, &TmpStateCallback, nullptr) != CUBEB_OK) {
-        LOG_CRITICAL(Audio_Sink, "Cubeb could not open a device, it is not suitable.");
-        return false;
-    }
-
-    cubeb_stream_stop(stream);
-    cubeb_stream_destroy(stream);
-    return true;
-#endif
+    cubeb_destroy(ctx);
+    return latency;
 }
 
 } // namespace AudioCore::Sink

src/audio_core/sink/cubeb_sink.h

@@ -97,11 +97,10 @@ private:
 std::vector<std::string> ListCubebSinkDevices(bool capture);
 
 /**
- * Check if this backend is suitable for use.
- * Checks if enabled, its latency, whether it opens successfully, etc.
+ * Get the reported latency for this sink.
  *
- * @return True is this backend is suitable, false otherwise.
+ * @return Minimum latency for this sink.
  */
-bool IsCubebSuitable();
+u32 GetCubebLatency();
 
 } // namespace AudioCore::Sink

src/audio_core/sink/sdl2_sink.cpp

@@ -9,7 +9,6 @@
 #include "audio_core/sink/sdl2_sink.h"
 #include "audio_core/sink/sink_stream.h"
 #include "common/logging/log.h"
-#include "common/scope_exit.h"
 #include "core/core.h"
 
 namespace AudioCore::Sink {
@@ -85,7 +84,6 @@ public:
         }
 
         Stop();
-        SDL_ClearQueuedAudio(device);
         SDL_CloseAudioDevice(device);
     }
 
@@ -229,42 +227,8 @@ std::vector<std::string> ListSDLSinkDevices(bool capture) {
     return device_list;
 }
 
-bool IsSDLSuitable() {
-#if !defined(HAVE_SDL2)
-    return false;
-#else
-    // Check SDL can init
-    if (!SDL_WasInit(SDL_INIT_AUDIO)) {
-        if (SDL_InitSubSystem(SDL_INIT_AUDIO) < 0) {
-            LOG_ERROR(Audio_Sink, "SDL failed to init, it is not suitable. Error: {}",
-                      SDL_GetError());
-            return false;
-        }
-    }
-
-    // We can set any latency frequency we want with SDL, so no need to check that.
-
-    // Check we can open a device with standard parameters
-    SDL_AudioSpec spec;
-    spec.freq = TargetSampleRate;
-    spec.channels = 2u;
-    spec.format = AUDIO_S16SYS;
-    spec.samples = TargetSampleCount * 2;
-    spec.callback = nullptr;
-    spec.userdata = nullptr;
-
-    SDL_AudioSpec obtained;
-    auto device = SDL_OpenAudioDevice(nullptr, false, &spec, &obtained, false);
-
-    if (device == 0) {
-        LOG_ERROR(Audio_Sink, "SDL failed to open a device, it is not suitable. Error: {}",
-                  SDL_GetError());
-        return false;
-    }
-
-    SDL_CloseAudioDevice(device);
-    return true;
-#endif
+u32 GetSDLLatency() {
+    return TargetSampleCount * 2;
 }
 
 } // namespace AudioCore::Sink

src/audio_core/sink/sdl2_sink.h

@@ -88,11 +88,10 @@ private:
 std::vector<std::string> ListSDLSinkDevices(bool capture);
 
 /**
- * Check if this backend is suitable for use.
- * Checks if enabled, its latency, whether it opens successfully, etc.
+ * Get the reported latency for this sink.
  *
- * @return True is this backend is suitable, false otherwise.
+ * @return Minimum latency for this sink.
  */
-bool IsSDLSuitable();
+u32 GetSDLLatency();
 
 } // namespace AudioCore::Sink

src/audio_core/sink/sink_details.cpp

@@ -22,7 +22,7 @@ namespace {
 struct SinkDetails {
     using FactoryFn = std::unique_ptr<Sink> (*)(std::string_view);
     using ListDevicesFn = std::vector<std::string> (*)(bool);
-    using SuitableFn = bool (*)();
+    using LatencyFn = u32 (*)();
 
     /// Name for this sink.
     Settings::AudioEngine id;
@@ -30,8 +30,8 @@ struct SinkDetails {
     FactoryFn factory;
     /// A method to call to list available devices.
     ListDevicesFn list_devices;
-    /// Check whether this backend is suitable to be used.
-    SuitableFn is_suitable;
+    /// Method to get the latency of this backend.
+    LatencyFn latency;
 };
 
 // sink_details is ordered in terms of desirability, with the best choice at the top.
@@ -43,7 +43,7 @@ constexpr SinkDetails sink_details[] = {
             return std::make_unique<CubebSink>(device_id);
         },
         &ListCubebSinkDevices,
-        &IsCubebSuitable,
+        &GetCubebLatency,
     },
 #endif
 #ifdef HAVE_SDL2
@@ -53,17 +53,14 @@ constexpr SinkDetails sink_details[] = {
             return std::make_unique<SDLSink>(device_id);
         },
         &ListSDLSinkDevices,
-        &IsSDLSuitable,
+        &GetSDLLatency,
     },
 #endif
-    SinkDetails{
-        Settings::AudioEngine::Null,
-        [](std::string_view device_id) -> std::unique_ptr<Sink> {
-            return std::make_unique<NullSink>(device_id);
-        },
-        [](bool capture) { return std::vector<std::string>{"null"}; },
-        []() { return true; },
-    },
+    SinkDetails{Settings::AudioEngine::Null,
+                [](std::string_view device_id) -> std::unique_ptr<Sink> {
+                    return std::make_unique<NullSink>(device_id);
+                },
+                [](bool capture) { return std::vector<std::string>{"null"}; }, []() { return 0u; }},
 };
 
 const SinkDetails& GetOutputSinkDetails(Settings::AudioEngine sink_id) {
@@ -75,22 +72,18 @@ const SinkDetails& GetOutputSinkDetails(Settings::AudioEngine sink_id) {
     auto iter = find_backend(sink_id);
 
     if (sink_id == Settings::AudioEngine::Auto) {
-        // Auto-select a backend. Use the sink details ordering, preferring cubeb first, checking
-        // that the backend is available and suitable to use.
-        for (auto& details : sink_details) {
-            if (details.is_suitable()) {
-                iter = &details;
-                break;
-            }
+        // Auto-select a backend. Prefer CubeB, but it may report a large minimum latency which
+        // causes audio issues, in that case go with SDL.
+#if defined(HAVE_CUBEB) && defined(HAVE_SDL2)
+        iter = find_backend(Settings::AudioEngine::Cubeb);
+        if (iter->latency() > TargetSampleCount * 3) {
+            iter = find_backend(Settings::AudioEngine::Sdl2);
         }
+#else
+        iter = std::begin(sink_details);
+#endif
         LOG_INFO(Service_Audio, "Auto-selecting the {} backend",
                  Settings::CanonicalizeEnum(iter->id));
-    } else {
-        if (iter != std::end(sink_details) && !iter->is_suitable()) {
-            LOG_ERROR(Service_Audio, "Selected backend {} is not suitable, falling back to null",
-                      Settings::CanonicalizeEnum(iter->id));
-            iter = find_backend(Settings::AudioEngine::Null);
-        }
     }
 
     if (iter == std::end(sink_details)) {

src/common/settings.cpp

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <version>
-#include "common/settings_enums.h"
 #if __cpp_lib_chrono >= 201907L
 #include <chrono>
 #include <exception>
@@ -146,10 +145,6 @@ bool IsFastmemEnabled() {
     return true;
 }
 
-bool IsDockedMode() {
-    return values.use_docked_mode.GetValue() == Settings::ConsoleMode::Docked;
-}
-
 float Volume() {
     if (values.audio_muted) {
         return 0.0f;
@@ -212,7 +207,9 @@ const char* TranslateCategory(Category category) {
     return "Miscellaneous";
 }
 
-void TranslateResolutionInfo(ResolutionSetup setup, ResolutionScalingInfo& info) {
+void UpdateRescalingInfo() {
+    const auto setup = values.resolution_setup.GetValue();
+    auto& info = values.resolution_info;
     info.downscale = false;
     switch (setup) {
     case ResolutionSetup::Res1_2X:
@@ -272,12 +269,6 @@ void TranslateResolutionInfo(ResolutionSetup setup, ResolutionScalingInfo& info)
     info.active = info.up_scale != 1 || info.down_shift != 0;
 }
 
-void UpdateRescalingInfo() {
-    const auto setup = values.resolution_setup.GetValue();
-    auto& info = values.resolution_info;
-    TranslateResolutionInfo(setup, info);
-}
-
 void RestoreGlobalState(bool is_powered_on) {
     // If a game is running, DO NOT restore the global settings state
     if (is_powered_on) {

src/common/settings.h

@@ -379,13 +379,7 @@ struct Values {
 
     Setting<s32> current_user{linkage, 0, "current_user", Category::System};
 
-    SwitchableSetting<ConsoleMode> use_docked_mode{linkage,
-                                                   ConsoleMode::Docked,
-                                                   "use_docked_mode",
-                                                   Category::System,
-                                                   Specialization::Radio,
-                                                   true,
-                                                   true};
+    SwitchableSetting<bool> use_docked_mode{linkage, true, "use_docked_mode", Category::System};
 
     // Controls
     InputSetting<std::array<PlayerInput, 10>> players;
@@ -525,15 +519,12 @@ bool IsGPULevelHigh();
 
 bool IsFastmemEnabled();
 
-bool IsDockedMode();
-
 float Volume();
 
 std::string GetTimeZoneString(TimeZone time_zone);
 
 void LogSettings();
 
-void TranslateResolutionInfo(ResolutionSetup setup, ResolutionScalingInfo& info);
 void UpdateRescalingInfo();
 
 // Restore the global state of all applicable settings in the Values struct

src/common/settings_common.h

@@ -56,7 +56,6 @@ enum Specialization : u8 {
     Scalar = 5,      // Values are continuous
     Countable = 6,   // Can be stepped through
     Paired = 7,      // Another setting is associated with this setting
-    Radio = 8,       // Setting should be presented in a radio group
 
     Percentage = (1 << SpecializationAttributeOffset), // Should be represented as a percentage
 };

src/common/settings_enums.h

@@ -146,8 +146,6 @@ ENUM(AntiAliasing, None, Fxaa, Smaa, MaxEnum);
 
 ENUM(AspectRatio, R16_9, R4_3, R21_9, R16_10, Stretch);
 
-ENUM(ConsoleMode, Handheld, Docked);
-
 template <typename Type>
 inline std::string CanonicalizeEnum(Type id) {
     const auto group = EnumMetadata<Type>::Canonicalizations();

src/common/swap.h

@@ -460,6 +460,11 @@ S operator&(const S& i, const swap_struct_t<T, F> v) {
     return i & v.swap();
 }
 
+template <typename S, typename T, typename F>
+S operator&(const swap_struct_t<T, F> v, const S& i) {
+    return static_cast<S>(v.swap() & i);
+}
+
 // Comparison
 template <typename S, typename T, typename F>
 bool operator<(const S& p, const swap_struct_t<T, F> v) {

src/core/file_sys/registered_cache.cpp

@@ -606,9 +606,9 @@ InstallResult RegisteredCache::InstallEntry(const NSP& nsp, bool overwrite_if_ex
     const auto result = RemoveExistingEntry(title_id);
 
     // Install Metadata File
-    const auto meta_result = RawInstallNCA(**meta_iter, copy, overwrite_if_exists, meta_id_data);
-    if (meta_result != InstallResult::Success) {
-        return meta_result;
+    const auto res = RawInstallNCA(**meta_iter, copy, overwrite_if_exists, meta_id_data);
+    if (res != InstallResult::Success) {
+        return res;
     }
 
     // Install all the other NCAs
@@ -621,19 +621,9 @@ InstallResult RegisteredCache::InstallEntry(const NSP& nsp, bool overwrite_if_ex
         if (nca == nullptr) {
             return InstallResult::ErrorCopyFailed;
         }
-        if (nca->GetStatus() == Loader::ResultStatus::ErrorMissingBKTRBaseRomFS &&
-            nca->GetTitleId() != title_id) {
-            // Create fake cnmt for patch to multiprogram application
-            const auto sub_nca_result =
-                InstallEntry(*nca, TitleType::Update, overwrite_if_exists, copy);
-            if (sub_nca_result != InstallResult::Success) {
-                return sub_nca_result;
-            }
-            continue;
-        }
-        const auto nca_result = RawInstallNCA(*nca, copy, overwrite_if_exists, record.nca_id);
-        if (nca_result != InstallResult::Success) {
-            return nca_result;
+        const auto res2 = RawInstallNCA(*nca, copy, overwrite_if_exists, record.nca_id);
+        if (res2 != InstallResult::Success) {
+            return res2;
         }
     }
 
@@ -673,8 +663,6 @@ InstallResult RegisteredCache::InstallEntry(const NCA& nca, TitleType type,
 }
 
 bool RegisteredCache::RemoveExistingEntry(u64 title_id) const {
-    bool removed_data = false;
-
     const auto delete_nca = [this](const NcaID& id) {
         const auto path = GetRelativePathFromNcaID(id, false, true, false);
 
@@ -718,18 +706,11 @@ bool RegisteredCache::RemoveExistingEntry(u64 title_id) const {
         const auto deleted_html = delete_nca(html_id);
         const auto deleted_legal = delete_nca(legal_id);
 
-        removed_data |= (deleted_meta || deleted_program || deleted_data || deleted_control ||
-                         deleted_html || deleted_legal);
+        return deleted_meta && (deleted_meta || deleted_program || deleted_data ||
+                                deleted_control || deleted_html || deleted_legal);
     }
 
-    // If patch entries for any program exist in yuzu meta, remove them
-    for (u8 i = 0; i < 0x10; i++) {
-        const auto meta_dir = dir->CreateDirectoryRelative("yuzu_meta");
-        const auto filename = GetCNMTName(TitleType::Update, title_id + i);
-        removed_data |= meta_dir->DeleteFile(filename);
-    }
-
-    return removed_data;
+    return false;
 }
 
 InstallResult RegisteredCache::RawInstallNCA(const NCA& nca, const VfsCopyFunction& copy,

src/core/frontend/applets/controller.cpp

@@ -3,8 +3,6 @@
 
 #include "common/assert.h"
 #include "common/logging/log.h"
-#include "common/settings.h"
-#include "common/settings_enums.h"
 #include "core/frontend/applets/controller.h"
 #include "core/hid/emulated_controller.h"
 #include "core/hid/hid_core.h"
@@ -64,7 +62,7 @@ void DefaultControllerApplet::ReconfigureControllers(ReconfigureCallback callbac
                 controller->Connect(true);
             }
         } else if (index == 0 && parameters.enable_single_mode && parameters.allow_handheld &&
-                   !Settings::IsDockedMode()) {
+                   !Settings::values.use_docked_mode.GetValue()) {
             // We should *never* reach here under any normal circumstances.
             controller->SetNpadStyleIndex(Core::HID::NpadStyleIndex::Handheld);
             controller->Connect(true);

src/core/frontend/framebuffer_layout.cpp

@@ -5,7 +5,6 @@
 
 #include "common/assert.h"
 #include "common/settings.h"
-#include "common/settings_enums.h"
 #include "core/frontend/framebuffer_layout.h"
 
 namespace Layout {
@@ -50,7 +49,7 @@ FramebufferLayout DefaultFrameLayout(u32 width, u32 height) {
 }
 
 FramebufferLayout FrameLayoutFromResolutionScale(f32 res_scale) {
-    const bool is_docked = Settings::IsDockedMode();
+    const bool is_docked = Settings::values.use_docked_mode.GetValue();
     const u32 screen_width = is_docked ? ScreenDocked::Width : ScreenUndocked::Width;
     const u32 screen_height = is_docked ? ScreenDocked::Height : ScreenUndocked::Height;
 

src/core/hle/kernel/k_process.cpp

@@ -38,7 +38,7 @@ namespace {
  */
 void SetupMainThread(Core::System& system, KProcess& owner_process, u32 priority,
                      KProcessAddress stack_top) {
-    const KProcessAddress entry_point = owner_process.GetEntryPoint();
+    const KProcessAddress entry_point = owner_process.GetPageTable().GetCodeRegionStart();
     ASSERT(owner_process.GetResourceLimit()->Reserve(LimitableResource::ThreadCountMax, 1));
 
     KThread* thread = KThread::Create(system.Kernel());
@@ -358,21 +358,6 @@ Result KProcess::LoadFromMetadata(const FileSys::ProgramMetadata& metadata, std:
     m_system_resource_size = metadata.GetSystemResourceSize();
     m_image_size = code_size;
 
-    if (metadata.GetAddressSpaceType() == FileSys::ProgramAddressSpaceType::Is39Bit) {
-        // For 39-bit processes, the ASLR region starts at 0x800'0000 and is ~512GiB large.
-        // However, some (buggy) programs/libraries like skyline incorrectly depend on the
-        // existence of ASLR pages before the entry point, so we will adjust the load address
-        // to point to about 2GiB into the ASLR region.
-        m_code_address = 0x8000'0000;
-    } else {
-        // All other processes can be mapped at the beginning of the code region.
-        if (metadata.GetAddressSpaceType() == FileSys::ProgramAddressSpaceType::Is36Bit) {
-            m_code_address = 0x800'0000;
-        } else {
-            m_code_address = 0x20'0000;
-        }
-    }
-
     KScopedResourceReservation memory_reservation(
         m_resource_limit, LimitableResource::PhysicalMemoryMax, code_size + m_system_resource_size);
     if (!memory_reservation.Succeeded()) {
@@ -383,15 +368,15 @@ Result KProcess::LoadFromMetadata(const FileSys::ProgramMetadata& metadata, std:
     // Initialize process address space
     if (const Result result{m_page_table.InitializeForProcess(
             metadata.GetAddressSpaceType(), false, false, false, KMemoryManager::Pool::Application,
-            this->GetEntryPoint(), code_size, std::addressof(m_kernel.GetAppSystemResource()),
-            m_resource_limit, m_kernel.System().ApplicationMemory())};
+            0x8000000, code_size, std::addressof(m_kernel.GetAppSystemResource()), m_resource_limit,
+            m_kernel.System().ApplicationMemory())};
         result.IsError()) {
         R_RETURN(result);
     }
 
     // Map process code region
-    if (const Result result{m_page_table.MapProcessCode(this->GetEntryPoint(), code_size / PageSize,
-                                                        KMemoryState::Code,
+    if (const Result result{m_page_table.MapProcessCode(m_page_table.GetCodeRegionStart(),
+                                                        code_size / PageSize, KMemoryState::Code,
                                                         KMemoryPermission::None)};
         result.IsError()) {
         R_RETURN(result);

src/core/hle/kernel/k_process.h

@@ -177,10 +177,6 @@ public:
         return m_program_id;
     }
 
-    KProcessAddress GetEntryPoint() const {
-        return m_code_address;
-    }
-
     /// Gets the resource limit descriptor for this process
     KResourceLimit* GetResourceLimit() const;
 
@@ -489,9 +485,6 @@ private:
     /// Address indicating the location of the process' dedicated TLS region.
     KProcessAddress m_plr_address = 0;
 
-    /// Address indicating the location of the process's entry point.
-    KProcessAddress m_code_address = 0;
-
     /// Random values for svcGetInfo RandomEntropy
     std::array<u64, RANDOM_ENTROPY_SIZE> m_random_entropy{};
 

src/core/hle/service/am/am.cpp

@@ -6,7 +6,6 @@
 #include <cinttypes>
 #include <cstring>
 #include "common/settings.h"
-#include "common/settings_enums.h"
 #include "core/core.h"
 #include "core/file_sys/control_metadata.h"
 #include "core/file_sys/patch_manager.h"
@@ -834,7 +833,7 @@ void ICommonStateGetter::GetDefaultDisplayResolution(HLERequestContext& ctx) {
     IPC::ResponseBuilder rb{ctx, 4};
     rb.Push(ResultSuccess);
 
-    if (Settings::IsDockedMode()) {
+    if (Settings::values.use_docked_mode.GetValue()) {
         rb.Push(static_cast<u32>(Service::VI::DisplayResolution::DockedWidth));
         rb.Push(static_cast<u32>(Service::VI::DisplayResolution::DockedHeight));
     } else {
@@ -922,7 +921,7 @@ void IStorage::Open(HLERequestContext& ctx) {
 }
 
 void ICommonStateGetter::GetOperationMode(HLERequestContext& ctx) {
-    const bool use_docked_mode{Settings::IsDockedMode()};
+    const bool use_docked_mode{Settings::values.use_docked_mode.GetValue()};
     LOG_DEBUG(Service_AM, "called, use_docked_mode={}", use_docked_mode);
 
     IPC::ResponseBuilder rb{ctx, 3};

src/core/hle/service/apm/apm_controller.cpp

@@ -7,7 +7,6 @@
 
 #include "common/logging/log.h"
 #include "common/settings.h"
-#include "common/settings_enums.h"
 #include "core/core_timing.h"
 #include "core/hle/service/apm/apm_controller.h"
 
@@ -68,7 +67,8 @@ void Controller::SetFromCpuBoostMode(CpuBoostMode mode) {
 }
 
 PerformanceMode Controller::GetCurrentPerformanceMode() const {
-    return Settings::IsDockedMode() ? PerformanceMode::Boost : PerformanceMode::Normal;
+    return Settings::values.use_docked_mode.GetValue() ? PerformanceMode::Boost
+                                                       : PerformanceMode::Normal;
 }
 
 PerformanceConfiguration Controller::GetCurrentPerformanceConfiguration(PerformanceMode mode) {

src/core/hle/service/audio/hwopus.cpp

@@ -174,7 +174,7 @@ public:
             {6, &IHardwareOpusDecoderManager::DecodeInterleaved, "DecodeInterleavedWithPerfAndResetOld"},
             {7, nullptr, "DecodeInterleavedForMultiStreamWithPerfAndResetOld"},
             {8, &IHardwareOpusDecoderManager::DecodeInterleaved, "DecodeInterleaved"},
-            {9, &IHardwareOpusDecoderManager::DecodeInterleavedForMultiStream, "DecodeInterleavedForMultiStream"},
+            {9, nullptr, "DecodeInterleavedForMultiStream"},
         };
         // clang-format on
 
@@ -206,16 +206,6 @@ private:
         decoder_state.DecodeInterleaved(ctx, OpusDecoderState::PerfTime::Enabled, extra_behavior);
     }
 
-    void DecodeInterleavedForMultiStream(HLERequestContext& ctx) {
-        LOG_DEBUG(Audio, "called");
-
-        IPC::RequestParser rp{ctx};
-        const auto extra_behavior = rp.Pop<bool>() ? OpusDecoderState::ExtraBehavior::ResetContext
-                                                   : OpusDecoderState::ExtraBehavior::None;
-
-        decoder_state.DecodeInterleaved(ctx, OpusDecoderState::PerfTime::Enabled, extra_behavior);
-    }
-
     OpusDecoderState decoder_state;
 };
 
@@ -364,40 +354,6 @@ void HwOpus::OpenHardwareOpusDecoderEx(HLERequestContext& ctx) {
         system, OpusDecoderState{std::move(decoder), sample_rate, channel_count});
 }
 
-void HwOpus::OpenHardwareOpusDecoderForMultiStreamEx(HLERequestContext& ctx) {
-    OpusMultiStreamParametersEx params;
-    std::memcpy(&params, ctx.ReadBuffer().data(), ctx.GetReadBufferSize());
-
-    const auto& sample_rate = params.sample_rate;
-    const auto& channel_count = params.channel_count;
-
-    LOG_INFO(
-        Audio,
-        "called with sample_rate={}, channel_count={}, number_streams={}, number_stereo_streams={}",
-        sample_rate, channel_count, params.number_streams, params.number_stereo_streams);
-
-    ASSERT_MSG(sample_rate == 48000 || sample_rate == 24000 || sample_rate == 16000 ||
-                   sample_rate == 12000 || sample_rate == 8000,
-               "Invalid sample rate");
-
-    int error = 0;
-    OpusDecoderPtr decoder{opus_multistream_decoder_create(
-        sample_rate, static_cast<int>(channel_count), params.number_streams,
-        params.number_stereo_streams, params.channel_mappings.data(), &error)};
-    if (error != OPUS_OK || decoder == nullptr) {
-        LOG_ERROR(Audio, "Failed to create Opus decoder (error={}).", error);
-        IPC::ResponseBuilder rb{ctx, 2};
-        // TODO(ogniK): Use correct error code
-        rb.Push(ResultUnknown);
-        return;
-    }
-
-    IPC::ResponseBuilder rb{ctx, 2, 0, 1};
-    rb.Push(ResultSuccess);
-    rb.PushIpcInterface<IHardwareOpusDecoderManager>(
-        system, OpusDecoderState{std::move(decoder), sample_rate, channel_count});
-}
-
 HwOpus::HwOpus(Core::System& system_) : ServiceFramework{system_, "hwopus"} {
     static const FunctionInfo functions[] = {
         {0, &HwOpus::OpenHardwareOpusDecoder, "OpenHardwareOpusDecoder"},
@@ -406,8 +362,7 @@ HwOpus::HwOpus(Core::System& system_) : ServiceFramework{system_, "hwopus"} {
         {3, nullptr, "GetWorkBufferSizeForMultiStream"},
         {4, &HwOpus::OpenHardwareOpusDecoderEx, "OpenHardwareOpusDecoderEx"},
         {5, &HwOpus::GetWorkBufferSizeEx, "GetWorkBufferSizeEx"},
-        {6, &HwOpus::OpenHardwareOpusDecoderForMultiStreamEx,
-         "OpenHardwareOpusDecoderForMultiStreamEx"},
+        {6, nullptr, "OpenHardwareOpusDecoderForMultiStreamEx"},
         {7, &HwOpus::GetWorkBufferSizeForMultiStreamEx, "GetWorkBufferSizeForMultiStreamEx"},
         {8, nullptr, "GetWorkBufferSizeExEx"},
         {9, nullptr, "GetWorkBufferSizeForMultiStreamExEx"},

src/core/hle/service/audio/hwopus.h

@@ -18,10 +18,8 @@ struct OpusMultiStreamParametersEx {
     u32 number_stereo_streams;
     u32 use_large_frame_size;
     u32 padding;
-    std::array<u8, 0x100> channel_mappings;
+    std::array<u32, 64> channel_mappings;
 };
-static_assert(sizeof(OpusMultiStreamParametersEx) == 0x118,
-              "OpusMultiStreamParametersEx has incorrect size");
 
 class HwOpus final : public ServiceFramework<HwOpus> {
 public:
@@ -31,7 +29,6 @@ public:
 private:
     void OpenHardwareOpusDecoder(HLERequestContext& ctx);
     void OpenHardwareOpusDecoderEx(HLERequestContext& ctx);
-    void OpenHardwareOpusDecoderForMultiStreamEx(HLERequestContext& ctx);
     void GetWorkBufferSize(HLERequestContext& ctx);
     void GetWorkBufferSizeEx(HLERequestContext& ctx);
     void GetWorkBufferSizeForMultiStreamEx(HLERequestContext& ctx);

src/core/hle/service/filesystem/filesystem.cpp

@@ -4,7 +4,6 @@
 #include <utility>
 
 #include "common/assert.h"
-#include "common/fs/fs.h"
 #include "common/fs/path_util.h"
 #include "common/settings.h"
 #include "core/core.h"
@@ -155,18 +154,10 @@ Result VfsDirectoryServiceWrapper::RenameFile(const std::string& src_path_,
     std::string src_path(Common::FS::SanitizePath(src_path_));
     std::string dest_path(Common::FS::SanitizePath(dest_path_));
     auto src = backing->GetFileRelative(src_path);
-    auto dst = backing->GetFileRelative(dest_path);
     if (Common::FS::GetParentPath(src_path) == Common::FS::GetParentPath(dest_path)) {
         // Use more-optimized vfs implementation rename.
-        if (src == nullptr) {
+        if (src == nullptr)
             return FileSys::ERROR_PATH_NOT_FOUND;
-        }
-
-        if (dst && Common::FS::Exists(dst->GetFullPath())) {
-            LOG_ERROR(Service_FS, "File at new_path={} already exists", dst->GetFullPath());
-            return FileSys::ERROR_PATH_ALREADY_EXISTS;
-        }
-
         if (!src->Rename(Common::FS::GetFilename(dest_path))) {
             // TODO(DarkLordZach): Find a better error code for this
             return ResultUnknown;

src/core/hle/service/hid/controllers/gesture.cpp

@@ -331,7 +331,7 @@ Controller_Gesture::GestureProperties Controller_Gesture::GetGestureProperties()
         };
 
         // Hack: There is no touch in docked but games still allow it
-        if (Settings::IsDockedMode()) {
+        if (Settings::values.use_docked_mode.GetValue()) {
             gesture.points[id] = {
                 .x = static_cast<s32>(active_x * Layout::ScreenDocked::Width),
                 .y = static_cast<s32>(active_y * Layout::ScreenDocked::Height),

src/core/hle/service/hid/controllers/npad.cpp

@@ -1518,7 +1518,7 @@ bool Controller_NPad::IsControllerSupported(Core::HID::NpadStyleIndex controller
             return false;
         }
         // Handheld shouldn't be supported in docked mode
-        if (Settings::IsDockedMode()) {
+        if (Settings::values.use_docked_mode.GetValue()) {
             return false;
         }
 

src/core/hle/service/nvdrv/devices/nvhost_as_gpu.cpp

@@ -204,11 +204,9 @@ void nvhost_as_gpu::FreeMappingLocked(u64 offset) {
     if (!mapping->fixed) {
         auto& allocator{mapping->big_page ? *vm.big_page_allocator : *vm.small_page_allocator};
         u32 page_size_bits{mapping->big_page ? vm.big_page_size_bits : VM::PAGE_SIZE_BITS};
-        u32 page_size{mapping->big_page ? vm.big_page_size : VM::YUZU_PAGESIZE};
-        u64 aligned_size{Common::AlignUp(mapping->size, page_size)};
 
         allocator.Free(static_cast<u32>(mapping->offset >> page_size_bits),
-                       static_cast<u32>(aligned_size >> page_size_bits));
+                       static_cast<u32>(mapping->size >> page_size_bits));
     }
 
     // Sparse mappings shouldn't be fully unmapped, just returned to their sparse state

src/core/hle/service/service.h

@@ -79,8 +79,8 @@ protected:
     using HandlerFnP = void (Self::*)(HLERequestContext&);
 
     /// Used to gain exclusive access to the service members, e.g. from CoreTiming thread.
-    [[nodiscard]] virtual std::unique_lock<std::mutex> LockService() {
-        return std::unique_lock{lock_service};
+    [[nodiscard]] std::scoped_lock<std::mutex> LockService() {
+        return std::scoped_lock{lock_service};
     }
 
     /// System context that the service operates under.

src/core/hle/service/sockets/bsd.cpp

@@ -1029,11 +1029,6 @@ BSD::~BSD() {
     }
 }
 
-std::unique_lock<std::mutex> BSD::LockService() {
-    // Do not lock socket IClient instances.
-    return {};
-}
-
 BSDCFG::BSDCFG(Core::System& system_) : ServiceFramework{system_, "bsdcfg"} {
     // clang-format off
     static const FunctionInfo functions[] = {

src/core/hle/service/sockets/bsd.h

@@ -186,9 +186,6 @@ private:
 
     // Callback identifier for the OnProxyPacketReceived event.
     Network::RoomMember::CallbackHandle<Network::ProxyPacket> proxy_packet_received;
-
-protected:
-    virtual std::unique_lock<std::mutex> LockService() override;
 };
 
 class BSDCFG final : public ServiceFramework<BSDCFG> {

src/core/hle/service/sockets/nsd.cpp

@@ -19,12 +19,6 @@ enum class ServerEnvironmentType : u8 {
     Dp,
 };
 
-// This is nn::nsd::EnvironmentIdentifier
-struct EnvironmentIdentifier {
-    std::array<u8, 8> identifier;
-};
-static_assert(sizeof(EnvironmentIdentifier) == 0x8);
-
 NSD::NSD(Core::System& system_, const char* name) : ServiceFramework{system_, name} {
     // clang-format off
     static const FunctionInfo functions[] = {
@@ -107,9 +101,8 @@ void NSD::ResolveEx(HLERequestContext& ctx) {
 }
 
 void NSD::GetEnvironmentIdentifier(HLERequestContext& ctx) {
-    constexpr EnvironmentIdentifier lp1 = {
-        .identifier = {'l', 'p', '1', '\0', '\0', '\0', '\0', '\0'}};
-    ctx.WriteBuffer(lp1);
+    const std::string environment_identifier = "lp1";
+    ctx.WriteBuffer(environment_identifier);
 
     IPC::ResponseBuilder rb{ctx, 2};
     rb.Push(ResultSuccess);

src/core/hle/service/sockets/sfdnsres.cpp

@@ -150,12 +150,6 @@ static std::pair<u32, GetAddrInfoError> GetHostByNameRequestImpl(HLERequestConte
     const std::string host = Common::StringFromBuffer(host_buffer);
     // For now, ignore options, which are in input buffer 1 for GetHostByNameRequestWithOptions.
 
-    // Prevent resolution of Nintendo servers
-    if (host.find("srv.nintendo.net") != std::string::npos) {
-        LOG_WARNING(Network, "Resolution of hostname {} requested, returning EAI_AGAIN", host);
-        return {0, GetAddrInfoError::AGAIN};
-    }
-
     auto res = Network::GetAddressInfo(host, /*service*/ std::nullopt);
     if (!res.has_value()) {
         return {0, Translate(res.error())};
@@ -267,12 +261,6 @@ static std::pair<u32, GetAddrInfoError> GetAddrInfoRequestImpl(HLERequestContext
     const auto host_buffer = ctx.ReadBuffer(0);
     const std::string host = Common::StringFromBuffer(host_buffer);
 
-    // Prevent resolution of Nintendo servers
-    if (host.find("srv.nintendo.net") != std::string::npos) {
-        LOG_WARNING(Network, "Resolution of hostname {} requested, returning EAI_AGAIN", host);
-        return {0, GetAddrInfoError::AGAIN};
-    }
-
     std::optional<std::string> service = std::nullopt;
     if (ctx.CanReadBuffer(1)) {
         const std::span<const u8> service_buffer = ctx.ReadBuffer(1);

src/core/hle/service/ssl/ssl.cpp

@@ -139,6 +139,7 @@ private:
     bool do_not_close_socket = false;
     bool get_server_cert_chain = false;
     std::shared_ptr<Network::SocketBase> socket;
+    bool did_set_host_name = false;
     bool did_handshake = false;
 
     Result SetSocketDescriptorImpl(s32* out_fd, s32 fd) {
@@ -173,7 +174,11 @@ private:
     Result SetHostNameImpl(const std::string& hostname) {
         LOG_DEBUG(Service_SSL, "called. hostname={}", hostname);
         ASSERT(!did_handshake);
-        return backend->SetHostName(hostname);
+        Result res = backend->SetHostName(hostname);
+        if (res == ResultSuccess) {
+            did_set_host_name = true;
+        }
+        return res;
     }
 
     Result SetVerifyOptionImpl(u32 option) {
@@ -203,6 +208,9 @@ private:
 
     Result DoHandshakeImpl() {
         ASSERT_OR_EXECUTE(!did_handshake && socket, { return ResultNoSocket; });
+        ASSERT_OR_EXECUTE_MSG(
+            did_set_host_name, { return ResultInternalError; },
+            "Expected SetHostName before DoHandshake");
         Result res = backend->DoHandshake();
         did_handshake = res.IsSuccess();
         return res;

src/core/hle/service/ssl/ssl_backend_openssl.cpp

@@ -167,8 +167,9 @@ public:
     }
 
     ~SSLConnectionBackendOpenSSL() {
-        // this is null-tolerant:
+        // these are null-tolerant:
         SSL_free(ssl);
+        BIO_free(bio);
     }
 
     static void KeyLogCallback(const SSL* ssl, const char* line) {

src/core/hle/service/ssl/ssl_backend_schannel.cpp

@@ -31,9 +31,9 @@ CredHandle cred_handle;
 static void OneTimeInit() {
     schannel_cred.dwVersion = SCHANNEL_CRED_VERSION;
     schannel_cred.dwFlags =
-        SCH_USE_STRONG_CRYPTO |        // don't allow insecure protocols
-        SCH_CRED_NO_SERVERNAME_CHECK | // don't validate server names
-        SCH_CRED_NO_DEFAULT_CREDS;     // don't automatically present a client certificate
+        SCH_USE_STRONG_CRYPTO |         // don't allow insecure protocols
+        SCH_CRED_AUTO_CRED_VALIDATION | // validate certs
+        SCH_CRED_NO_DEFAULT_CREDS;      // don't automatically present a client certificate
     // ^ I'm assuming that nobody would want to connect Yuzu to a
     // service that requires some OS-provided corporate client
     // certificate, and presenting one to some arbitrary server
@@ -227,15 +227,16 @@ public:
                       ciphertext_read_buf.size());
         }
 
-        char* hostname_ptr = hostname ? const_cast<char*>(hostname->c_str()) : nullptr;
-        const SECURITY_STATUS ret = InitializeSecurityContextA(
-            &cred_handle, initial_call_done ? &ctxt : nullptr, hostname_ptr, req,
-            0, // Reserved1
-            0, // TargetDataRep not used with Schannel
-            initial_call_done ? &input_desc : nullptr,
-            0, // Reserved2
-            initial_call_done ? nullptr : &ctxt, &output_desc, &attr,
-            nullptr); // ptsExpiry
+        const SECURITY_STATUS ret =
+            InitializeSecurityContextA(&cred_handle, initial_call_done ? &ctxt : nullptr,
+                                       // Caller ensured we have set a hostname:
+                                       const_cast<char*>(hostname.value().c_str()), req,
+                                       0, // Reserved1
+                                       0, // TargetDataRep not used with Schannel
+                                       initial_call_done ? &input_desc : nullptr,
+                                       0, // Reserved2
+                                       initial_call_done ? nullptr : &ctxt, &output_desc, &attr,
+                                       nullptr); // ptsExpiry
 
         if (output_buffers[0].pvBuffer) {
             const std::span span(static_cast<u8*>(output_buffers[0].pvBuffer),

src/core/hle/service/vi/vi.cpp

@@ -217,7 +217,7 @@ private:
         IPC::ResponseBuilder rb{ctx, 6};
         rb.Push(ResultSuccess);
 
-        if (Settings::IsDockedMode()) {
+        if (Settings::values.use_docked_mode.GetValue()) {
             rb.Push(static_cast<u32>(Service::VI::DisplayResolution::DockedWidth));
             rb.Push(static_cast<u32>(Service::VI::DisplayResolution::DockedHeight));
         } else {

src/core/loader/deconstructed_rom_directory.cpp

@@ -153,7 +153,7 @@ AppLoader_DeconstructedRomDirectory::LoadResult AppLoader_DeconstructedRomDirect
 
     // Load NSO modules
     modules.clear();
-    const VAddr base_address{GetInteger(process.GetEntryPoint())};
+    const VAddr base_address{GetInteger(process.GetPageTable().GetCodeRegionStart())};
     VAddr next_load_addr{base_address};
     const FileSys::PatchManager pm{metadata.GetTitleID(), system.GetFileSystemController(),
                                    system.GetContentProvider()};

src/core/loader/kip.cpp

@@ -96,7 +96,7 @@ AppLoader::LoadResult AppLoader_KIP::Load(Kernel::KProcess& process,
     }
 
     codeset.memory = std::move(program_image);
-    const VAddr base_address = GetInteger(process.GetEntryPoint());
+    const VAddr base_address = GetInteger(process.GetPageTable().GetCodeRegionStart());
     process.LoadModule(std::move(codeset), base_address);
 
     LOG_DEBUG(Loader, "loaded module {} @ 0x{:X}", kip->GetName(), base_address);

src/core/loader/nro.cpp

@@ -203,7 +203,7 @@ static bool LoadNroImpl(Kernel::KProcess& process, const std::vector<u8>& data)
 
     // Load codeset for current process
     codeset.memory = std::move(program_image);
-    process.LoadModule(std::move(codeset), process.GetEntryPoint());
+    process.LoadModule(std::move(codeset), process.GetPageTable().GetCodeRegionStart());
 
     return true;
 }

src/core/loader/nso.cpp

@@ -167,7 +167,7 @@ AppLoader_NSO::LoadResult AppLoader_NSO::Load(Kernel::KProcess& process, Core::S
     modules.clear();
 
     // Load module
-    const VAddr base_address = GetInteger(process.GetEntryPoint());
+    const VAddr base_address = GetInteger(process.GetPageTable().GetCodeRegionStart());
     if (!LoadModule(process, system, *file, base_address, true, true)) {
         return {ResultStatus::ErrorLoadingNSO, {}};
     }

src/core/reporter.cpp

@@ -117,8 +117,8 @@ json GetProcessorStateDataAuto(Core::System& system) {
     arm.SaveContext(context);
 
     return GetProcessorStateData(process->Is64BitProcess() ? "AArch64" : "AArch32",
-                                 GetInteger(process->GetEntryPoint()), context.sp, context.pc,
-                                 context.pstate, context.cpu_registers);
+                                 GetInteger(process->GetPageTable().GetCodeRegionStart()),
+                                 context.sp, context.pc, context.pstate, context.cpu_registers);
 }
 
 json GetBacktraceData(Core::System& system) {

src/core/telemetry_session.cpp

@@ -14,7 +14,6 @@
 #include "common/logging/log.h"
 
 #include "common/settings.h"
-#include "common/settings_enums.h"
 #include "core/file_sys/control_metadata.h"
 #include "core/file_sys/patch_manager.h"
 #include "core/loader/loader.h"
@@ -276,7 +275,7 @@ void TelemetrySession::AddInitialInfo(Loader::AppLoader& app_loader,
              static_cast<u32>(Settings::values.shader_backend.GetValue()));
     AddField(field_type, "Renderer_UseAsynchronousShaders",
              Settings::values.use_asynchronous_shaders.GetValue());
-    AddField(field_type, "System_UseDockedMode", Settings::IsDockedMode());
+    AddField(field_type, "System_UseDockedMode", Settings::values.use_docked_mode.GetValue());
 }
 
 bool TelemetrySession::SubmitTestcase() {

src/input_common/input_poller.cpp

@@ -835,15 +835,15 @@ public:
         return input_engine->SupportsNfc(identifier);
     }
 
-    Common::Input::NfcState StartNfcPolling() override {
+    Common::Input::NfcState StartNfcPolling() {
         return input_engine->StartNfcPolling(identifier);
     }
 
-    Common::Input::NfcState StopNfcPolling() override {
+    Common::Input::NfcState StopNfcPolling() {
         return input_engine->StopNfcPolling(identifier);
     }
 
-    Common::Input::NfcState ReadAmiiboData(std::vector<u8>& out_data) override {
+    Common::Input::NfcState ReadAmiiboData(std::vector<u8>& out_data) {
         return input_engine->ReadAmiiboData(identifier, out_data);
     }
 
@@ -852,11 +852,11 @@ public:
     }
 
     Common::Input::NfcState ReadMifareData(const Common::Input::MifareRequest& request,
-                                           Common::Input::MifareRequest& out_data) override {
+                                           Common::Input::MifareRequest& out_data) {
         return input_engine->ReadMifareData(identifier, request, out_data);
     }
 
-    Common::Input::NfcState WriteMifareData(const Common::Input::MifareRequest& request) override {
+    Common::Input::NfcState WriteMifareData(const Common::Input::MifareRequest& request) {
         return input_engine->WriteMifareData(identifier, request);
     }
 

src/shader_recompiler/backend/glasm/emit_glasm_image.cpp

@@ -558,15 +558,12 @@ void EmitImageGradient(EmitContext& ctx, IR::Inst& inst, const IR::Value& index,
                        const IR::Value& coord, const IR::Value& derivatives,
                        const IR::Value& offset, const IR::Value& lod_clamp) {
     const auto info{inst.Flags<IR::TextureInstInfo>()};
-    ScopedRegister dpdx, dpdy, coords;
+    ScopedRegister dpdx, dpdy;
     const bool multi_component{info.num_derivates > 1 || info.has_lod_clamp};
     if (multi_component) {
         // Allocate this early to avoid aliasing other registers
         dpdx = ScopedRegister{ctx.reg_alloc};
         dpdy = ScopedRegister{ctx.reg_alloc};
-        if (info.num_derivates >= 3) {
-            coords = ScopedRegister{ctx.reg_alloc};
-        }
     }
     const auto sparse_inst{PrepareSparse(inst)};
     const std::string_view sparse_mod{sparse_inst ? ".SPARSE" : ""};
@@ -583,27 +580,15 @@ void EmitImageGradient(EmitContext& ctx, IR::Inst& inst, const IR::Value& index,
                 "MOV.F {}.y,{}.w;",
                 dpdx.reg, derivatives_vec, dpdx.reg, derivatives_vec, dpdy.reg, derivatives_vec,
                 dpdy.reg, derivatives_vec);
-        Register final_coord;
-        if (info.num_derivates >= 3) {
-            ctx.Add("MOV.F {}.z,{}.x;"
-                    "MOV.F {}.z,{}.y;",
-                    dpdx.reg, coord_vec, dpdy.reg, coord_vec);
-            ctx.Add("MOV.F {}.x,0;"
-                    "MOV.F {}.y,0;",
-                    "MOV.F {}.z,0;", coords.reg, coords.reg, coords.reg);
-            final_coord = coords.reg;
-        } else {
-            final_coord = coord_vec;
-        }
         if (info.has_lod_clamp) {
             const ScalarF32 lod_clamp_value{ctx.reg_alloc.Consume(lod_clamp)};
             ctx.Add("MOV.F {}.w,{};"
                     "TXD.F.LODCLAMP{} {},{},{},{},{},{}{};",
-                    dpdy.reg, lod_clamp_value, sparse_mod, ret, final_coord, dpdx.reg, dpdy.reg,
+                    dpdy.reg, lod_clamp_value, sparse_mod, ret, coord_vec, dpdx.reg, dpdy.reg,
                     texture, type, offset_vec);
         } else {
-            ctx.Add("TXD.F{} {},{},{},{},{},{}{};", sparse_mod, ret, final_coord, dpdx.reg,
-                    dpdy.reg, texture, type, offset_vec);
+            ctx.Add("TXD.F{} {},{},{},{},{},{}{};", sparse_mod, ret, coord_vec, dpdx.reg, dpdy.reg,
+                    texture, type, offset_vec);
         }
     } else {
         ctx.Add("TXD.F{} {},{},{}.x,{}.y,{},{}{};", sparse_mod, ret, coord_vec, derivatives_vec,

src/shader_recompiler/backend/glsl/emit_glsl_image.cpp

@@ -548,7 +548,7 @@ void EmitImageGradient(EmitContext& ctx, IR::Inst& inst, const IR::Value& index,
     if (sparse_inst) {
         throw NotImplementedException("EmitImageGradient Sparse");
     }
-    if (!offset.IsEmpty() && info.num_derivates <= 2) {
+    if (!offset.IsEmpty()) {
         throw NotImplementedException("EmitImageGradient offset");
     }
     const auto texture{Texture(ctx, info, index)};
@@ -556,12 +556,6 @@ void EmitImageGradient(EmitContext& ctx, IR::Inst& inst, const IR::Value& index,
     const bool multi_component{info.num_derivates > 1 || info.has_lod_clamp};
     const auto derivatives_vec{ctx.var_alloc.Consume(derivatives)};
     if (multi_component) {
-        if (info.num_derivates >= 3) {
-            const auto offset_vec{ctx.var_alloc.Consume(offset)};
-            ctx.Add("{}=textureGrad({},{},vec3({}.xz, {}.x),vec3({}.yz, {}.y));", texel, texture,
-                    coords, derivatives_vec, offset_vec, derivatives_vec, offset_vec);
-            return;
-        }
         ctx.Add("{}=textureGrad({},{},vec2({}.xz),vec2({}.yz));", texel, texture, coords,
                 derivatives_vec, derivatives_vec);
     } else {

src/shader_recompiler/frontend/ir/modifiers.h

@@ -42,7 +42,6 @@ union TextureInstInfo {
     BitField<23, 2, u32> gather_component;
     BitField<25, 2, u32> num_derivates;
     BitField<27, 3, ImageFormat> image_format;
-    BitField<30, 1, u32> ndv_is_active;
 };
 static_assert(sizeof(TextureInstInfo) <= sizeof(u32));
 

src/shader_recompiler/frontend/maxwell/translate/impl/floating_point_swizzled_add.cpp

@@ -19,7 +19,7 @@ void TranslatorVisitor::FSWZADD(u64 insn) {
     } const fswzadd{insn};
 
     if (fswzadd.ndv != 0) {
-        LOG_WARNING(Shader, "(STUBBED) FSWZADD - NDV mode");
+        throw NotImplementedException("FSWZADD NDV");
     }
 
     const IR::F32 src_a{GetFloatReg8(insn)};

src/shader_recompiler/frontend/maxwell/translate/impl/move_register.cpp

@@ -16,10 +16,8 @@ void MOV(TranslatorVisitor& v, u64 insn, const IR::U32& src, bool is_mov32i = fa
         BitField<12, 4, u64> mov32i_mask;
     } const mov{insn};
 
-    u64 mask = is_mov32i ? mov.mov32i_mask : mov.mask;
-    if (mask != 0xf && mask != 0x1) {
-        LOG_WARNING(Shader, "(STUBBED) Masked Mov");
-        return;
+    if ((is_mov32i ? mov.mov32i_mask : mov.mask) != 0xf) {
+        throw NotImplementedException("Non-full move mask");
     }
     v.X(mov.dest_reg, src);
 }

src/shader_recompiler/frontend/maxwell/translate/impl/not_implemented.cpp

@@ -209,7 +209,7 @@ void TranslatorVisitor::R2B(u64) {
 }
 
 void TranslatorVisitor::RAM(u64) {
-    LOG_WARNING(Shader, "(STUBBED) RAM Instruction");
+    ThrowNotImplemented(Opcode::RAM);
 }
 
 void TranslatorVisitor::RET(u64) {
@@ -221,7 +221,7 @@ void TranslatorVisitor::RTT(u64) {
 }
 
 void TranslatorVisitor::SAM(u64) {
-    LOG_WARNING(Shader, "(STUBBED) SAM Instruction");
+    ThrowNotImplemented(Opcode::SAM);
 }
 
 void TranslatorVisitor::SETCRSPTR(u64) {

src/shader_recompiler/frontend/maxwell/translate/impl/texture_fetch.cpp

@@ -172,7 +172,6 @@ void Impl(TranslatorVisitor& v, u64 insn, bool aoffi, Blod blod, bool lc,
     info.is_depth.Assign(tex.dc != 0 ? 1 : 0);
     info.has_bias.Assign(blod == Blod::LB || blod == Blod::LBA ? 1 : 0);
     info.has_lod_clamp.Assign(lc ? 1 : 0);
-    info.ndv_is_active.Assign(tex.ndv != 0 ? 1 : 0);
 
     const IR::Value sample{[&]() -> IR::Value {
         if (tex.dc == 0) {

src/shader_recompiler/ir_opt/constant_propagation_pass.cpp

@@ -10,7 +10,6 @@
 #include "shader_recompiler/environment.h"
 #include "shader_recompiler/exception.h"
 #include "shader_recompiler/frontend/ir/ir_emitter.h"
-#include "shader_recompiler/frontend/ir/modifiers.h"
 #include "shader_recompiler/frontend/ir/value.h"
 #include "shader_recompiler/ir_opt/passes.h"
 
@@ -411,49 +410,7 @@ void FoldSelect(IR::Inst& inst) {
     }
 }
 
-void FoldFPAdd32(IR::Inst& inst) {
-    if (FoldWhenAllImmediates(inst, [](f32 a, f32 b) { return a + b; })) {
-        return;
-    }
-    const IR::Value lhs_value{inst.Arg(0)};
-    const IR::Value rhs_value{inst.Arg(1)};
-    const auto check_neutral = [](const IR::Value& one_operand) {
-        return one_operand.IsImmediate() && std::abs(one_operand.F32()) == 0.0f;
-    };
-    if (check_neutral(lhs_value)) {
-        inst.ReplaceUsesWith(rhs_value);
-    }
-    if (check_neutral(rhs_value)) {
-        inst.ReplaceUsesWith(lhs_value);
-    }
-}
-
-bool FoldDerivateYFromCorrection(IR::Inst& inst) {
-    const IR::Value lhs_value{inst.Arg(0)};
-    const IR::Value rhs_value{inst.Arg(1)};
-    IR::Inst* const lhs_op{lhs_value.InstRecursive()};
-    IR::Inst* const rhs_op{rhs_value.InstRecursive()};
-    if (lhs_op->GetOpcode() == IR::Opcode::YDirection) {
-        if (rhs_op->GetOpcode() != IR::Opcode::DPdyFine) {
-            return false;
-        }
-        inst.ReplaceUsesWith(rhs_value);
-        return true;
-    }
-    if (rhs_op->GetOpcode() != IR::Opcode::YDirection) {
-        return false;
-    }
-    if (lhs_op->GetOpcode() != IR::Opcode::DPdyFine) {
-        return false;
-    }
-    inst.ReplaceUsesWith(lhs_value);
-    return true;
-}
-
 void FoldFPMul32(IR::Inst& inst) {
-    if (FoldWhenAllImmediates(inst, [](f32 a, f32 b) { return a * b; })) {
-        return;
-    }
     const auto control{inst.Flags<IR::FpControl>()};
     if (control.no_contraction) {
         return;
@@ -464,9 +421,6 @@ void FoldFPMul32(IR::Inst& inst) {
     if (lhs_value.IsImmediate() || rhs_value.IsImmediate()) {
         return;
     }
-    if (FoldDerivateYFromCorrection(inst)) {
-        return;
-    }
     IR::Inst* const lhs_op{lhs_value.InstRecursive()};
     IR::Inst* const rhs_op{rhs_value.InstRecursive()};
     if (lhs_op->GetOpcode() != IR::Opcode::FPMul32 ||
@@ -668,12 +622,7 @@ void FoldFSwizzleAdd(IR::Block& block, IR::Inst& inst) {
     }
     const IR::Value value_3{GetThroughCast(inst2->Arg(0).Resolve(), IR::Opcode::BitCastU32F32)};
     if (value_2 != value_3) {
-        if (!value_2.IsImmediate() || !value_3.IsImmediate()) {
-            return;
-        }
-        if (Common::BitCast<u32>(value_2.F32()) != value_3.U32()) {
-            return;
-        }
+        return;
     }
     const IR::Value index{inst2->Arg(1)};
     const IR::Value clamp{inst2->Arg(2)};
@@ -699,169 +648,6 @@ void FoldFSwizzleAdd(IR::Block& block, IR::Inst& inst) {
     }
 }
 
-bool FindGradient3DDerivates(std::array<IR::Value, 3>& results, IR::Value coord) {
-    if (coord.IsImmediate()) {
-        return false;
-    }
-    const auto check_through_shuffle = [](IR::Value input, IR::Value& result) {
-        const IR::Value value_1{GetThroughCast(input.Resolve(), IR::Opcode::BitCastF32U32)};
-        IR::Inst* const inst2{value_1.InstRecursive()};
-        if (inst2->GetOpcode() != IR::Opcode::ShuffleIndex) {
-            return false;
-        }
-        const IR::Value index{inst2->Arg(1).Resolve()};
-        const IR::Value clamp{inst2->Arg(2).Resolve()};
-        const IR::Value segmentation_mask{inst2->Arg(3).Resolve()};
-        if (!index.IsImmediate() || !clamp.IsImmediate() || !segmentation_mask.IsImmediate()) {
-            return false;
-        }
-        if (index.U32() != 3 && clamp.U32() != 3) {
-            return false;
-        }
-        result = GetThroughCast(inst2->Arg(0).Resolve(), IR::Opcode::BitCastU32F32);
-        return true;
-    };
-    IR::Inst* const inst = coord.InstRecursive();
-    if (inst->GetOpcode() != IR::Opcode::FSwizzleAdd) {
-        return false;
-    }
-    std::array<IR::Value, 3> temporary_values;
-    IR::Value value_1 = inst->Arg(0).Resolve();
-    IR::Value value_2 = inst->Arg(1).Resolve();
-    IR::Value value_3 = inst->Arg(2).Resolve();
-    std::array<u32, 4> swizzles_mask_a{};
-    std::array<u32, 4> swizzles_mask_b{};
-    const auto resolve_mask = [](std::array<u32, 4>& mask_results, IR::Value mask) {
-        u32 value = mask.U32();
-        for (size_t i = 0; i < 4; i++) {
-            mask_results[i] = (value >> (i * 2)) & 0x3;
-        }
-    };
-    resolve_mask(swizzles_mask_a, value_3);
-    size_t coordinate_index = 0;
-    const auto resolve_pending = [&](IR::Value resolve_v) {
-        IR::Inst* const inst_r = resolve_v.InstRecursive();
-        if (inst_r->GetOpcode() != IR::Opcode::FSwizzleAdd) {
-            return false;
-        }
-        if (!check_through_shuffle(inst_r->Arg(0).Resolve(), temporary_values[1])) {
-            return false;
-        }
-        if (!check_through_shuffle(inst_r->Arg(1).Resolve(), temporary_values[2])) {
-            return false;
-        }
-        resolve_mask(swizzles_mask_b, inst_r->Arg(2).Resolve());
-        return true;
-    };
-    if (value_1.IsImmediate() || value_2.IsImmediate()) {
-        return false;
-    }
-    bool should_continue = false;
-    if (resolve_pending(value_1)) {
-        should_continue = check_through_shuffle(value_2, temporary_values[0]);
-        coordinate_index = 0;
-    }
-    if (resolve_pending(value_2)) {
-        should_continue = check_through_shuffle(value_1, temporary_values[0]);
-        coordinate_index = 2;
-    }
-    if (!should_continue) {
-        return false;
-    }
-    // figure which is which
-    size_t zero_mask_a = 0;
-    size_t zero_mask_b = 0;
-    for (size_t i = 0; i < 4; i++) {
-        if (swizzles_mask_a[i] == 2 || swizzles_mask_b[i] == 2) {
-            // last operand can be inversed, we cannot determine a result.
-            return false;
-        }
-        zero_mask_a |= static_cast<size_t>(swizzles_mask_a[i] == 3 ? 1 : 0) << i;
-        zero_mask_b |= static_cast<size_t>(swizzles_mask_b[i] == 3 ? 1 : 0) << i;
-    }
-    static constexpr size_t ddx_pattern = 0b1010;
-    static constexpr size_t ddx_pattern_inv = ~ddx_pattern & 0b00001111;
-    if (std::popcount(zero_mask_a) != 2) {
-        return false;
-    }
-    if (std::popcount(zero_mask_b) != 2) {
-        return false;
-    }
-    if (zero_mask_a == zero_mask_b) {
-        return false;
-    }
-    results[0] = temporary_values[coordinate_index];
-
-    if (coordinate_index == 0) {
-        if (zero_mask_b == ddx_pattern || zero_mask_b == ddx_pattern_inv) {
-            results[1] = temporary_values[1];
-            results[2] = temporary_values[2];
-            return true;
-        }
-        results[2] = temporary_values[1];
-        results[1] = temporary_values[2];
-    } else {
-        const auto assign_result = [&results](IR::Value temporary_value, size_t mask) {
-            if (mask == ddx_pattern || mask == ddx_pattern_inv) {
-                results[1] = temporary_value;
-                return;
-            }
-            results[2] = temporary_value;
-        };
-        assign_result(temporary_values[1], zero_mask_b);
-        assign_result(temporary_values[0], zero_mask_a);
-    }
-
-    return true;
-}
-
-void FoldImageSampleImplicitLod(IR::Block& block, IR::Inst& inst) {
-    IR::TextureInstInfo info = inst.Flags<IR::TextureInstInfo>();
-    auto orig_opcode = inst.GetOpcode();
-    if (info.ndv_is_active == 0) {
-        return;
-    }
-    if (info.type != TextureType::Color3D) {
-        return;
-    }
-    const IR::Value handle{inst.Arg(0)};
-    const IR::Value coords{inst.Arg(1)};
-    const IR::Value bias_lc{inst.Arg(2)};
-    const IR::Value offset{inst.Arg(3)};
-    if (!offset.IsImmediate()) {
-        return;
-    }
-    IR::Inst* const inst2 = coords.InstRecursive();
-    std::array<std::array<IR::Value, 3>, 3> results_matrix;
-    for (size_t i = 0; i < 3; i++) {
-        if (!FindGradient3DDerivates(results_matrix[i], inst2->Arg(i).Resolve())) {
-            return;
-        }
-    }
-    IR::F32 lod_clamp{};
-    if (info.has_lod_clamp != 0) {
-        if (!bias_lc.IsImmediate()) {
-            lod_clamp = IR::F32{bias_lc.InstRecursive()->Arg(1).Resolve()};
-        } else {
-            lod_clamp = IR::F32{bias_lc};
-        }
-    }
-    IR::IREmitter ir{block, IR::Block::InstructionList::s_iterator_to(inst)};
-    IR::Value new_coords =
-        ir.CompositeConstruct(results_matrix[0][0], results_matrix[1][0], results_matrix[2][0]);
-    IR::Value derivatives_1 = ir.CompositeConstruct(results_matrix[0][1], results_matrix[0][2],
-                                                    results_matrix[1][1], results_matrix[1][2]);
-    IR::Value derivatives_2 = ir.CompositeConstruct(results_matrix[2][1], results_matrix[2][2]);
-    info.num_derivates.Assign(3);
-    IR::Value new_gradient_instruction =
-        ir.ImageGradient(handle, new_coords, derivatives_1, derivatives_2, lod_clamp, info);
-    IR::Inst* const new_inst = new_gradient_instruction.InstRecursive();
-    if (orig_opcode == IR::Opcode::ImageSampleImplicitLod) {
-        new_inst->ReplaceOpcode(IR::Opcode::ImageGradient);
-    }
-    inst.ReplaceUsesWith(new_gradient_instruction);
-}
-
 void FoldConstBuffer(Environment& env, IR::Block& block, IR::Inst& inst) {
     const IR::Value bank{inst.Arg(0)};
     const IR::Value offset{inst.Arg(1)};
@@ -957,12 +743,6 @@ void ConstantPropagation(Environment& env, IR::Block& block, IR::Inst& inst) {
     case IR::Opcode::SelectF32:
     case IR::Opcode::SelectF64:
         return FoldSelect(inst);
-    case IR::Opcode::FPNeg32:
-        FoldWhenAllImmediates(inst, [](f32 a) { return -a; });
-        return;
-    case IR::Opcode::FPAdd32:
-        FoldFPAdd32(inst);
-        return;
     case IR::Opcode::FPMul32:
         return FoldFPMul32(inst);
     case IR::Opcode::LogicalAnd:
@@ -1078,11 +858,6 @@ void ConstantPropagation(Environment& env, IR::Block& block, IR::Inst& inst) {
             FoldDriverConstBuffer(env, block, inst, 1);
         }
         break;
-    case IR::Opcode::BindlessImageSampleImplicitLod:
-    case IR::Opcode::BoundImageSampleImplicitLod:
-    case IR::Opcode::ImageSampleImplicitLod:
-        FoldImageSampleImplicitLod(block, inst);
-        break;
     default:
         break;
     }

src/video_core/buffer_cache/buffer_cache.h

@@ -289,11 +289,8 @@ std::pair<typename P::Buffer*, u32> BufferCache<P>::ObtainBuffer(GPUVAddr gpu_ad
         MarkWrittenBuffer(buffer_id, *cpu_addr, size);
         break;
     case ObtainBufferOperation::DiscardWrite: {
-        VAddr cpu_addr_start = Common::AlignDown(*cpu_addr, 64);
-        VAddr cpu_addr_end = Common::AlignUp(*cpu_addr + size, 64);
-        IntervalType interval{cpu_addr_start, cpu_addr_end};
+        IntervalType interval{*cpu_addr, size};
         ClearDownload(interval);
-        common_ranges.subtract(interval);
         break;
     }
     default:
@@ -1162,11 +1159,6 @@ void BufferCache<P>::UpdateDrawIndirect() {
             .size = static_cast<u32>(size),
             .buffer_id = FindBuffer(*cpu_addr, static_cast<u32>(size)),
         };
-        VAddr cpu_addr_start = Common::AlignDown(*cpu_addr, 64);
-        VAddr cpu_addr_end = Common::AlignUp(*cpu_addr + size, 64);
-        IntervalType interval{cpu_addr_start, cpu_addr_end};
-        ClearDownload(interval);
-        common_ranges.subtract(interval);
     };
     if (current_draw_indirect->include_count) {
         update(current_draw_indirect->count_start_address, sizeof(u32),

src/video_core/host1x/codecs/codec.cpp

@@ -319,7 +319,6 @@ void Codec::Decode() {
         LOG_WARNING(Service_NVDRV, "Zero width or height in frame");
         return;
     }
-    bool is_interlaced = initial_frame->interlaced_frame != 0;
     if (av_codec_ctx->hw_device_ctx) {
         final_frame = AVFramePtr{av_frame_alloc(), AVFrameDeleter};
         ASSERT_MSG(final_frame, "av_frame_alloc final_frame failed");
@@ -335,7 +334,7 @@ void Codec::Decode() {
         UNIMPLEMENTED_MSG("Unexpected video format: {}", final_frame->format);
         return;
     }
-    if (!is_interlaced) {
+    if (!final_frame->interlaced_frame) {
         av_frames.push(std::move(final_frame));
     } else {
         if (!filters_initialized) {

src/video_core/macro/macro.cpp

@@ -27,24 +27,14 @@ MICROPROFILE_DEFINE(MacroHLE, "GPU", "Execute macro HLE", MP_RGB(128, 192, 192))
 
 namespace Tegra {
 
-static void Dump(u64 hash, std::span<const u32> code, bool decompiled = false) {
+static void Dump(u64 hash, std::span<const u32> code) {
     const auto base_dir{Common::FS::GetYuzuPath(Common::FS::YuzuPath::DumpDir)};
     const auto macro_dir{base_dir / "macros"};
     if (!Common::FS::CreateDir(base_dir) || !Common::FS::CreateDir(macro_dir)) {
         LOG_ERROR(Common_Filesystem, "Failed to create macro dump directories");
         return;
     }
-    auto name{macro_dir / fmt::format("{:016x}.macro", hash)};
-
-    if (decompiled) {
-        auto new_name{macro_dir / fmt::format("decompiled_{:016x}.macro", hash)};
-        if (Common::FS::Exists(name)) {
-            (void)Common::FS::RenameFile(name, new_name);
-            return;
-        }
-        name = new_name;
-    }
-
+    const auto name{macro_dir / fmt::format("{:016x}.macro", hash)};
     std::fstream macro_file(name, std::ios::out | std::ios::binary);
     if (!macro_file) {
         LOG_ERROR(Common_Filesystem, "Unable to open or create file at {}",
@@ -100,6 +90,9 @@ void MacroEngine::Execute(u32 method, const std::vector<u32>& parameters) {
         if (!mid_method.has_value()) {
             cache_info.lle_program = Compile(macro_code->second);
             cache_info.hash = Common::HashValue(macro_code->second);
+            if (Settings::values.dump_macros) {
+                Dump(cache_info.hash, macro_code->second);
+            }
         } else {
             const auto& macro_cached = uploaded_macro_code[mid_method.value()];
             const auto rebased_method = method - mid_method.value();
@@ -109,6 +102,9 @@ void MacroEngine::Execute(u32 method, const std::vector<u32>& parameters) {
                         code.size() * sizeof(u32));
             cache_info.hash = Common::HashValue(code);
             cache_info.lle_program = Compile(code);
+            if (Settings::values.dump_macros) {
+                Dump(cache_info.hash, code);
+            }
         }
 
         auto hle_program = hle_macros->GetHLEProgram(cache_info.hash);
@@ -121,10 +117,6 @@ void MacroEngine::Execute(u32 method, const std::vector<u32>& parameters) {
             MICROPROFILE_SCOPE(MacroHLE);
             cache_info.hle_program->Execute(parameters, method);
         }
-
-        if (Settings::values.dump_macros) {
-            Dump(cache_info.hash, macro_code->second, cache_info.has_hle_program);
-        }
     }
 }
 

src/video_core/renderer_vulkan/vk_pipeline_cache.cpp

@@ -611,6 +611,9 @@ std::unique_ptr<GraphicsPipeline> PipelineCache::CreateGraphicsPipeline(
 
         const u32 cfg_offset{static_cast<u32>(env.StartAddress() + sizeof(Shader::ProgramHeader))};
         Shader::Maxwell::Flow::CFG cfg(env, pools.flow_block, cfg_offset, index == 0);
+        if (Settings::values.dump_shaders) {
+            env.Dump(hash, key.unique_hashes[index]);
+        }
         if (!uses_vertex_a || index != 1) {
             // Normal path
             programs[index] = TranslateProgram(pools.inst, pools.block, env, cfg, host_info);
@@ -621,10 +624,6 @@ std::unique_ptr<GraphicsPipeline> PipelineCache::CreateGraphicsPipeline(
             programs[index] = MergeDualVertexPrograms(program_va, program_vb, env);
         }
 
-        if (Settings::values.dump_shaders) {
-            env.Dump(hash, key.unique_hashes[index]);
-        }
-
         if (programs[index].info.requires_layer_emulation) {
             layer_source_program = &programs[index];
         }

src/video_core/vulkan_common/vulkan_instance.cpp

@@ -41,6 +41,9 @@ namespace {
     bool enable_validation) {
     std::vector<const char*> extensions;
     extensions.reserve(6);
+#ifdef __APPLE__
+    extensions.push_back(VK_KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME);
+#endif
     switch (window_type) {
     case Core::Frontend::WindowSystemType::Headless:
         break;
@@ -71,11 +74,6 @@ namespace {
     if (window_type != Core::Frontend::WindowSystemType::Headless) {
         extensions.push_back(VK_KHR_SURFACE_EXTENSION_NAME);
     }
-#ifdef __APPLE__
-    if (AreExtensionsSupported(dld, std::array{VK_KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME})) {
-        extensions.push_back(VK_KHR_PORTABILITY_ENUMERATION_EXTENSION_NAME);
-    }
-#endif
     if (enable_validation) {
         const bool debug_utils =
             AreExtensionsSupported(dld, std::array{VK_EXT_DEBUG_UTILS_EXTENSION_NAME});

src/video_core/vulkan_common/vulkan_library.cpp

@@ -19,17 +19,13 @@ std::shared_ptr<Common::DynamicLibrary> OpenLibrary(
 #else
     auto library = std::make_shared<Common::DynamicLibrary>();
 #ifdef __APPLE__
-    const auto libvulkan_filename =
-        Common::FS::GetBundleDirectory() / "Contents/Frameworks/libvulkan.1.dylib";
-    const auto libmoltenvk_filename =
-        Common::FS::GetBundleDirectory() / "Contents/Frameworks/libMoltenVK.dylib";
-    const char* library_paths[] = {std::getenv("LIBVULKAN_PATH"), libvulkan_filename.c_str(),
-                                   libmoltenvk_filename.c_str()};
     // Check if a path to a specific Vulkan library has been specified.
-    for (const auto& library_path : library_paths) {
-        if (library_path && library->Open(library_path)) {
-            break;
-        }
+    char* const libvulkan_env = std::getenv("LIBVULKAN_PATH");
+    if (!libvulkan_env || !library->Open(libvulkan_env)) {
+        // Use the libvulkan.dylib from the application bundle.
+        const auto filename =
+            Common::FS::GetBundleDirectory() / "Contents/Frameworks/libvulkan.dylib";
+        void(library->Open(Common::FS::PathToUTF8String(filename).c_str()));
     }
 #else
     std::string filename = Common::DynamicLibrary::GetVersionedFilename("vulkan", 1);

src/web_service/verify_user_jwt.cpp

@@ -4,7 +4,6 @@
 #if defined(__GNUC__) || defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations" // for deprecated OpenSSL functions
 #endif
 #include <jwt/jwt.hpp>
 #if defined(__GNUC__) || defined(__clang__)

src/yuzu/CMakeLists.txt

@@ -313,18 +313,6 @@ if (APPLE)
     target_sources(yuzu PRIVATE ${MACOSX_ICON})
     set_target_properties(yuzu PROPERTIES MACOSX_BUNDLE TRUE)
     set_target_properties(yuzu PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
-
-    if (NOT USE_SYSTEM_MOLTENVK)
-        set(MOLTENVK_PLATFORM "macOS")
-        set(MOLTENVK_VERSION "v1.2.5")
-        download_moltenvk_external(${MOLTENVK_PLATFORM} ${MOLTENVK_VERSION})
-    endif()
-    find_library(MOLTENVK_LIBRARY MoltenVK REQUIRED)
-    message(STATUS "Using MoltenVK at ${MOLTENVK_LIBRARY}.")
-    set_source_files_properties(${MOLTENVK_LIBRARY} PROPERTIES MACOSX_PACKAGE_LOCATION Frameworks
-                                    XCODE_FILE_ATTRIBUTES "CodeSignOnCopy")
-    target_sources(yuzu PRIVATE ${MOLTENVK_LIBRARY})
-
 elseif(WIN32)
     # compile as a win32 gui application instead of a console application
     if (QT_VERSION VERSION_GREATER_EQUAL 6)

src/yuzu/applets/qt_controller.cpp

@@ -5,8 +5,6 @@
 #include <thread>
 
 #include "common/assert.h"
-#include "common/settings.h"
-#include "common/settings_enums.h"
 #include "common/string_util.h"
 #include "core/core.h"
 #include "core/hid/emulated_controller.h"
@@ -228,11 +226,9 @@ int QtControllerSelectorDialog::exec() {
 }
 
 void QtControllerSelectorDialog::ApplyConfiguration() {
-    const bool pre_docked_mode = Settings::IsDockedMode();
-    const bool docked_mode_selected = ui->radioDocked->isChecked();
-    Settings::values.use_docked_mode.SetValue(
-        docked_mode_selected ? Settings::ConsoleMode::Docked : Settings::ConsoleMode::Handheld);
-    OnDockedModeChanged(pre_docked_mode, docked_mode_selected, system);
+    const bool pre_docked_mode = Settings::values.use_docked_mode.GetValue();
+    Settings::values.use_docked_mode.SetValue(ui->radioDocked->isChecked());
+    OnDockedModeChanged(pre_docked_mode, Settings::values.use_docked_mode.GetValue(), system);
 
     Settings::values.vibration_enabled.SetValue(ui->vibrationGroup->isChecked());
     Settings::values.motion_enabled.SetValue(ui->motionGroup->isChecked());
@@ -620,8 +616,8 @@ void QtControllerSelectorDialog::UpdateDockedState(bool is_handheld) {
     ui->radioDocked->setEnabled(!is_handheld);
     ui->radioUndocked->setEnabled(!is_handheld);
 
-    ui->radioDocked->setChecked(Settings::IsDockedMode());
-    ui->radioUndocked->setChecked(!Settings::IsDockedMode());
+    ui->radioDocked->setChecked(Settings::values.use_docked_mode.GetValue());
+    ui->radioUndocked->setChecked(!Settings::values.use_docked_mode.GetValue());
 
     // Also force into undocked mode if the controller type is handheld.
     if (is_handheld) {

src/yuzu/bootmanager.cpp

@@ -11,8 +11,6 @@
 #include <glad/glad.h>
 
 #include <QtCore/qglobal.h>
-#include "common/settings_enums.h"
-#include "uisettings.h"
 #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) && YUZU_USE_QT_MULTIMEDIA
 #include <QCamera>
 #include <QCameraImageCapture>
@@ -918,6 +916,7 @@ void GRenderWindow::ReleaseRenderTarget() {
 
 void GRenderWindow::CaptureScreenshot(const QString& screenshot_path) {
     auto& renderer = system.Renderer();
+    const f32 res_scale = Settings::values.resolution_info.up_factor;
 
     if (renderer.IsScreenshotPending()) {
         LOG_WARNING(Render,
@@ -925,18 +924,7 @@ void GRenderWindow::CaptureScreenshot(const QString& screenshot_path) {
         return;
     }
 
-    const Layout::FramebufferLayout layout{[]() {
-        u32 height = UISettings::values.screenshot_height.GetValue();
-        if (height == 0) {
-            height = Settings::IsDockedMode() ? Layout::ScreenDocked::Height
-                                              : Layout::ScreenUndocked::Height;
-            height *= Settings::values.resolution_info.up_factor;
-        }
-        const u32 width =
-            UISettings::CalculateWidth(height, Settings::values.aspect_ratio.GetValue());
-        return Layout::DefaultFrameLayout(width, height);
-    }()};
-
+    const Layout::FramebufferLayout layout{Layout::FrameLayoutFromResolutionScale(res_scale)};
     screenshot_image = QImage(QSize(layout.width, layout.height), QImage::Format_RGB32);
     renderer.RequestScreenshot(
         screenshot_image.bits(),

src/yuzu/configuration/config.cpp

@@ -9,7 +9,6 @@
 #include "common/fs/path_util.h"
 #include "common/settings.h"
 #include "common/settings_common.h"
-#include "common/settings_enums.h"
 #include "core/core.h"
 #include "core/hle/service/acc/profile_manager.h"
 #include "core/hle/service/hid/controllers/npad.h"
@@ -86,9 +85,9 @@ const std::map<Settings::ScalingFilter, QString> Config::scaling_filter_texts_ma
     {Settings::ScalingFilter::Fsr, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "FSR"))},
 };
 
-const std::map<Settings::ConsoleMode, QString> Config::use_docked_mode_texts_map = {
-    {Settings::ConsoleMode::Docked, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "Docked"))},
-    {Settings::ConsoleMode::Handheld, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "Handheld"))},
+const std::map<bool, QString> Config::use_docked_mode_texts_map = {
+    {true, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "Docked"))},
+    {false, QStringLiteral(QT_TRANSLATE_NOOP("GMainWindow", "Handheld"))},
 };
 
 const std::map<Settings::GpuAccuracy, QString> Config::gpu_accuracy_texts_map = {
@@ -377,7 +376,7 @@ void Config::ReadControlValues() {
     const auto controller_type = Settings::values.players.GetValue()[0].controller_type;
     if (controller_type == Settings::ControllerType::Handheld) {
         Settings::values.use_docked_mode.SetGlobal(!IsCustomConfig());
-        Settings::values.use_docked_mode.SetValue(Settings::ConsoleMode::Handheld);
+        Settings::values.use_docked_mode.SetValue(false);
     }
 
     if (IsCustomConfig()) {
@@ -593,7 +592,8 @@ void Config::ReadRendererValues() {
 void Config::ReadScreenshotValues() {
     qt_config->beginGroup(QStringLiteral("Screenshots"));
 
-    ReadCategory(Settings::Category::Screenshots);
+    UISettings::values.enable_screenshot_save_as =
+        ReadSetting(QStringLiteral("enable_screenshot_save_as"), true).toBool();
     FS::SetYuzuPath(
         FS::YuzuPath::ScreenshotsDir,
         qt_config

src/yuzu/configuration/config.h

@@ -9,7 +9,6 @@
 #include <QMetaType>
 #include <QVariant>
 #include "common/settings.h"
-#include "common/settings_enums.h"
 #include "yuzu/uisettings.h"
 
 class QSettings;
@@ -52,7 +51,7 @@ public:
 
     static const std::map<Settings::AntiAliasing, QString> anti_aliasing_texts_map;
     static const std::map<Settings::ScalingFilter, QString> scaling_filter_texts_map;
-    static const std::map<Settings::ConsoleMode, QString> use_docked_mode_texts_map;
+    static const std::map<bool, QString> use_docked_mode_texts_map;
     static const std::map<Settings::GpuAccuracy, QString> gpu_accuracy_texts_map;
     static const std::map<Settings::RendererBackend, QString> renderer_backend_texts_map;
     static const std::map<Settings::ShaderBackend, QString> shader_backend_texts_map;

src/yuzu/configuration/configure_dialog.cpp

@@ -4,7 +4,6 @@
 #include <memory>
 #include "common/logging/log.h"
 #include "common/settings.h"
-#include "common/settings_enums.h"
 #include "core/core.h"
 #include "ui_configure.h"
 #include "vk_device_info.h"
@@ -42,19 +41,16 @@ ConfigureDialog::ConfigureDialog(QWidget* parent, HotkeyRegistry& registry_,
       general_tab{std::make_unique<ConfigureGeneral>(system_, nullptr, *builder, this)},
       graphics_advanced_tab{
           std::make_unique<ConfigureGraphicsAdvanced>(system_, nullptr, *builder, this)},
-      ui_tab{std::make_unique<ConfigureUi>(system_, this)},
       graphics_tab{std::make_unique<ConfigureGraphics>(
           system_, vk_device_records, [&]() { graphics_advanced_tab->ExposeComputeOption(); },
-          [this](Settings::AspectRatio ratio, Settings::ResolutionSetup setup) {
-              ui_tab->UpdateScreenshotInfo(ratio, setup);
-          },
           nullptr, *builder, this)},
       hotkeys_tab{std::make_unique<ConfigureHotkeys>(system_.HIDCore(), this)},
       input_tab{std::make_unique<ConfigureInput>(system_, this)},
       network_tab{std::make_unique<ConfigureNetwork>(system_, this)},
       profile_tab{std::make_unique<ConfigureProfileManager>(system_, this)},
       system_tab{std::make_unique<ConfigureSystem>(system_, nullptr, *builder, this)},
-      web_tab{std::make_unique<ConfigureWeb>(this)} {
+      ui_tab{std::make_unique<ConfigureUi>(system_, this)}, web_tab{std::make_unique<ConfigureWeb>(
+                                                                this)} {
     Settings::SetConfiguringGlobal(true);
 
     ui->setupUi(this);

src/yuzu/configuration/configure_dialog.h

@@ -81,12 +81,12 @@ private:
     std::unique_ptr<ConfigureFilesystem> filesystem_tab;
     std::unique_ptr<ConfigureGeneral> general_tab;
     std::unique_ptr<ConfigureGraphicsAdvanced> graphics_advanced_tab;
-    std::unique_ptr<ConfigureUi> ui_tab;
     std::unique_ptr<ConfigureGraphics> graphics_tab;
     std::unique_ptr<ConfigureHotkeys> hotkeys_tab;
     std::unique_ptr<ConfigureInput> input_tab;
     std::unique_ptr<ConfigureNetwork> network_tab;
     std::unique_ptr<ConfigureProfileManager> profile_tab;
     std::unique_ptr<ConfigureSystem> system_tab;
+    std::unique_ptr<ConfigureUi> ui_tab;
     std::unique_ptr<ConfigureWeb> web_tab;
 };

src/yuzu/configuration/configure_graphics.cpp

@@ -24,7 +24,6 @@
 #include <QtCore/qobjectdefs.h>
 #include <qabstractbutton.h>
 #include <qboxlayout.h>
-#include <qcombobox.h>
 #include <qcoreevent.h>
 #include <qglobal.h>
 #include <qgridlayout.h>
@@ -78,16 +77,13 @@ static constexpr Settings::VSyncMode PresentModeToSetting(VkPresentModeKHR mode)
     }
 }
 
-ConfigureGraphics::ConfigureGraphics(
-    const Core::System& system_, std::vector<VkDeviceInfo::Record>& records_,
-    const std::function<void()>& expose_compute_option_,
-    const std::function<void(Settings::AspectRatio, Settings::ResolutionSetup)>&
-        update_aspect_ratio_,
-    std::shared_ptr<std::vector<ConfigurationShared::Tab*>> group_,
-    const ConfigurationShared::Builder& builder, QWidget* parent)
+ConfigureGraphics::ConfigureGraphics(const Core::System& system_,
+                                     std::vector<VkDeviceInfo::Record>& records_,
+                                     const std::function<void()>& expose_compute_option_,
+                                     std::shared_ptr<std::vector<ConfigurationShared::Tab*>> group_,
+                                     const ConfigurationShared::Builder& builder, QWidget* parent)
     : ConfigurationShared::Tab(group_, parent), ui{std::make_unique<Ui::ConfigureGraphics>()},
-      records{records_}, expose_compute_option{expose_compute_option_},
-      update_aspect_ratio{update_aspect_ratio_}, system{system_},
+      records{records_}, expose_compute_option{expose_compute_option_}, system{system_},
       combobox_translations{builder.ComboboxTranslations()},
       shader_mapping{
           combobox_translations.at(Settings::EnumMetadata<Settings::ShaderBackend>::Index())} {
@@ -144,26 +140,6 @@ ConfigureGraphics::ConfigureGraphics(
         UpdateBackgroundColorButton(new_bg_color);
     });
 
-    const auto& update_screenshot_info = [this, &builder]() {
-        const auto& combobox_enumerations = builder.ComboboxTranslations().at(
-            Settings::EnumMetadata<Settings::AspectRatio>::Index());
-        const auto index = aspect_ratio_combobox->currentIndex();
-        const auto ratio = static_cast<Settings::AspectRatio>(combobox_enumerations[index].first);
-
-        const auto& combobox_enumerations_resolution = builder.ComboboxTranslations().at(
-            Settings::EnumMetadata<Settings::ResolutionSetup>::Index());
-        const auto res_index = resolution_combobox->currentIndex();
-        const auto setup = static_cast<Settings::ResolutionSetup>(
-            combobox_enumerations_resolution[res_index].first);
-
-        update_aspect_ratio(ratio, setup);
-    };
-
-    connect(aspect_ratio_combobox, QOverload<int>::of(&QComboBox::currentIndexChanged),
-            update_screenshot_info);
-    connect(resolution_combobox, QOverload<int>::of(&QComboBox::currentIndexChanged),
-            update_screenshot_info);
-
     api_combobox->setEnabled(!UISettings::values.has_broken_vulkan && api_combobox->isEnabled());
     ui->api_widget->setEnabled(
         (!UISettings::values.has_broken_vulkan || Settings::IsConfiguringGlobal()) &&
@@ -304,14 +280,6 @@ void ConfigureGraphics::Setup(const ConfigurationShared::Builder& builder) {
             // Keep track of vsync_mode's combobox so we can populate it
             vsync_mode_combobox = widget->combobox;
             hold_graphics.emplace(setting->Id(), widget);
-        } else if (setting->Id() == Settings::values.aspect_ratio.Id()) {
-            // Keep track of the aspect ratio combobox to update other UI tabs that need it
-            aspect_ratio_combobox = widget->combobox;
-            hold_graphics.emplace(setting->Id(), widget);
-        } else if (setting->Id() == Settings::values.resolution_setup.Id()) {
-            // Keep track of the resolution combobox to update other UI tabs that need it
-            resolution_combobox = widget->combobox;
-            hold_graphics.emplace(setting->Id(), widget);
         } else {
             hold_graphics.emplace(setting->Id(), widget);
         }

src/yuzu/configuration/configure_graphics.h

@@ -14,7 +14,6 @@
 #include <qobjectdefs.h>
 #include <vulkan/vulkan_core.h>
 #include "common/common_types.h"
-#include "common/settings_enums.h"
 #include "configuration/shared_translation.h"
 #include "vk_device_info.h"
 #include "yuzu/configuration/configuration_shared.h"
@@ -44,13 +43,12 @@ class Builder;
 
 class ConfigureGraphics : public ConfigurationShared::Tab {
 public:
-    explicit ConfigureGraphics(
-        const Core::System& system_, std::vector<VkDeviceInfo::Record>& records,
-        const std::function<void()>& expose_compute_option,
-        const std::function<void(Settings::AspectRatio, Settings::ResolutionSetup)>&
-            update_aspect_ratio,
-        std::shared_ptr<std::vector<ConfigurationShared::Tab*>> group,
-        const ConfigurationShared::Builder& builder, QWidget* parent = nullptr);
+    explicit ConfigureGraphics(const Core::System& system_,
+                               std::vector<VkDeviceInfo::Record>& records,
+                               const std::function<void()>& expose_compute_option_,
+                               std::shared_ptr<std::vector<ConfigurationShared::Tab*>> group,
+                               const ConfigurationShared::Builder& builder,
+                               QWidget* parent = nullptr);
     ~ConfigureGraphics() override;
 
     void ApplyConfiguration() override;
@@ -93,7 +91,6 @@ private:
     u32 vulkan_device{};
     Settings::ShaderBackend shader_backend{};
     const std::function<void()>& expose_compute_option;
-    const std::function<void(Settings::AspectRatio, Settings::ResolutionSetup)> update_aspect_ratio;
 
     const Core::System& system;
     const ConfigurationShared::ComboboxTranslationMap& combobox_translations;
@@ -107,6 +104,4 @@ private:
     QWidget* vulkan_device_widget;
     QWidget* api_widget;
     QWidget* shader_backend_widget;
-    QComboBox* aspect_ratio_combobox;
-    QComboBox* resolution_combobox;
 };

src/yuzu/configuration/configure_input.cpp

@@ -4,8 +4,6 @@
 #include <memory>
 #include <thread>
 
-#include "common/settings.h"
-#include "common/settings_enums.h"
 #include "core/core.h"
 #include "core/hid/emulated_controller.h"
 #include "core/hid/hid_core.h"
@@ -199,11 +197,9 @@ void ConfigureInput::ApplyConfiguration() {
 
     advanced->ApplyConfiguration();
 
-    const bool pre_docked_mode = Settings::IsDockedMode();
-    const bool docked_mode_selected = ui->radioDocked->isChecked();
-    Settings::values.use_docked_mode.SetValue(
-        docked_mode_selected ? Settings::ConsoleMode::Docked : Settings::ConsoleMode::Handheld);
-    OnDockedModeChanged(pre_docked_mode, docked_mode_selected, system);
+    const bool pre_docked_mode = Settings::values.use_docked_mode.GetValue();
+    Settings::values.use_docked_mode.SetValue(ui->radioDocked->isChecked());
+    OnDockedModeChanged(pre_docked_mode, Settings::values.use_docked_mode.GetValue(), system);
 
     Settings::values.vibration_enabled.SetValue(ui->vibrationGroup->isChecked());
     Settings::values.motion_enabled.SetValue(ui->motionGroup->isChecked());
@@ -271,8 +267,8 @@ void ConfigureInput::UpdateDockedState(bool is_handheld) {
     ui->radioDocked->setEnabled(!is_handheld);
     ui->radioUndocked->setEnabled(!is_handheld);
 
-    ui->radioDocked->setChecked(Settings::IsDockedMode());
-    ui->radioUndocked->setChecked(!Settings::IsDockedMode());
+    ui->radioDocked->setChecked(Settings::values.use_docked_mode.GetValue());
+    ui->radioUndocked->setChecked(!Settings::values.use_docked_mode.GetValue());
 
     // Also force into undocked mode if the controller type is handheld.
     if (is_handheld) {

src/yuzu/configuration/configure_per_game.cpp

@@ -17,8 +17,6 @@
 #include <QTimer>
 
 #include "common/fs/fs_util.h"
-#include "common/settings_enums.h"
-#include "common/settings_input.h"
 #include "configuration/shared_widget.h"
 #include "core/core.h"
 #include "core/file_sys/control_metadata.h"
@@ -59,7 +57,7 @@ ConfigurePerGame::ConfigurePerGame(QWidget* parent, u64 title_id_, const std::st
         std::make_unique<ConfigureGraphicsAdvanced>(system_, tab_group, *builder, this);
     graphics_tab = std::make_unique<ConfigureGraphics>(
         system_, vk_device_records, [&]() { graphics_advanced_tab->ExposeComputeOption(); },
-        [](Settings::AspectRatio, Settings::ResolutionSetup) {}, tab_group, *builder, this);
+        tab_group, *builder, this);
     input_tab = std::make_unique<ConfigureInputPerGame>(system_, game_config.get(), this);
     system_tab = std::make_unique<ConfigureSystem>(system_, tab_group, *builder, this);
 
@@ -99,12 +97,6 @@ void ConfigurePerGame::ApplyConfiguration() {
     addons_tab->ApplyConfiguration();
     input_tab->ApplyConfiguration();
 
-    if (Settings::IsDockedMode() && Settings::values.players.GetValue()[0].controller_type ==
-                                        Settings::ControllerType::Handheld) {
-        Settings::values.use_docked_mode.SetValue(Settings::ConsoleMode::Handheld);
-        Settings::values.use_docked_mode.SetGlobal(true);
-    }
-
     system.ApplySettings();
     Settings::LogSettings();
 

src/yuzu/configuration/configure_system.cpp

@@ -106,11 +106,6 @@ void ConfigureSystem::Setup(const ConfigurationShared::Builder& builder) {
     push(Settings::values.linkage.by_category[Settings::Category::System]);
 
     for (auto setting : settings) {
-        if (setting->Id() == Settings::values.use_docked_mode.Id() &&
-            Settings::IsConfiguringGlobal()) {
-            continue;
-        }
-
         ConfigurationShared::Widget* widget = builder.BuildWidget(setting, apply_funcs);
 
         if (widget == nullptr) {

src/yuzu/configuration/configure_ui.cpp

@@ -1,31 +1,18 @@
 // SPDX-FileCopyrightText: 2016 Citra Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "yuzu/configuration/configure_ui.h"
-
 #include <array>
-#include <set>
-#include <stdexcept>
-#include <string>
 #include <utility>
-
-#include <QCheckBox>
-#include <QComboBox>
-#include <QCoreApplication>
-#include <QDirIterator>
 #include <QFileDialog>
-#include <QString>
-#include <QToolButton>
-#include <QVariant>
 
+#include <QDirIterator>
 #include "common/common_types.h"
 #include "common/fs/path_util.h"
 #include "common/logging/log.h"
 #include "common/settings.h"
-#include "common/settings_enums.h"
 #include "core/core.h"
-#include "core/frontend/framebuffer_layout.h"
 #include "ui_configure_ui.h"
+#include "yuzu/configuration/configure_ui.h"
 #include "yuzu/uisettings.h"
 
 namespace {
@@ -67,44 +54,8 @@ QString GetTranslatedRowTextName(size_t index) {
 }
 } // Anonymous namespace
 
-static float GetUpFactor(Settings::ResolutionSetup res_setup) {
-    Settings::ResolutionScalingInfo info{};
-    Settings::TranslateResolutionInfo(res_setup, info);
-    return info.up_factor;
-}
-
-static void PopulateResolutionComboBox(QComboBox* screenshot_height, QWidget* parent) {
-    screenshot_height->clear();
-
-    const auto& enumeration =
-        Settings::EnumMetadata<Settings::ResolutionSetup>::Canonicalizations();
-    std::set<u32> resolutions{};
-    for (const auto& [name, value] : enumeration) {
-        const float up_factor = GetUpFactor(value);
-        u32 height_undocked = Layout::ScreenUndocked::Height * up_factor;
-        u32 height_docked = Layout::ScreenDocked::Height * up_factor;
-        resolutions.emplace(height_undocked);
-        resolutions.emplace(height_docked);
-    }
-
-    screenshot_height->addItem(parent->tr("Auto", "Screenshot height option"));
-    for (const auto res : resolutions) {
-        screenshot_height->addItem(QString::fromStdString(std::to_string(res)));
-    }
-}
-
-static u32 ScreenshotDimensionToInt(const QString& height) {
-    try {
-        return std::stoi(height.toStdString());
-    } catch (std::invalid_argument&) {
-        return 0;
-    }
-}
-
 ConfigureUi::ConfigureUi(Core::System& system_, QWidget* parent)
-    : QWidget(parent), ui{std::make_unique<Ui::ConfigureUi>()},
-      ratio{Settings::values.aspect_ratio.GetValue()},
-      resolution_setting{Settings::values.resolution_setup.GetValue()}, system{system_} {
+    : QWidget(parent), ui{std::make_unique<Ui::ConfigureUi>()}, system{system_} {
     ui->setupUi(this);
 
     InitializeLanguageComboBox();
@@ -117,8 +68,6 @@ ConfigureUi::ConfigureUi(Core::System& system_, QWidget* parent)
     InitializeIconSizeComboBox();
     InitializeRowComboBoxes();
 
-    PopulateResolutionComboBox(ui->screenshot_height, this);
-
     SetConfiguration();
 
     // Force game list reload if any of the relevant settings are changed.
@@ -155,10 +104,6 @@ ConfigureUi::ConfigureUi(Core::System& system_, QWidget* parent)
             ui->screenshot_path_edit->setText(dir);
         }
     });
-
-    connect(ui->screenshot_height, &QComboBox::currentTextChanged, [this]() { UpdateWidthText(); });
-
-    UpdateWidthText();
 }
 
 ConfigureUi::~ConfigureUi() = default;
@@ -178,10 +123,6 @@ void ConfigureUi::ApplyConfiguration() {
     UISettings::values.enable_screenshot_save_as = ui->enable_screenshot_save_as->isChecked();
     Common::FS::SetYuzuPath(Common::FS::YuzuPath::ScreenshotsDir,
                             ui->screenshot_path_edit->text().toStdString());
-
-    const u32 height = ScreenshotDimensionToInt(ui->screenshot_height->currentText());
-    UISettings::values.screenshot_height.SetValue(height);
-
     system.ApplySettings();
 }
 
@@ -206,13 +147,6 @@ void ConfigureUi::SetConfiguration() {
         UISettings::values.enable_screenshot_save_as.GetValue());
     ui->screenshot_path_edit->setText(QString::fromStdString(
         Common::FS::GetYuzuPathString(Common::FS::YuzuPath::ScreenshotsDir)));
-
-    const auto height = UISettings::values.screenshot_height.GetValue();
-    if (height == 0) {
-        ui->screenshot_height->setCurrentIndex(0);
-    } else {
-        ui->screenshot_height->setCurrentText(QStringLiteral("%1").arg(height));
-    }
 }
 
 void ConfigureUi::changeEvent(QEvent* event) {
@@ -383,29 +317,3 @@ void ConfigureUi::OnLanguageChanged(int index) {
 
     emit LanguageChanged(ui->language_combobox->itemData(index).toString());
 }
-
-void ConfigureUi::UpdateWidthText() {
-    const u32 height = ScreenshotDimensionToInt(ui->screenshot_height->currentText());
-    const u32 width = UISettings::CalculateWidth(height, ratio);
-    if (height == 0) {
-        const auto up_factor = GetUpFactor(resolution_setting);
-        const u32 height_docked = Layout::ScreenDocked::Height * up_factor;
-        const u32 width_docked = UISettings::CalculateWidth(height_docked, ratio);
-        const u32 height_undocked = Layout::ScreenUndocked::Height * up_factor;
-        const u32 width_undocked = UISettings::CalculateWidth(height_undocked, ratio);
-        ui->screenshot_width->setText(tr("Auto (%1 x %2, %3 x %4)", "Screenshot width value")
-                                          .arg(width_undocked)
-                                          .arg(height_undocked)
-                                          .arg(width_docked)
-                                          .arg(height_docked));
-    } else {
-        ui->screenshot_width->setText(QStringLiteral("%1 x").arg(width));
-    }
-}
-
-void ConfigureUi::UpdateScreenshotInfo(Settings::AspectRatio ratio_,
-                                       Settings::ResolutionSetup resolution_setting_) {
-    ratio = ratio_;
-    resolution_setting = resolution_setting_;
-    UpdateWidthText();
-}

src/yuzu/configuration/configure_ui.h

@@ -5,7 +5,6 @@
 
 #include <memory>
 #include <QWidget>
-#include "common/settings_enums.h"
 
 namespace Core {
 class System;
@@ -24,9 +23,6 @@ public:
 
     void ApplyConfiguration();
 
-    void UpdateScreenshotInfo(Settings::AspectRatio ratio,
-                              Settings::ResolutionSetup resolution_info);
-
 private slots:
     void OnLanguageChanged(int index);
 
@@ -48,11 +44,7 @@ private:
     void UpdateFirstRowComboBox(bool init = false);
     void UpdateSecondRowComboBox(bool init = false);
 
-    void UpdateWidthText();
-
     std::unique_ptr<Ui::ConfigureUi> ui;
 
-    Settings::AspectRatio ratio;
-    Settings::ResolutionSetup resolution_setting;
     Core::System& system;
 };

src/yuzu/configuration/configure_ui.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>363</width>
-    <height>603</height>
+    <height>562</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -201,41 +201,6 @@
           </item>
          </layout>
         </item>
-        <item>
-         <layout class="QGridLayout" name="gridLayout">
-          <property name="spacing">
-           <number>6</number>
-          </property>
-          <item row="0" column="1">
-           <layout class="QHBoxLayout" name="horizontalLayout_5">
-            <item>
-             <widget class="QLabel" name="screenshot_width">
-              <property name="text">
-               <string>TextLabel</string>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QComboBox" name="screenshot_height">
-              <property name="editable">
-               <bool>true</bool>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item row="0" column="0">
-           <widget class="QLabel" name="label_3">
-            <property name="text">
-             <string>Resolution:</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
        </layout>
       </item>
      </layout>

src/yuzu/configuration/shared_translation.cpp

@@ -135,7 +135,7 @@ std::unique_ptr<TranslationMap> InitializeTranslations(QWidget* parent) {
     INSERT(Settings, region_index, "Region:", "");
     INSERT(Settings, time_zone_index, "Time Zone:", "");
     INSERT(Settings, sound_index, "Sound Output Mode:", "");
-    INSERT(Settings, use_docked_mode, "Console Mode:", "");
+    INSERT(Settings, use_docked_mode, "", "");
     INSERT(Settings, current_user, "", "");
 
     // Controls
@@ -379,9 +379,6 @@ std::unique_ptr<ComboboxTranslationMap> ComboboxEnumeration(QWidget* parent) {
                               PAIR(MemoryLayout, Memory_6Gb, "6GB DRAM (Unsafe)"),
                               PAIR(MemoryLayout, Memory_8Gb, "8GB DRAM (Unsafe)"),
                           }});
-    translations->insert(
-        {Settings::EnumMetadata<Settings::ConsoleMode>::Index(),
-         {PAIR(ConsoleMode, Docked, "Docked"), PAIR(ConsoleMode, Handheld, "Handheld")}});
 
 #undef PAIR
 #undef CTX_PAIR

src/yuzu/configuration/shared_widget.cpp

@@ -23,7 +23,6 @@
 #include <QLineEdit>
 #include <QObject>
 #include <QPushButton>
-#include <QRadioButton>
 #include <QRegularExpression>
 #include <QSizePolicy>
 #include <QSlider>
@@ -172,65 +171,6 @@ QWidget* Widget::CreateCombobox(std::function<std::string()>& serializer,
     return combobox;
 }
 
-QWidget* Widget::CreateRadioGroup(std::function<std::string()>& serializer,
-                                  std::function<void()>& restore_func,
-                                  const std::function<void()>& touch) {
-    const auto type = setting.EnumIndex();
-
-    QWidget* group = new QWidget(this);
-    QHBoxLayout* layout = new QHBoxLayout(group);
-    layout->setContentsMargins(0, 0, 0, 0);
-    group->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
-
-    const ComboboxTranslations* enumeration{nullptr};
-    if (combobox_enumerations.contains(type)) {
-        enumeration = &combobox_enumerations.at(type);
-        for (const auto& [id, name] : *enumeration) {
-            QRadioButton* radio_button = new QRadioButton(name, group);
-            layout->addWidget(radio_button);
-            radio_buttons.push_back({id, radio_button});
-        }
-    } else {
-        return group;
-    }
-
-    const auto get_selected = [=]() -> u32 {
-        for (const auto& [id, button] : radio_buttons) {
-            if (button->isChecked()) {
-                return id;
-            }
-        }
-        return -1;
-    };
-
-    const auto set_index = [=](u32 value) {
-        for (const auto& [id, button] : radio_buttons) {
-            button->setChecked(id == value);
-        }
-    };
-
-    const u32 setting_value = std::stoi(setting.ToString());
-    set_index(setting_value);
-
-    serializer = [get_selected]() {
-        int current = get_selected();
-        return std::to_string(current);
-    };
-
-    restore_func = [this, set_index]() {
-        const u32 global_value = std::stoi(RelevantDefault(setting));
-        set_index(global_value);
-    };
-
-    if (!Settings::IsConfiguringGlobal()) {
-        for (const auto& [id, button] : radio_buttons) {
-            QObject::connect(button, &QAbstractButton::clicked, [touch]() { touch(); });
-        }
-    }
-
-    return group;
-}
-
 QWidget* Widget::CreateLineEdit(std::function<std::string()>& serializer,
                                 std::function<void()>& restore_func,
                                 const std::function<void()>& touch, bool managed) {
@@ -295,7 +235,6 @@ QWidget* Widget::CreateSlider(bool reversed, float multiplier, const QString& gi
     slider->setValue(std::stoi(setting.ToString()));
 
     slider->setInvertedAppearance(reversed);
-    slider->setInvertedControls(reversed);
 
     serializer = [this]() { return std::to_string(slider->value()); };
     restore_func = [this]() { slider->setValue(std::stoi(RelevantDefault(setting))); };
@@ -471,8 +410,6 @@ void Widget::SetupComponent(const QString& label, std::function<void()>& load_fu
             return RequestType::Slider;
         case Settings::Specialization::Countable:
             return RequestType::SpinBox;
-        case Settings::Specialization::Radio:
-            return RequestType::RadioGroup;
         default:
             break;
         }
@@ -501,11 +438,7 @@ void Widget::SetupComponent(const QString& label, std::function<void()>& load_fu
     if (setting.TypeId() == typeid(bool)) {
         data_component = CreateCheckBox(&setting, label, serializer, restore_func, touch);
     } else if (setting.IsEnum()) {
-        if (request == RequestType::RadioGroup) {
-            data_component = CreateRadioGroup(serializer, restore_func, touch);
-        } else {
-            data_component = CreateCombobox(serializer, restore_func, touch);
-        }
+        data_component = CreateCombobox(serializer, restore_func, touch);
     } else if (type == typeid(u32) || type == typeid(int) || type == typeid(u16) ||
                type == typeid(s64) || type == typeid(u8)) {
         switch (request) {

src/yuzu/configuration/shared_widget.h

@@ -22,7 +22,6 @@ class QObject;
 class QPushButton;
 class QSlider;
 class QSpinBox;
-class QRadioButton;
 
 namespace Settings {
 class BasicSetting;
@@ -39,7 +38,6 @@ enum class RequestType {
     LineEdit,
     HexEdit,
     DateTimeEdit,
-    RadioGroup,
     MaxEnum,
 };
 
@@ -93,7 +91,6 @@ public:
     QSlider* slider{};
     QComboBox* combobox{};
     QDateTimeEdit* date_time_edit{};
-    std::vector<std::pair<u32, QRadioButton*>> radio_buttons{};
 
 private:
     void SetupComponent(const QString& label, std::function<void()>& load_func, bool managed,
@@ -109,9 +106,6 @@ private:
     QWidget* CreateCombobox(std::function<std::string()>& serializer,
                             std::function<void()>& restore_func,
                             const std::function<void()>& touch);
-    QWidget* CreateRadioGroup(std::function<std::string()>& serializer,
-                              std::function<void()>& restore_func,
-                              const std::function<void()>& touch);
     QWidget* CreateLineEdit(std::function<std::string()>& serializer,
                             std::function<void()>& restore_func, const std::function<void()>& touch,
                             bool managed = true);

src/yuzu/game_list_worker.cpp

@@ -191,9 +191,8 @@ QString FormatPatchNameVersions(const FileSys::PatchManager& patch_manager,
 }
 
 QList<QStandardItem*> MakeGameListEntry(const std::string& path, const std::string& name,
-                                        const std::size_t size, const std::vector<u8>& icon,
-                                        Loader::AppLoader& loader, u64 program_id,
-                                        const CompatibilityList& compatibility_list,
+                                        const std::vector<u8>& icon, Loader::AppLoader& loader,
+                                        u64 program_id, const CompatibilityList& compatibility_list,
                                         const FileSys::PatchManager& patch) {
     const auto it = FindMatchingCompatibilityEntry(compatibility_list, program_id);
 
@@ -211,7 +210,7 @@ QList<QStandardItem*> MakeGameListEntry(const std::string& path, const std::stri
                              file_type_string, program_id),
         new GameListItemCompat(compatibility),
         new GameListItem(file_type_string),
-        new GameListItemSize(size),
+        new GameListItemSize(Common::FS::GetSize(path)),
     };
 
     const auto patch_versions = GetGameListCachedObject(
@@ -279,8 +278,8 @@ void GameListWorker::AddTitlesToGameList(GameListDir* parent_dir) {
             GetMetadataFromControlNCA(patch, *control, icon, name);
         }
 
-        emit EntryReady(MakeGameListEntry(file->GetFullPath(), name, file->GetSize(), icon, *loader,
-                                          program_id, compatibility_list, patch),
+        emit EntryReady(MakeGameListEntry(file->GetFullPath(), name, icon, *loader, program_id,
+                                          compatibility_list, patch),
                         parent_dir);
     }
 }
@@ -355,9 +354,8 @@ void GameListWorker::ScanFileSystem(ScanTarget target, const std::string& dir_pa
                         const FileSys::PatchManager patch{id, system.GetFileSystemController(),
                                                           system.GetContentProvider()};
 
-                        emit EntryReady(MakeGameListEntry(physical_name, name,
-                                                          Common::FS::GetSize(physical_name), icon,
-                                                          *loader, id, compatibility_list, patch),
+                        emit EntryReady(MakeGameListEntry(physical_name, name, icon, *loader, id,
+                                                          compatibility_list, patch),
                                         parent_dir);
                     }
                 } else {
@@ -370,10 +368,9 @@ void GameListWorker::ScanFileSystem(ScanTarget target, const std::string& dir_pa
                     const FileSys::PatchManager patch{program_id, system.GetFileSystemController(),
                                                       system.GetContentProvider()};
 
-                    emit EntryReady(
-                        MakeGameListEntry(physical_name, name, Common::FS::GetSize(physical_name),
-                                          icon, *loader, program_id, compatibility_list, patch),
-                        parent_dir);
+                    emit EntryReady(MakeGameListEntry(physical_name, name, icon, *loader,
+                                                      program_id, compatibility_list, patch),
+                                    parent_dir);
                 }
             }
         } else if (is_dir) {

src/yuzu/main.cpp

@@ -1158,9 +1158,9 @@ void GMainWindow::InitializeWidgets() {
             [this](const QPoint& menu_location) {
                 QMenu context_menu;
 
-                for (auto const& pair : Config::use_docked_mode_texts_map) {
-                    context_menu.addAction(pair.second, [this, &pair] {
-                        if (pair.first != Settings::values.use_docked_mode.GetValue()) {
+                for (auto const& docked_mode_pair : Config::use_docked_mode_texts_map) {
+                    context_menu.addAction(docked_mode_pair.second, [this, docked_mode_pair] {
+                        if (docked_mode_pair.first != Settings::values.use_docked_mode.GetValue()) {
                             OnToggleDockedMode();
                         }
                     });
@@ -1811,43 +1811,6 @@ bool GMainWindow::SelectAndSetCurrentUser(
     return true;
 }
 
-void GMainWindow::ConfigureFilesystemProvider(const std::string& filepath) {
-    // Ensure all NCAs are registered before launching the game
-    const auto file = vfs->OpenFile(filepath, FileSys::Mode::Read);
-    if (!file) {
-        return;
-    }
-
-    auto loader = Loader::GetLoader(*system, file);
-    if (!loader) {
-        return;
-    }
-
-    const auto file_type = loader->GetFileType();
-    if (file_type == Loader::FileType::Unknown || file_type == Loader::FileType::Error) {
-        return;
-    }
-
-    u64 program_id = 0;
-    const auto res2 = loader->ReadProgramId(program_id);
-    if (res2 == Loader::ResultStatus::Success && file_type == Loader::FileType::NCA) {
-        provider->AddEntry(FileSys::TitleType::Application,
-                           FileSys::GetCRTypeFromNCAType(FileSys::NCA{file}.GetType()), program_id,
-                           file);
-    } else if (res2 == Loader::ResultStatus::Success &&
-               (file_type == Loader::FileType::XCI || file_type == Loader::FileType::NSP)) {
-        const auto nsp = file_type == Loader::FileType::NSP
-                             ? std::make_shared<FileSys::NSP>(file)
-                             : FileSys::XCI{file}.GetSecurePartitionNSP();
-        for (const auto& title : nsp->GetNCAs()) {
-            for (const auto& entry : title.second) {
-                provider->AddEntry(entry.first.first, entry.first.second, title.first,
-                                   entry.second->GetBaseFile());
-            }
-        }
-    }
-}
-
 void GMainWindow::BootGame(const QString& filename, u64 program_id, std::size_t program_index,
                            StartGameType type) {
     LOG_INFO(Frontend, "yuzu starting...");
@@ -1862,7 +1825,6 @@ void GMainWindow::BootGame(const QString& filename, u64 program_id, std::size_t
 
     last_filename_booted = filename;
 
-    ConfigureFilesystemProvider(filename.toStdString());
     const auto v_file = Core::GetGameFileFromPath(vfs, filename.toUtf8().constData());
     const auto loader = Loader::GetLoader(*system, v_file, program_id, program_index);
 
@@ -3674,7 +3636,7 @@ void GMainWindow::OnTasReset() {
 }
 
 void GMainWindow::OnToggleDockedMode() {
-    const bool is_docked = Settings::IsDockedMode();
+    const bool is_docked = Settings::values.use_docked_mode.GetValue();
     auto* player_1 = system->HIDCore().GetEmulatedController(Core::HID::NpadIdType::Player1);
     auto* handheld = system->HIDCore().GetEmulatedController(Core::HID::NpadIdType::Handheld);
 
@@ -3688,8 +3650,7 @@ void GMainWindow::OnToggleDockedMode() {
         controller_dialog->refreshConfiguration();
     }
 
-    Settings::values.use_docked_mode.SetValue(is_docked ? Settings::ConsoleMode::Handheld
-                                                        : Settings::ConsoleMode::Docked);
+    Settings::values.use_docked_mode.SetValue(!is_docked);
     UpdateDockedButton();
     OnDockedModeChanged(is_docked, !is_docked, *system);
 }
@@ -4119,10 +4080,10 @@ void GMainWindow::UpdateGPUAccuracyButton() {
 }
 
 void GMainWindow::UpdateDockedButton() {
-    const auto console_mode = Settings::values.use_docked_mode.GetValue();
-    dock_status_button->setChecked(Settings::IsDockedMode());
+    const bool is_docked = Settings::values.use_docked_mode.GetValue();
+    dock_status_button->setChecked(is_docked);
     dock_status_button->setText(
-        Config::use_docked_mode_texts_map.find(console_mode)->second.toUpper());
+        Config::use_docked_mode_texts_map.find(is_docked)->second.toUpper());
 }
 
 void GMainWindow::UpdateAPIText() {

src/yuzu/main.h

@@ -399,7 +399,6 @@ private:
     void OpenPerGameConfiguration(u64 title_id, const std::string& file_name);
     bool CheckDarkMode();
     bool CheckSystemArchiveDecryption();
-    void ConfigureFilesystemProvider(const std::string& filepath);
 
     QString GetTasStateDescription() const;
     bool CreateShortcut(const std::string& shortcut_path, const std::string& title,

src/yuzu/uisettings.cpp

@@ -36,20 +36,4 @@ bool IsDarkTheme() {
 
 Values values = {};
 
-u32 CalculateWidth(u32 height, Settings::AspectRatio ratio) {
-    switch (ratio) {
-    case Settings::AspectRatio::R4_3:
-        return height * 4 / 3;
-    case Settings::AspectRatio::R21_9:
-        return height * 21 / 9;
-    case Settings::AspectRatio::R16_10:
-        return height * 16 / 10;
-    case Settings::AspectRatio::R16_9:
-    case Settings::AspectRatio::Stretch:
-        // TODO: Move this function wherever appropriate to implement Stretched aspect
-        break;
-    }
-    return height * 16 / 9;
-}
-
 } // namespace UISettings

src/yuzu/uisettings.h

@@ -13,7 +13,6 @@
 #include <QVector>
 #include "common/common_types.h"
 #include "common/settings.h"
-#include "common/settings_enums.h"
 
 using Settings::Category;
 using Settings::Setting;
@@ -128,10 +127,8 @@ struct Values {
     // logging
     Setting<bool> show_console{linkage, false, "showConsole", Category::Ui};
 
-    // Screenshots
     Setting<bool> enable_screenshot_save_as{linkage, true, "enable_screenshot_save_as",
                                             Category::Screenshots};
-    Setting<u32> screenshot_height{linkage, 0, "screenshot_height", Category::Screenshots};
 
     QString roms_path;
     QString symbols_path;
@@ -190,8 +187,6 @@ struct Values {
 
 extern Values values;
 
-u32 CalculateWidth(u32 height, Settings::AspectRatio ratio);
-
 } // namespace UISettings
 
 Q_DECLARE_METATYPE(UISettings::GameDir*);