Android #140

Merge PR 12142
Merge PR 12140
2023-11-24 00:57:08 +00:00 · 2023-11-24 00:57:08 +00:00 · 2023-11-24 00:57:08 +00:00 · 2023-11-24 00:57:08 +00:00 · 2023-11-24 00:57:08 +00:00 · 2023-11-24 00:57:08 +00:00
156 changed files with 3878 additions and 4719 deletions
--- a/.github/workflows/verify.yml
+++ b/.github/workflows/verify.yml
@@ -68,25 +68,6 @@ jobs:
        with:
          name: ${{ matrix.type }}
          path: artifacts/
-  build-mac:
-    name: 'test build (macos)'
-    needs: format
-    runs-on: macos-13
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-          fetch-depth: 0
-      - name: Install dependencies
-        run: |
-          brew install autoconf automake boost@1.83 ccache ffmpeg fmt glslang hidapi libtool libusb lz4 ninja nlohmann-json openssl pkg-config qt@5 sdl2 speexdsp zlib zlib zstd
-      - name: Build
-        run: |
-          mkdir build
-          cd build
-          export Qt5_DIR="/usr/local/opt/qt@5/lib/cmake"
-          cmake .. -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DYUZU_USE_BUNDLED_VCPKG=OFF -DYUZU_TESTS=OFF -DENABLE_WEB_SERVICE=OFF -DENABLE_LIBUSB=OFF
-          ninja
  build-msvc:
    name: 'test build (windows, msvc)'
    needs: format
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,6 +4,9 @@
 [submodule "enet"]
 	path = externals/enet
 	url = https://github.com/lsalzman/enet.git
+[submodule "inih"]
+	path = externals/inih/inih
+	url = https://github.com/benhoyt/inih.git
 [submodule "cubeb"]
 	path = externals/cubeb
 	url = https://github.com/mozilla/cubeb.git
@@ -58,9 +61,6 @@
 [submodule "breakpad"]
 	path = externals/breakpad
 	url = https://github.com/yuzu-emu/breakpad.git
-[submodule "simpleini"]
-	path = externals/simpleini
-	url = https://github.com/brofield/simpleini.git
 [submodule "oaknut"]
 	path = externals/oaknut
 	url = https://github.com/merryhime/oaknut
--- a/.reuse/dep5
+++ b/.reuse/dep5
@@ -151,7 +151,3 @@ License: GPL-3.0-or-later
 Files: externals/stb/*
 Copyright: Sean Barrett
 License: MIT
-
-Files: externals/gamemode/*
-Copyright: Copyright 2017-2019 Feral Interactive
-License: BSD-3-Clause
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -260,11 +260,6 @@ if (UNIX)
    add_definitions(-DYUZU_UNIX=1)
 endif()

-if (ARCHITECTURE_arm64 AND (ANDROID OR ${CMAKE_SYSTEM_NAME} STREQUAL "Linux"))
-    set(HAS_NCE 1)
-    add_definitions(-DHAS_NCE=1)
-endif()
-
 # Configure C++ standard
 # ===========================

@@ -290,12 +285,12 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
 find_package(Boost 1.79.0 REQUIRED context)
 find_package(enet 1.3 MODULE)
 find_package(fmt 9 REQUIRED)
+find_package(inih 52 MODULE COMPONENTS INIReader)
 find_package(LLVM 17.0.2 MODULE COMPONENTS Demangle)
 find_package(lz4 REQUIRED)
 find_package(nlohmann_json 3.8 REQUIRED)
 find_package(Opus 1.3 MODULE)
 find_package(RenderDoc MODULE)
-find_package(SimpleIni MODULE)
 find_package(stb MODULE)
 find_package(VulkanMemoryAllocator CONFIG)
 find_package(ZLIB 1.2 REQUIRED)
@@ -343,10 +338,6 @@ if(ENABLE_OPENSSL)
    find_package(OpenSSL 1.1.1 REQUIRED)
 endif()

-if (UNIX AND NOT APPLE)
-    find_package(gamemode 1.7 MODULE)
-endif()
-
 # Please consider this as a stub
 if(ENABLE_QT6 AND Qt6_LOCATION)
    list(APPEND CMAKE_PREFIX_PATH "${Qt6_LOCATION}")
--- a/CMakeModules/FindSimpleIni.cmake
+++ b/CMakeModules/FindSimpleIni.cmake
@@ -1,19 +0,0 @@
-# SPDX-FileCopyrightText: 2023 Alexandre Bouvier <contact@amb.tf>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-find_path(SimpleIni_INCLUDE_DIR SimpleIni.h)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(SimpleIni
-    REQUIRED_VARS SimpleIni_INCLUDE_DIR
-)
-
-if (SimpleIni_FOUND AND NOT TARGET SimpleIni::SimpleIni)
-    add_library(SimpleIni::SimpleIni INTERFACE IMPORTED)
-    set_target_properties(SimpleIni::SimpleIni PROPERTIES
-        INTERFACE_INCLUDE_DIRECTORIES "${SimpleIni_INCLUDE_DIR}"
-    )
-endif()
-
-mark_as_advanced(SimpleIni_INCLUDE_DIR)
--- a/CMakeModules/Findgamemode.cmake
+++ b/CMakeModules/Findgamemode.cmake
@@ -1,15 +0,0 @@
-# SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-find_package(PkgConfig QUIET)
-pkg_search_module(GAMEMODE QUIET IMPORTED_TARGET gamemode)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(gamemode
-    REQUIRED_VARS GAMEMODE_INCLUDEDIR
-    VERSION_VAR GAMEMODE_VERSION
-)
-
-if (gamemode_FOUND AND NOT TARGET gamemode::headers)
-    add_library(gamemode::headers ALIAS PkgConfig::GAMEMODE)
-endif()
--- a/CMakeModules/Findinih.cmake
+++ b/CMakeModules/Findinih.cmake
@@ -0,0 +1,27 @@
+# SPDX-FileCopyrightText: 2022 Alexandre Bouvier <contact@amb.tf>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+find_package(PkgConfig QUIET)
+pkg_search_module(INIH QUIET IMPORTED_TARGET inih)
+if (INIReader IN_LIST inih_FIND_COMPONENTS)
+    pkg_search_module(INIREADER QUIET IMPORTED_TARGET INIReader)
+    if (INIREADER_FOUND)
+        set(inih_INIReader_FOUND TRUE)
+    endif()
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(inih
+    REQUIRED_VARS INIH_LINK_LIBRARIES
+    VERSION_VAR INIH_VERSION
+    HANDLE_COMPONENTS
+)
+
+if (inih_FOUND AND NOT TARGET inih::inih)
+    add_library(inih::inih ALIAS PkgConfig::INIH)
+endif()
+
+if (inih_FOUND AND inih_INIReader_FOUND AND NOT TARGET inih::INIReader)
+    add_library(inih::INIReader ALIAS PkgConfig::INIREADER)
+endif()
--- a/README.md
+++ b/README.md
@@ -1,6 +1,10 @@
 | Pull Request | Commit | Title | Author | Merged? |
 |----|----|----|----|----|
-| [12235](https://github.com/yuzu-emu/yuzu//pull/12235) | [`e7dd968ac`](https://github.com/yuzu-emu/yuzu//pull/12235/files) | renderer_vulkan: adjust window origin and swizzle independently | [liamwhite](https://github.com/liamwhite/) | Yes |
+| [11535](https://github.com/yuzu-emu/yuzu//pull/11535) | [`50bcfa5fb`](https://github.com/yuzu-emu/yuzu//pull/11535/files) | renderer_vulkan: Introduce separate cmd buffer for uploads | [GPUCode](https://github.com/GPUCode/) | Yes |
+| [12074](https://github.com/yuzu-emu/yuzu//pull/12074) | [`ed9d19cb4`](https://github.com/yuzu-emu/yuzu//pull/12074/files) | Implement Native Code Execution (NCE) | [GPUCode](https://github.com/GPUCode/) | Yes |
+| [12110](https://github.com/yuzu-emu/yuzu//pull/12110) | [`e7878e3cf`](https://github.com/yuzu-emu/yuzu//pull/12110/files) | vk_texture_cache: add workaround for nullDescriptor on Mali | [liamwhite](https://github.com/liamwhite/) | Yes |
+| [12140](https://github.com/yuzu-emu/yuzu//pull/12140) | [`453fd4703`](https://github.com/yuzu-emu/yuzu//pull/12140/files) | query_cache: demote report synced unreachable to assert | [liamwhite](https://github.com/liamwhite/) | Yes |
+| [12142](https://github.com/yuzu-emu/yuzu//pull/12142) | [`a0d628958`](https://github.com/yuzu-emu/yuzu//pull/12142/files) | android: unload hid after shutdown | [liamwhite](https://github.com/liamwhite/) | Yes |


 End of merge log. You can find the original README.md below the break.
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -38,6 +38,11 @@ endif()
 # Glad
 add_subdirectory(glad)

+# inih
+if (NOT TARGET inih::INIReader)
+    add_subdirectory(inih)
+endif()
+
 # mbedtls
 add_subdirectory(mbedtls)
 target_include_directories(mbedtls PUBLIC ./mbedtls/include)
@@ -193,12 +198,6 @@ if (ANDROID)
   endif()
 endif()

-if (UNIX AND NOT APPLE AND NOT TARGET gamemode::headers)
-    add_library(gamemode INTERFACE)
-    target_include_directories(gamemode INTERFACE gamemode)
-    add_library(gamemode::headers ALIAS gamemode)
-endif()
-
 # Breakpad
 # https://github.com/microsoft/vcpkg/blob/master/ports/breakpad/CMakeLists.txt
 if (YUZU_CRASH_DUMPS AND NOT TARGET libbreakpad_client)
@@ -300,8 +299,3 @@ if (YUZU_CRASH_DUMPS AND NOT TARGET libbreakpad_client)
        target_link_libraries(dump_syms PRIVATE libbreakpad_client ZLIB::ZLIB)
    endif()
 endif()
-
-# SimpleIni
-if (NOT TARGET SimpleIni::SimpleIni)
-    add_subdirectory(simpleini)
-endif()
--- a/externals/gamemode/gamemode_client.h
+++ b/externals/gamemode/gamemode_client.h
@@ -1,376 +0,0 @@
-/*
-
-Copyright (c) 2017-2019, Feral Interactive
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
- * Neither the name of Feral Interactive nor the names of its contributors
-   may be used to endorse or promote products derived from this software
-   without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
- */
-#ifndef CLIENT_GAMEMODE_H
-#define CLIENT_GAMEMODE_H
-/*
- * GameMode supports the following client functions
- * Requests are refcounted in the daemon
- *
- * int gamemode_request_start() - Request gamemode starts
- *   0 if the request was sent successfully
- *   -1 if the request failed
- *
- * int gamemode_request_end() - Request gamemode ends
- *   0 if the request was sent successfully
- *   -1 if the request failed
- *
- * GAMEMODE_AUTO can be defined to make the above two functions apply during static init and
- * destruction, as appropriate. In this configuration, errors will be printed to stderr
- *
- * int gamemode_query_status() - Query the current status of gamemode
- *   0 if gamemode is inactive
- *   1 if gamemode is active
- *   2 if gamemode is active and this client is registered
- *   -1 if the query failed
- *
- * int gamemode_request_start_for(pid_t pid) - Request gamemode starts for another process
- *   0 if the request was sent successfully
- *   -1 if the request failed
- *   -2 if the request was rejected
- *
- * int gamemode_request_end_for(pid_t pid) - Request gamemode ends for another process
- *   0 if the request was sent successfully
- *   -1 if the request failed
- *   -2 if the request was rejected
- *
- * int gamemode_query_status_for(pid_t pid) - Query status of gamemode for another process
- *   0 if gamemode is inactive
- *   1 if gamemode is active
- *   2 if gamemode is active and this client is registered
- *   -1 if the query failed
- *
- * const char* gamemode_error_string() - Get an error string
- *   returns a string describing any of the above errors
- *
- * Note: All the above requests can be blocking - dbus requests can and will block while the daemon
- * handles the request. It is not recommended to make these calls in performance critical code
- */
-
-#include <stdbool.h>
-#include <stdio.h>
-
-#include <dlfcn.h>
-#include <string.h>
-
-#include <assert.h>
-
-#include <sys/types.h>
-
-static char internal_gamemode_client_error_string[512] = { 0 };
-
-/**
- * Load libgamemode dynamically to dislodge us from most dependencies.
- * This allows clients to link and/or use this regardless of runtime.
- * See SDL2 for an example of the reasoning behind this in terms of
- * dynamic versioning as well.
- */
-static volatile int internal_libgamemode_loaded = 1;
-
-/* Typedefs for the functions to load */
-typedef int (*api_call_return_int)(void);
-typedef const char *(*api_call_return_cstring)(void);
-typedef int (*api_call_pid_return_int)(pid_t);
-
-/* Storage for functors */
-static api_call_return_int REAL_internal_gamemode_request_start = NULL;
-static api_call_return_int REAL_internal_gamemode_request_end = NULL;
-static api_call_return_int REAL_internal_gamemode_query_status = NULL;
-static api_call_return_cstring REAL_internal_gamemode_error_string = NULL;
-static api_call_pid_return_int REAL_internal_gamemode_request_start_for = NULL;
-static api_call_pid_return_int REAL_internal_gamemode_request_end_for = NULL;
-static api_call_pid_return_int REAL_internal_gamemode_query_status_for = NULL;
-
-/**
- * Internal helper to perform the symbol binding safely.
- *
- * Returns 0 on success and -1 on failure
- */
-__attribute__((always_inline)) static inline int internal_bind_libgamemode_symbol(
-    void *handle, const char *name, void **out_func, size_t func_size, bool required)
-{
-	void *symbol_lookup = NULL;
-	char *dl_error = NULL;
-
-	/* Safely look up the symbol */
-	symbol_lookup = dlsym(handle, name);
-	dl_error = dlerror();
-	if (required && (dl_error || !symbol_lookup)) {
-		snprintf(internal_gamemode_client_error_string,
-		         sizeof(internal_gamemode_client_error_string),
-		         "dlsym failed - %s",
-		         dl_error);
-		return -1;
-	}
-
-	/* Have the symbol correctly, copy it to make it usable */
-	memcpy(out_func, &symbol_lookup, func_size);
-	return 0;
-}
-
-/**
- * Loads libgamemode and needed functions
- *
- * Returns 0 on success and -1 on failure
- */
-__attribute__((always_inline)) static inline int internal_load_libgamemode(void)
-{
-	/* We start at 1, 0 is a success and -1 is a fail */
-	if (internal_libgamemode_loaded != 1) {
-		return internal_libgamemode_loaded;
-	}
-
-	/* Anonymous struct type to define our bindings */
-	struct binding {
-		const char *name;
-		void **functor;
-		size_t func_size;
-		bool required;
-	} bindings[] = {
-		{ "real_gamemode_request_start",
-		  (void **)&REAL_internal_gamemode_request_start,
-		  sizeof(REAL_internal_gamemode_request_start),
-		  true },
-		{ "real_gamemode_request_end",
-		  (void **)&REAL_internal_gamemode_request_end,
-		  sizeof(REAL_internal_gamemode_request_end),
-		  true },
-		{ "real_gamemode_query_status",
-		  (void **)&REAL_internal_gamemode_query_status,
-		  sizeof(REAL_internal_gamemode_query_status),
-		  false },
-		{ "real_gamemode_error_string",
-		  (void **)&REAL_internal_gamemode_error_string,
-		  sizeof(REAL_internal_gamemode_error_string),
-		  true },
-		{ "real_gamemode_request_start_for",
-		  (void **)&REAL_internal_gamemode_request_start_for,
-		  sizeof(REAL_internal_gamemode_request_start_for),
-		  false },
-		{ "real_gamemode_request_end_for",
-		  (void **)&REAL_internal_gamemode_request_end_for,
-		  sizeof(REAL_internal_gamemode_request_end_for),
-		  false },
-		{ "real_gamemode_query_status_for",
-		  (void **)&REAL_internal_gamemode_query_status_for,
-		  sizeof(REAL_internal_gamemode_query_status_for),
-		  false },
-	};
-
-	void *libgamemode = NULL;
-
-	/* Try and load libgamemode */
-	libgamemode = dlopen("libgamemode.so.0", RTLD_NOW);
-	if (!libgamemode) {
-		/* Attempt to load unversioned library for compatibility with older
-		 * versions (as of writing, there are no ABI changes between the two -
-		 * this may need to change if ever ABI-breaking changes are made) */
-		libgamemode = dlopen("libgamemode.so", RTLD_NOW);
-		if (!libgamemode) {
-			snprintf(internal_gamemode_client_error_string,
-			         sizeof(internal_gamemode_client_error_string),
-			         "dlopen failed - %s",
-			         dlerror());
-			internal_libgamemode_loaded = -1;
-			return -1;
-		}
-	}
-
-	/* Attempt to bind all symbols */
-	for (size_t i = 0; i < sizeof(bindings) / sizeof(bindings[0]); i++) {
-		struct binding *binder = &bindings[i];
-
-		if (internal_bind_libgamemode_symbol(libgamemode,
-		                                     binder->name,
-		                                     binder->functor,
-		                                     binder->func_size,
-		                                     binder->required)) {
-			internal_libgamemode_loaded = -1;
-			return -1;
-		};
-	}
-
-	/* Success */
-	internal_libgamemode_loaded = 0;
-	return 0;
-}
-
-/**
- * Redirect to the real libgamemode
- */
-__attribute__((always_inline)) static inline const char *gamemode_error_string(void)
-{
-	/* If we fail to load the system gamemode, or we have an error string already, return our error
-	 * string instead of diverting to the system version */
-	if (internal_load_libgamemode() < 0 || internal_gamemode_client_error_string[0] != '\0') {
-		return internal_gamemode_client_error_string;
-	}
-
-	/* Assert for static analyser that the function is not NULL */
-	assert(REAL_internal_gamemode_error_string != NULL);
-
-	return REAL_internal_gamemode_error_string();
-}
-
-/**
- * Redirect to the real libgamemode
- * Allow automatically requesting game mode
- * Also prints errors as they happen.
- */
-#ifdef GAMEMODE_AUTO
-__attribute__((constructor))
-#else
-__attribute__((always_inline)) static inline
-#endif
-int gamemode_request_start(void)
-{
-	/* Need to load gamemode */
-	if (internal_load_libgamemode() < 0) {
-#ifdef GAMEMODE_AUTO
-		fprintf(stderr, "gamemodeauto: %s\n", gamemode_error_string());
-#endif
-		return -1;
-	}
-
-	/* Assert for static analyser that the function is not NULL */
-	assert(REAL_internal_gamemode_request_start != NULL);
-
-	if (REAL_internal_gamemode_request_start() < 0) {
-#ifdef GAMEMODE_AUTO
-		fprintf(stderr, "gamemodeauto: %s\n", gamemode_error_string());
-#endif
-		return -1;
-	}
-
-	return 0;
-}
-
-/* Redirect to the real libgamemode */
-#ifdef GAMEMODE_AUTO
-__attribute__((destructor))
-#else
-__attribute__((always_inline)) static inline
-#endif
-int gamemode_request_end(void)
-{
-	/* Need to load gamemode */
-	if (internal_load_libgamemode() < 0) {
-#ifdef GAMEMODE_AUTO
-		fprintf(stderr, "gamemodeauto: %s\n", gamemode_error_string());
-#endif
-		return -1;
-	}
-
-	/* Assert for static analyser that the function is not NULL */
-	assert(REAL_internal_gamemode_request_end != NULL);
-
-	if (REAL_internal_gamemode_request_end() < 0) {
-#ifdef GAMEMODE_AUTO
-		fprintf(stderr, "gamemodeauto: %s\n", gamemode_error_string());
-#endif
-		return -1;
-	}
-
-	return 0;
-}
-
-/* Redirect to the real libgamemode */
-__attribute__((always_inline)) static inline int gamemode_query_status(void)
-{
-	/* Need to load gamemode */
-	if (internal_load_libgamemode() < 0) {
-		return -1;
-	}
-
-	if (REAL_internal_gamemode_query_status == NULL) {
-		snprintf(internal_gamemode_client_error_string,
-		         sizeof(internal_gamemode_client_error_string),
-		         "gamemode_query_status missing (older host?)");
-		return -1;
-	}
-
-	return REAL_internal_gamemode_query_status();
-}
-
-/* Redirect to the real libgamemode */
-__attribute__((always_inline)) static inline int gamemode_request_start_for(pid_t pid)
-{
-	/* Need to load gamemode */
-	if (internal_load_libgamemode() < 0) {
-		return -1;
-	}
-
-	if (REAL_internal_gamemode_request_start_for == NULL) {
-		snprintf(internal_gamemode_client_error_string,
-		         sizeof(internal_gamemode_client_error_string),
-		         "gamemode_request_start_for missing (older host?)");
-		return -1;
-	}
-
-	return REAL_internal_gamemode_request_start_for(pid);
-}
-
-/* Redirect to the real libgamemode */
-__attribute__((always_inline)) static inline int gamemode_request_end_for(pid_t pid)
-{
-	/* Need to load gamemode */
-	if (internal_load_libgamemode() < 0) {
-		return -1;
-	}
-
-	if (REAL_internal_gamemode_request_end_for == NULL) {
-		snprintf(internal_gamemode_client_error_string,
-		         sizeof(internal_gamemode_client_error_string),
-		         "gamemode_request_end_for missing (older host?)");
-		return -1;
-	}
-
-	return REAL_internal_gamemode_request_end_for(pid);
-}
-
-/* Redirect to the real libgamemode */
-__attribute__((always_inline)) static inline int gamemode_query_status_for(pid_t pid)
-{
-	/* Need to load gamemode */
-	if (internal_load_libgamemode() < 0) {
-		return -1;
-	}
-
-	if (REAL_internal_gamemode_query_status_for == NULL) {
-		snprintf(internal_gamemode_client_error_string,
-		         sizeof(internal_gamemode_client_error_string),
-		         "gamemode_query_status_for missing (older host?)");
-		return -1;
-	}
-
-	return REAL_internal_gamemode_query_status_for(pid);
-}
-
-#endif // CLIENT_GAMEMODE_H
--- a/externals/inih/CMakeLists.txt
+++ b/externals/inih/CMakeLists.txt
@@ -0,0 +1,13 @@
+# SPDX-FileCopyrightText: 2014 Gui Andrade <admin@archshift.com>
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+add_library(inih
+    inih/ini.c
+    inih/ini.h
+    inih/cpp/INIReader.cpp
+    inih/cpp/INIReader.h
+)
+
+create_target_directory_groups(inih)
+target_include_directories(inih INTERFACE inih/cpp)
+add_library(inih::INIReader ALIAS inih)
--- a/externals/inih/inih
+++ b/externals/inih/inih
--- a/externals/nx_tzdb/tzdb_to_nx
+++ b/externals/nx_tzdb/tzdb_to_nx
--- a/externals/oaknut
+++ b/externals/oaknut
--- a/externals/simpleini
+++ b/externals/simpleini
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -187,7 +187,6 @@ add_subdirectory(audio_core)
 add_subdirectory(video_core)
 add_subdirectory(network)
 add_subdirectory(input_common)
-add_subdirectory(frontend_common)
 add_subdirectory(shader_recompiler)

 if (YUZU_ROOM)
--- a/src/android/app/build.gradle.kts
+++ b/src/android/app/build.gradle.kts
@@ -219,6 +219,7 @@ dependencies {
    implementation("io.coil-kt:coil:2.2.2")
    implementation("androidx.core:core-splashscreen:1.0.1")
    implementation("androidx.window:window:1.2.0-beta03")
+    implementation("org.ini4j:ini4j:0.5.4")
    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
    implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
    implementation("androidx.navigation:navigation-fragment-ktx:2.7.4")
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/NativeLibrary.kt
@@ -230,6 +230,8 @@ object NativeLibrary {
     */
    external fun onTouchReleased(finger_id: Int)

+    external fun reloadSettings()
+
    external fun initGameIni(gameID: String?)

    external fun setAppDirectory(directory: String)
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/FolderAdapter.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/adapters/FolderAdapter.kt
@@ -1,76 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.adapters
-
-import android.net.Uri
-import android.text.TextUtils
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.fragment.app.FragmentActivity
-import androidx.recyclerview.widget.AsyncDifferConfig
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.ListAdapter
-import androidx.recyclerview.widget.RecyclerView
-import org.yuzu.yuzu_emu.databinding.CardFolderBinding
-import org.yuzu.yuzu_emu.fragments.GameFolderPropertiesDialogFragment
-import org.yuzu.yuzu_emu.model.GameDir
-import org.yuzu.yuzu_emu.model.GamesViewModel
-
-class FolderAdapter(val activity: FragmentActivity, val gamesViewModel: GamesViewModel) :
-    ListAdapter<GameDir, FolderAdapter.FolderViewHolder>(
-        AsyncDifferConfig.Builder(DiffCallback()).build()
-    ) {
-    override fun onCreateViewHolder(
-        parent: ViewGroup,
-        viewType: Int
-    ): FolderAdapter.FolderViewHolder {
-        CardFolderBinding.inflate(LayoutInflater.from(parent.context), parent, false)
-            .also { return FolderViewHolder(it) }
-    }
-
-    override fun onBindViewHolder(holder: FolderAdapter.FolderViewHolder, position: Int) =
-        holder.bind(currentList[position])
-
-    inner class FolderViewHolder(val binding: CardFolderBinding) :
-        RecyclerView.ViewHolder(binding.root) {
-        private lateinit var gameDir: GameDir
-
-        fun bind(gameDir: GameDir) {
-            this.gameDir = gameDir
-
-            binding.apply {
-                path.text = Uri.parse(gameDir.uriString).path
-                path.postDelayed(
-                    {
-                        path.isSelected = true
-                        path.ellipsize = TextUtils.TruncateAt.MARQUEE
-                    },
-                    3000
-                )
-
-                buttonEdit.setOnClickListener {
-                    GameFolderPropertiesDialogFragment.newInstance(this@FolderViewHolder.gameDir)
-                        .show(
-                            activity.supportFragmentManager,
-                            GameFolderPropertiesDialogFragment.TAG
-                        )
-                }
-
-                buttonDelete.setOnClickListener {
-                    gamesViewModel.removeFolder(this@FolderViewHolder.gameDir)
-                }
-            }
-        }
-    }
-
-    private class DiffCallback : DiffUtil.ItemCallback<GameDir>() {
-        override fun areItemsTheSame(oldItem: GameDir, newItem: GameDir): Boolean {
-            return oldItem == newItem
-        }
-
-        override fun areContentsTheSame(oldItem: GameDir, newItem: GameDir): Boolean {
-            return oldItem == newItem
-        }
-    }
-}
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/Settings.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/Settings.kt
@@ -3,9 +3,33 @@

 package org.yuzu.yuzu_emu.features.settings.model

+import android.text.TextUtils
+import android.widget.Toast
 import org.yuzu.yuzu_emu.R
+import org.yuzu.yuzu_emu.YuzuApplication
+import org.yuzu.yuzu_emu.features.settings.utils.SettingsFile

 object Settings {
+    private val context get() = YuzuApplication.appContext
+
+    fun saveSettings(gameId: String = "") {
+        if (TextUtils.isEmpty(gameId)) {
+            Toast.makeText(
+                context,
+                context.getString(R.string.ini_saved),
+                Toast.LENGTH_SHORT
+            ).show()
+            SettingsFile.saveFile(SettingsFile.FILE_NAME_CONFIG)
+        } else {
+            // TODO: Save custom game settings
+            Toast.makeText(
+                context,
+                context.getString(R.string.gameid_saved, gameId),
+                Toast.LENGTH_SHORT
+            ).show()
+        }
+    }
+
    enum class Category {
        Android,
        Audio,
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt
@@ -19,13 +19,13 @@ import androidx.lifecycle.repeatOnLifecycle
 import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.navArgs
 import com.google.android.material.color.MaterialColors
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
+import org.yuzu.yuzu_emu.NativeLibrary
 import java.io.IOException
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.databinding.ActivitySettingsBinding
+import org.yuzu.yuzu_emu.features.settings.model.Settings
 import org.yuzu.yuzu_emu.features.settings.utils.SettingsFile
 import org.yuzu.yuzu_emu.fragments.ResetSettingsDialogFragment
 import org.yuzu.yuzu_emu.model.SettingsViewModel
@@ -54,6 +54,10 @@ class SettingsActivity : AppCompatActivity() {

        WindowCompat.setDecorFitsSystemWindows(window, false)

+        if (savedInstanceState != null) {
+            settingsViewModel.shouldSave = savedInstanceState.getBoolean(KEY_SHOULD_SAVE)
+        }
+
        if (InsetsHelper.getSystemGestureType(applicationContext) !=
            InsetsHelper.GESTURE_NAVIGATION
        ) {
@@ -124,6 +128,12 @@ class SettingsActivity : AppCompatActivity() {
        }
    }

+    override fun onSaveInstanceState(outState: Bundle) {
+        // Critical: If super method is not called, rotations will be busted.
+        super.onSaveInstanceState(outState)
+        outState.putBoolean(KEY_SHOULD_SAVE, settingsViewModel.shouldSave)
+    }
+
    override fun onStart() {
        super.onStart()
        // TODO: Load custom settings contextually
@@ -132,10 +142,16 @@ class SettingsActivity : AppCompatActivity() {
        }
    }

+    /**
+     * If this is called, the user has left the settings screen (potentially through the
+     * home button) and will expect their changes to be persisted. So we kick off an
+     * IntentService which will do so on a background thread.
+     */
    override fun onStop() {
        super.onStop()
-        CoroutineScope(Dispatchers.IO).launch {
-            NativeConfig.saveSettings()
+        if (isFinishing && settingsViewModel.shouldSave) {
+            Log.debug("[SettingsActivity] Settings activity stopping. Saving settings to INI...")
+            Settings.saveSettings()
        }
    }

@@ -145,13 +161,15 @@ class SettingsActivity : AppCompatActivity() {
    }

    fun onSettingsReset() {
+        // Prevents saving to a non-existent settings file
+        settingsViewModel.shouldSave = false
+
        // Delete settings file because the user may have changed values that do not exist in the UI
-        NativeConfig.unloadConfig()
        val settingsFile = SettingsFile.getSettingsFile(SettingsFile.FILE_NAME_CONFIG)
        if (!settingsFile.delete()) {
            throw IOException("Failed to delete $settingsFile")
        }
-        NativeConfig.initializeConfig()
+        NativeLibrary.reloadSettings()

        Toast.makeText(
            applicationContext,
@@ -176,4 +194,8 @@ class SettingsActivity : AppCompatActivity() {
            windowInsets
        }
    }
+
+    companion object {
+        private const val KEY_SHOULD_SAVE = "should_save"
+    }
 }
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsAdapter.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsAdapter.kt
@@ -105,6 +105,7 @@ class SettingsAdapter(
    fun onBooleanClick(item: SwitchSetting, checked: Boolean) {
        item.checked = checked
        settingsViewModel.setShouldReloadSettingsList(true)
+        settingsViewModel.shouldSave = true
    }

    fun onSingleChoiceClick(item: SingleChoiceSetting, position: Int) {
@@ -160,6 +161,7 @@ class SettingsAdapter(
            epochTime += timePicker.hour.toLong() * 60 * 60
            epochTime += timePicker.minute.toLong() * 60
            if (item.value != epochTime) {
+                settingsViewModel.shouldSave = true
                notifyItemChanged(position)
                item.value = epochTime
            }
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/utils/SettingsFile.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/utils/SettingsFile.kt
@@ -3,8 +3,15 @@

 package org.yuzu.yuzu_emu.features.settings.utils

+import android.widget.Toast
 import java.io.*
+import org.ini4j.Wini
+import org.yuzu.yuzu_emu.R
+import org.yuzu.yuzu_emu.YuzuApplication
+import org.yuzu.yuzu_emu.features.settings.model.*
 import org.yuzu.yuzu_emu.utils.DirectoryInitialization
+import org.yuzu.yuzu_emu.utils.Log
+import org.yuzu.yuzu_emu.utils.NativeConfig

 /**
 * Contains static methods for interacting with .ini files in which settings are stored.
@@ -12,6 +19,41 @@ import org.yuzu.yuzu_emu.utils.DirectoryInitialization
 object SettingsFile {
    const val FILE_NAME_CONFIG = "config"

+    /**
+     * Saves a Settings HashMap to a given .ini file on disk. If unsuccessful, outputs an error
+     * telling why it failed.
+     *
+     * @param fileName The target filename without a path or extension.
+     */
+    fun saveFile(fileName: String) {
+        val ini = getSettingsFile(fileName)
+        try {
+            val wini = Wini(ini)
+            for (specificCategory in Settings.Category.values()) {
+                val categoryHeader = NativeConfig.getConfigHeader(specificCategory.ordinal)
+                for (setting in Settings.settingsList) {
+                    if (setting.key!!.isEmpty()) continue
+
+                    val settingCategoryHeader =
+                        NativeConfig.getConfigHeader(setting.category.ordinal)
+                    val iniSetting: String? = wini.get(categoryHeader, setting.key)
+                    if (iniSetting != null || settingCategoryHeader == categoryHeader) {
+                        wini.put(settingCategoryHeader, setting.key, setting.valueAsString)
+                    }
+                }
+            }
+            wini.store()
+        } catch (e: IOException) {
+            Log.error("[SettingsFile] File not found: " + fileName + ".ini: " + e.message)
+            val context = YuzuApplication.appContext
+            Toast.makeText(
+                context,
+                context.getString(R.string.error_saving, fileName, e.message),
+                Toast.LENGTH_SHORT
+            ).show()
+        }
+    }
+
    fun getSettingsFile(fileName: String): File =
        File(DirectoryInitialization.userDirectory + "/config/" + fileName + ".ini")
 }
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AddGameFolderDialogFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/AddGameFolderDialogFragment.kt
@@ -1,53 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.fragments
-
-import android.app.Dialog
-import android.content.DialogInterface
-import android.net.Uri
-import android.os.Bundle
-import androidx.fragment.app.DialogFragment
-import androidx.fragment.app.activityViewModels
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import org.yuzu.yuzu_emu.R
-import org.yuzu.yuzu_emu.databinding.DialogAddFolderBinding
-import org.yuzu.yuzu_emu.model.GameDir
-import org.yuzu.yuzu_emu.model.GamesViewModel
-
-class AddGameFolderDialogFragment : DialogFragment() {
-    private val gamesViewModel: GamesViewModel by activityViewModels()
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val binding = DialogAddFolderBinding.inflate(layoutInflater)
-        val folderUriString = requireArguments().getString(FOLDER_URI_STRING)
-        if (folderUriString == null) {
-            dismiss()
-        }
-        binding.path.text = Uri.parse(folderUriString).path
-
-        return MaterialAlertDialogBuilder(requireContext())
-            .setTitle(R.string.add_game_folder)
-            .setPositiveButton(android.R.string.ok) { _: DialogInterface, _: Int ->
-                val newGameDir = GameDir(folderUriString!!, binding.deepScanSwitch.isChecked)
-                gamesViewModel.addFolder(newGameDir)
-            }
-            .setNegativeButton(android.R.string.cancel, null)
-            .setView(binding.root)
-            .show()
-    }
-
-    companion object {
-        const val TAG = "AddGameFolderDialogFragment"
-
-        private const val FOLDER_URI_STRING = "FolderUriString"
-
-        fun newInstance(folderUriString: String): AddGameFolderDialogFragment {
-            val args = Bundle()
-            args.putString(FOLDER_URI_STRING, folderUriString)
-            val fragment = AddGameFolderDialogFragment()
-            fragment.arguments = args
-            return fragment
-        }
-    }
-}
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GameFolderPropertiesDialogFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GameFolderPropertiesDialogFragment.kt
@@ -1,72 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.fragments
-
-import android.app.Dialog
-import android.content.DialogInterface
-import android.os.Bundle
-import androidx.fragment.app.DialogFragment
-import androidx.fragment.app.activityViewModels
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import org.yuzu.yuzu_emu.R
-import org.yuzu.yuzu_emu.databinding.DialogFolderPropertiesBinding
-import org.yuzu.yuzu_emu.model.GameDir
-import org.yuzu.yuzu_emu.model.GamesViewModel
-import org.yuzu.yuzu_emu.utils.SerializableHelper.parcelable
-
-class GameFolderPropertiesDialogFragment : DialogFragment() {
-    private val gamesViewModel: GamesViewModel by activityViewModels()
-
-    private var deepScan = false
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val binding = DialogFolderPropertiesBinding.inflate(layoutInflater)
-        val gameDir = requireArguments().parcelable<GameDir>(GAME_DIR)!!
-
-        // Restore checkbox state
-        binding.deepScanSwitch.isChecked =
-            savedInstanceState?.getBoolean(DEEP_SCAN) ?: gameDir.deepScan
-
-        // Ensure that we can get the checkbox state even if the view is destroyed
-        deepScan = binding.deepScanSwitch.isChecked
-        binding.deepScanSwitch.setOnClickListener {
-            deepScan = binding.deepScanSwitch.isChecked
-        }
-
-        return MaterialAlertDialogBuilder(requireContext())
-            .setView(binding.root)
-            .setTitle(R.string.game_folder_properties)
-            .setPositiveButton(android.R.string.ok) { _: DialogInterface, _: Int ->
-                val folderIndex = gamesViewModel.folders.value.indexOf(gameDir)
-                if (folderIndex != -1) {
-                    gamesViewModel.folders.value[folderIndex].deepScan =
-                        binding.deepScanSwitch.isChecked
-                    gamesViewModel.updateGameDirs()
-                }
-            }
-            .setNegativeButton(android.R.string.cancel, null)
-            .show()
-    }
-
-    override fun onSaveInstanceState(outState: Bundle) {
-        super.onSaveInstanceState(outState)
-        outState.putBoolean(DEEP_SCAN, deepScan)
-    }
-
-    companion object {
-        const val TAG = "GameFolderPropertiesDialogFragment"
-
-        private const val GAME_DIR = "GameDir"
-
-        private const val DEEP_SCAN = "DeepScan"
-
-        fun newInstance(gameDir: GameDir): GameFolderPropertiesDialogFragment {
-            val args = Bundle()
-            args.putParcelable(GAME_DIR, gameDir)
-            val fragment = GameFolderPropertiesDialogFragment()
-            fragment.arguments = args
-            return fragment
-        }
-    }
-}
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GameFoldersFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GameFoldersFragment.kt
@@ -1,128 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.fragments
-
-import android.content.Intent
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
-import androidx.core.view.updatePadding
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
-import androidx.navigation.findNavController
-import androidx.recyclerview.widget.GridLayoutManager
-import com.google.android.material.transition.MaterialSharedAxis
-import kotlinx.coroutines.launch
-import org.yuzu.yuzu_emu.R
-import org.yuzu.yuzu_emu.adapters.FolderAdapter
-import org.yuzu.yuzu_emu.databinding.FragmentFoldersBinding
-import org.yuzu.yuzu_emu.model.GamesViewModel
-import org.yuzu.yuzu_emu.model.HomeViewModel
-import org.yuzu.yuzu_emu.ui.main.MainActivity
-
-class GameFoldersFragment : Fragment() {
-    private var _binding: FragmentFoldersBinding? = null
-    private val binding get() = _binding!!
-
-    private val homeViewModel: HomeViewModel by activityViewModels()
-    private val gamesViewModel: GamesViewModel by activityViewModels()
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        enterTransition = MaterialSharedAxis(MaterialSharedAxis.X, true)
-        returnTransition = MaterialSharedAxis(MaterialSharedAxis.X, false)
-        reenterTransition = MaterialSharedAxis(MaterialSharedAxis.X, false)
-
-        gamesViewModel.onOpenGameFoldersFragment()
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        _binding = FragmentFoldersBinding.inflate(inflater)
-        return binding.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        homeViewModel.setNavigationVisibility(visible = false, animated = true)
-        homeViewModel.setStatusBarShadeVisibility(visible = false)
-
-        binding.toolbarFolders.setNavigationOnClickListener {
-            binding.root.findNavController().popBackStack()
-        }
-
-        binding.listFolders.apply {
-            layoutManager = GridLayoutManager(
-                requireContext(),
-                resources.getInteger(R.integer.grid_columns)
-            )
-            adapter = FolderAdapter(requireActivity(), gamesViewModel)
-        }
-
-        viewLifecycleOwner.lifecycleScope.launch {
-            repeatOnLifecycle(Lifecycle.State.CREATED) {
-                gamesViewModel.folders.collect {
-                    (binding.listFolders.adapter as FolderAdapter).submitList(it)
-                }
-            }
-        }
-
-        val mainActivity = requireActivity() as MainActivity
-        binding.buttonAdd.setOnClickListener {
-            mainActivity.getGamesDirectory.launch(Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).data)
-        }
-
-        setInsets()
-    }
-
-    override fun onStop() {
-        super.onStop()
-        gamesViewModel.onCloseGameFoldersFragment()
-    }
-
-    private fun setInsets() =
-        ViewCompat.setOnApplyWindowInsetsListener(
-            binding.root
-        ) { _: View, windowInsets: WindowInsetsCompat ->
-            val barInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
-            val cutoutInsets = windowInsets.getInsets(WindowInsetsCompat.Type.displayCutout())
-
-            val leftInsets = barInsets.left + cutoutInsets.left
-            val rightInsets = barInsets.right + cutoutInsets.right
-
-            val mlpToolbar = binding.toolbarFolders.layoutParams as ViewGroup.MarginLayoutParams
-            mlpToolbar.leftMargin = leftInsets
-            mlpToolbar.rightMargin = rightInsets
-            binding.toolbarFolders.layoutParams = mlpToolbar
-
-            val fabSpacing = resources.getDimensionPixelSize(R.dimen.spacing_fab)
-            val mlpFab =
-                binding.buttonAdd.layoutParams as ViewGroup.MarginLayoutParams
-            mlpFab.leftMargin = leftInsets + fabSpacing
-            mlpFab.rightMargin = rightInsets + fabSpacing
-            mlpFab.bottomMargin = barInsets.bottom + fabSpacing
-            binding.buttonAdd.layoutParams = mlpFab
-
-            val mlpListFolders = binding.listFolders.layoutParams as ViewGroup.MarginLayoutParams
-            mlpListFolders.leftMargin = leftInsets
-            mlpListFolders.rightMargin = rightInsets
-            binding.listFolders.layoutParams = mlpListFolders
-
-            binding.listFolders.updatePadding(
-                bottom = barInsets.bottom +
-                    resources.getDimensionPixelSize(R.dimen.spacing_bottom_list_fab)
-            )
-
-            windowInsets
-        }
-}
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/HomeSettingsFragment.kt
@@ -127,13 +127,18 @@ class HomeSettingsFragment : Fragment() {
            )
            add(
                HomeSetting(
-                    R.string.manage_game_folders,
+                    R.string.select_games_folder,
                    R.string.select_games_folder_description,
                    R.drawable.ic_add,
                    {
-                        binding.root.findNavController()
-                            .navigate(R.id.action_homeSettingsFragment_to_gameFoldersFragment)
-                    }
+                        mainActivity.getGamesDirectory.launch(
+                            Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).data
+                        )
+                    },
+                    { true },
+                    0,
+                    0,
+                    homeViewModel.gamesDir
                )
            )
            add(
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SettingsDialogFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SettingsDialogFragment.kt
@@ -52,6 +52,7 @@ class SettingsDialogFragment : DialogFragment(), DialogInterface.OnClickListener
                    .setPositiveButton(android.R.string.ok) { _: DialogInterface, _: Int ->
                        settingsViewModel.clickedItem!!.setting.reset()
                        settingsViewModel.setAdapterItemChanged(position)
+                        settingsViewModel.shouldSave = true
                    }
                    .setNegativeButton(android.R.string.cancel, null)
                    .create()
@@ -136,17 +137,24 @@ class SettingsDialogFragment : DialogFragment(), DialogInterface.OnClickListener
            is SingleChoiceSetting -> {
                val scSetting = settingsViewModel.clickedItem as SingleChoiceSetting
                val value = getValueForSingleChoiceSelection(scSetting, which)
+                if (scSetting.selectedValue != value) {
+                    settingsViewModel.shouldSave = true
+                }
                scSetting.selectedValue = value
            }

            is StringSingleChoiceSetting -> {
                val scSetting = settingsViewModel.clickedItem as StringSingleChoiceSetting
                val value = scSetting.getValueAt(which)
+                if (scSetting.selectedValue != value) settingsViewModel.shouldSave = true
                scSetting.selectedValue = value
            }

            is SliderSetting -> {
                val sliderSetting = settingsViewModel.clickedItem as SliderSetting
+                if (sliderSetting.selectedValue != settingsViewModel.sliderProgress.value) {
+                    settingsViewModel.shouldSave = true
+                }
                sliderSetting.selectedValue = settingsViewModel.sliderProgress.value
            }
        }
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SetupFragment.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/SetupFragment.kt
@@ -42,7 +42,7 @@ import org.yuzu.yuzu_emu.model.SetupPage
 import org.yuzu.yuzu_emu.model.StepState
 import org.yuzu.yuzu_emu.ui.main.MainActivity
 import org.yuzu.yuzu_emu.utils.DirectoryInitialization
-import org.yuzu.yuzu_emu.utils.NativeConfig
+import org.yuzu.yuzu_emu.utils.GameHelper
 import org.yuzu.yuzu_emu.utils.ViewUtils

 class SetupFragment : Fragment() {
@@ -184,7 +184,11 @@ class SetupFragment : Fragment() {
                    R.string.add_games_warning_description,
                    R.string.add_games_warning_help,
                    {
-                        if (NativeConfig.getGameDirs().isNotEmpty()) {
+                        val preferences =
+                            PreferenceManager.getDefaultSharedPreferences(
+                                YuzuApplication.appContext
+                            )
+                        if (preferences.getString(GameHelper.KEY_GAME_PATH, "")!!.isNotEmpty()) {
                            StepState.COMPLETE
                        } else {
                            StepState.INCOMPLETE
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/GameDir.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/GameDir.kt
@@ -1,13 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-package org.yuzu.yuzu_emu.model
-
-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
-
-@Parcelize
-data class GameDir(
-    val uriString: String,
-    var deepScan: Boolean
-) : Parcelable
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/GamesViewModel.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/GamesViewModel.kt
@@ -12,7 +12,6 @@ import java.util.Locale
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.decodeFromString
@@ -21,7 +20,6 @@ import org.yuzu.yuzu_emu.NativeLibrary
 import org.yuzu.yuzu_emu.YuzuApplication
 import org.yuzu.yuzu_emu.utils.GameHelper
 import org.yuzu.yuzu_emu.utils.GameMetadata
-import org.yuzu.yuzu_emu.utils.NativeConfig

 class GamesViewModel : ViewModel() {
    val games: StateFlow<List<Game>> get() = _games
@@ -42,9 +40,6 @@ class GamesViewModel : ViewModel() {
    val searchFocused: StateFlow<Boolean> get() = _searchFocused
    private val _searchFocused = MutableStateFlow(false)

-    private val _folders = MutableStateFlow(mutableListOf<GameDir>())
-    val folders = _folders.asStateFlow()
-
    init {
        // Ensure keys are loaded so that ROM metadata can be decrypted.
        NativeLibrary.reloadKeys()
@@ -55,7 +50,6 @@ class GamesViewModel : ViewModel() {

        viewModelScope.launch {
            withContext(Dispatchers.IO) {
-                getGameDirs()
                if (storedGames!!.isNotEmpty()) {
                    val deserializedGames = mutableSetOf<Game>()
                    storedGames.forEach {
@@ -110,7 +104,7 @@ class GamesViewModel : ViewModel() {
        _searchFocused.value = searchFocused
    }

-    fun reloadGames(directoriesChanged: Boolean) {
+    fun reloadGames(directoryChanged: Boolean) {
        if (isReloading.value) {
            return
        }
@@ -122,61 +116,10 @@ class GamesViewModel : ViewModel() {
                setGames(GameHelper.getGames())
                _isReloading.value = false

-                if (directoriesChanged) {
+                if (directoryChanged) {
                    setShouldSwapData(true)
                }
            }
        }
    }
-
-    fun addFolder(gameDir: GameDir) =
-        viewModelScope.launch {
-            withContext(Dispatchers.IO) {
-                NativeConfig.addGameDir(gameDir)
-                getGameDirs()
-            }
-        }
-
-    fun removeFolder(gameDir: GameDir) =
-        viewModelScope.launch {
-            withContext(Dispatchers.IO) {
-                val gameDirs = _folders.value.toMutableList()
-                val removedDirIndex = gameDirs.indexOf(gameDir)
-                if (removedDirIndex != -1) {
-                    gameDirs.removeAt(removedDirIndex)
-                    NativeConfig.setGameDirs(gameDirs.toTypedArray())
-                    getGameDirs()
-                }
-            }
-        }
-
-    fun updateGameDirs() =
-        viewModelScope.launch {
-            withContext(Dispatchers.IO) {
-                NativeConfig.setGameDirs(_folders.value.toTypedArray())
-                getGameDirs()
-            }
-        }
-
-    fun onOpenGameFoldersFragment() =
-        viewModelScope.launch {
-            withContext(Dispatchers.IO) {
-                getGameDirs()
-            }
-        }
-
-    fun onCloseGameFoldersFragment() =
-        viewModelScope.launch {
-            withContext(Dispatchers.IO) {
-                getGameDirs(true)
-            }
-        }
-
-    private fun getGameDirs(reloadList: Boolean = false) {
-        val gameDirs = NativeConfig.getGameDirs()
-        _folders.value = gameDirs.toMutableList()
-        if (reloadList) {
-            reloadGames(true)
-        }
-    }
 }
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/HomeViewModel.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/HomeViewModel.kt
@@ -3,9 +3,15 @@

 package org.yuzu.yuzu_emu.model

+import android.net.Uri
+import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import androidx.preference.PreferenceManager
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
+import org.yuzu.yuzu_emu.YuzuApplication
+import org.yuzu.yuzu_emu.utils.GameHelper

 class HomeViewModel : ViewModel() {
    val navigationVisible: StateFlow<Pair<Boolean, Boolean>> get() = _navigationVisible
@@ -17,6 +23,14 @@ class HomeViewModel : ViewModel() {
    val shouldPageForward: StateFlow<Boolean> get() = _shouldPageForward
    private val _shouldPageForward = MutableStateFlow(false)

+    val gamesDir: StateFlow<String> get() = _gamesDir
+    private val _gamesDir = MutableStateFlow(
+        Uri.parse(
+            PreferenceManager.getDefaultSharedPreferences(YuzuApplication.appContext)
+                .getString(GameHelper.KEY_GAME_PATH, "")
+        ).path ?: ""
+    )
+
    var navigatedToSetup = false

    fun setNavigationVisibility(visible: Boolean, animated: Boolean) {
@@ -36,4 +50,9 @@ class HomeViewModel : ViewModel() {
    fun setShouldPageForward(pageForward: Boolean) {
        _shouldPageForward.value = pageForward
    }
+
+    fun setGamesDir(activity: FragmentActivity, dir: String) {
+        ViewModelProvider(activity)[GamesViewModel::class.java].reloadGames(true)
+        _gamesDir.value = dir
+    }
 }
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/SettingsViewModel.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/SettingsViewModel.kt
@@ -13,6 +13,8 @@ import org.yuzu.yuzu_emu.features.settings.model.view.SettingsItem
 class SettingsViewModel : ViewModel() {
    var game: Game? = null

+    var shouldSave = false
+
    var clickedItem: SettingsItem? = null

    val shouldRecreate: StateFlow<Boolean> get() = _shouldRecreate
@@ -71,5 +73,6 @@ class SettingsViewModel : ViewModel() {

    fun clear() {
        game = null
+        shouldSave = false
    }
 }
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt
@@ -40,7 +40,6 @@ import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.activities.EmulationActivity
 import org.yuzu.yuzu_emu.databinding.ActivityMainBinding
 import org.yuzu.yuzu_emu.features.settings.model.Settings
-import org.yuzu.yuzu_emu.fragments.AddGameFolderDialogFragment
 import org.yuzu.yuzu_emu.fragments.IndeterminateProgressDialogFragment
 import org.yuzu.yuzu_emu.fragments.MessageDialogFragment
 import org.yuzu.yuzu_emu.getPublicFilesDir
@@ -253,13 +252,6 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
        super.onResume()
    }

-    override fun onStop() {
-        super.onStop()
-        CoroutineScope(Dispatchers.IO).launch {
-            NativeConfig.saveSettings()
-        }
-    }
-
    override fun onDestroy() {
        EmulationActivity.stopForegroundService(this)
        super.onDestroy()
@@ -301,19 +293,20 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
            Intent.FLAG_GRANT_READ_URI_PERMISSION
        )

-        val uriString = result.toString()
-        val folder = gamesViewModel.folders.value.firstOrNull { it.uriString == uriString }
-        if (folder != null) {
-            Toast.makeText(
-                applicationContext,
-                R.string.folder_already_added,
-                Toast.LENGTH_SHORT
-            ).show()
-            return
-        }
+        // When a new directory is picked, we currently will reset the existing games
+        // database. This effectively means that only one game directory is supported.
+        PreferenceManager.getDefaultSharedPreferences(applicationContext).edit()
+            .putString(GameHelper.KEY_GAME_PATH, result.toString())
+            .apply()

-        AddGameFolderDialogFragment.newInstance(uriString)
-            .show(supportFragmentManager, AddGameFolderDialogFragment.TAG)
+        Toast.makeText(
+            applicationContext,
+            R.string.games_dir_selected,
+            Toast.LENGTH_LONG
+        ).show()
+
+        gamesViewModel.reloadGames(true)
+        homeViewModel.setGamesDir(this, result.path!!)
    }

    val getProdKey =
@@ -632,7 +625,6 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                }

                // Clear existing user data
-                NativeConfig.unloadConfig()
                File(DirectoryInitialization.userDirectory!!).deleteRecursively()

                // Copy archive to internal storage
@@ -651,7 +643,6 @@ class MainActivity : AppCompatActivity(), ThemeProvider {

                // Reinitialize relevant data
                NativeLibrary.initializeSystem(true)
-                NativeConfig.initializeConfig()
                gamesViewModel.reloadGames(false)

                return@newInstance getString(R.string.user_data_import_success)
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/DirectoryInitialization.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/DirectoryInitialization.kt
@@ -16,7 +16,6 @@ object DirectoryInitialization {
        if (!areDirectoriesReady) {
            initializeInternalStorage()
            NativeLibrary.initializeSystem(false)
-            NativeConfig.initializeConfig()
            areDirectoriesReady = true
        }
    }
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/FileUtil.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/FileUtil.kt
@@ -364,27 +364,6 @@ object FileUtil {
            .lowercase()
    }

-    fun isTreeUriValid(uri: Uri): Boolean {
-        val resolver = context.contentResolver
-        val columns = arrayOf(
-            DocumentsContract.Document.COLUMN_DOCUMENT_ID,
-            DocumentsContract.Document.COLUMN_DISPLAY_NAME,
-            DocumentsContract.Document.COLUMN_MIME_TYPE
-        )
-        return try {
-            val docId: String = if (isRootTreeUri(uri)) {
-                DocumentsContract.getTreeDocumentId(uri)
-            } else {
-                DocumentsContract.getDocumentId(uri)
-            }
-            val childrenUri = DocumentsContract.buildChildDocumentsUriUsingTree(uri, docId)
-            resolver.query(childrenUri, columns, null, null, null)
-            true
-        } catch (_: Exception) {
-            false
-        }
-    }
-
    @Throws(IOException::class)
    fun getStringFromFile(file: File): String =
        String(file.readBytes(), StandardCharsets.UTF_8)
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GameHelper.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GameHelper.kt
@@ -11,11 +11,10 @@ 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.GameDir
 import org.yuzu.yuzu_emu.model.MinimalDocumentFile

 object GameHelper {
-    private const val KEY_OLD_GAME_PATH = "game_path"
+    const val KEY_GAME_PATH = "game_path"
    const val KEY_GAMES = "Games"

    private lateinit var preferences: SharedPreferences
@@ -23,43 +22,15 @@ object GameHelper {
    fun getGames(): List<Game> {
        val games = mutableListOf<Game>()
        val context = YuzuApplication.appContext
+        val gamesDir =
+            PreferenceManager.getDefaultSharedPreferences(context).getString(KEY_GAME_PATH, "")
+        val gamesUri = Uri.parse(gamesDir)
        preferences = PreferenceManager.getDefaultSharedPreferences(context)

-        val gameDirs = mutableListOf<GameDir>()
-        val oldGamesDir = preferences.getString(KEY_OLD_GAME_PATH, "") ?: ""
-        if (oldGamesDir.isNotEmpty()) {
-            gameDirs.add(GameDir(oldGamesDir, true))
-            preferences.edit().remove(KEY_OLD_GAME_PATH).apply()
-        }
-        gameDirs.addAll(NativeConfig.getGameDirs())
-
        // Ensure keys are loaded so that ROM metadata can be decrypted.
        NativeLibrary.reloadKeys()

-        val badDirs = mutableListOf<Int>()
-        gameDirs.forEachIndexed { index: Int, gameDir: GameDir ->
-            val gameDirUri = Uri.parse(gameDir.uriString)
-            val isValid = FileUtil.isTreeUriValid(gameDirUri)
-            if (isValid) {
-                addGamesRecursive(
-                    games,
-                    FileUtil.listFiles(gameDirUri),
-                    if (gameDir.deepScan) 3 else 1
-                )
-            } else {
-                badDirs.add(index)
-            }
-        }
-
-        // Remove all game dirs with insufficient permissions from config
-        if (badDirs.isNotEmpty()) {
-            var offset = 0
-            badDirs.forEach {
-                gameDirs.removeAt(it - offset)
-                offset++
-            }
-        }
-        NativeConfig.setGameDirs(gameDirs.toTypedArray())
+        addGamesRecursive(games, FileUtil.listFiles(gamesUri), 3)

        // Cache list of games found on disk
        val serializedGames = mutableSetOf<String>()
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/InputHandler.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/InputHandler.kt
@@ -27,8 +27,6 @@ object InputHandler {
            0x054C -> getInputDS5ButtonKey(event.keyCode)
            0x057E -> getInputJoyconButtonKey(event.keyCode)
            0x1532 -> getInputRazerButtonKey(event.keyCode)
-            0x3537 -> getInputRedmagicButtonKey(event.keyCode)
-            0x358A -> getInputBackboneLabsButtonKey(event.keyCode)
            else -> getInputGenericButtonKey(event.keyCode)
        }

@@ -229,42 +227,6 @@ object InputHandler {
        }
    }

-    private fun getInputRedmagicButtonKey(key: Int): Int {
-        return when (key) {
-            KeyEvent.KEYCODE_BUTTON_A -> NativeLibrary.ButtonType.BUTTON_B
-            KeyEvent.KEYCODE_BUTTON_B -> NativeLibrary.ButtonType.BUTTON_A
-            KeyEvent.KEYCODE_BUTTON_X -> NativeLibrary.ButtonType.BUTTON_Y
-            KeyEvent.KEYCODE_BUTTON_Y -> NativeLibrary.ButtonType.BUTTON_X
-            KeyEvent.KEYCODE_BUTTON_L1 -> NativeLibrary.ButtonType.TRIGGER_L
-            KeyEvent.KEYCODE_BUTTON_R1 -> NativeLibrary.ButtonType.TRIGGER_R
-            KeyEvent.KEYCODE_BUTTON_L2 -> NativeLibrary.ButtonType.TRIGGER_ZL
-            KeyEvent.KEYCODE_BUTTON_R2 -> NativeLibrary.ButtonType.TRIGGER_ZR
-            KeyEvent.KEYCODE_BUTTON_THUMBL -> NativeLibrary.ButtonType.STICK_L
-            KeyEvent.KEYCODE_BUTTON_THUMBR -> NativeLibrary.ButtonType.STICK_R
-            KeyEvent.KEYCODE_BUTTON_START -> NativeLibrary.ButtonType.BUTTON_PLUS
-            KeyEvent.KEYCODE_BUTTON_SELECT -> NativeLibrary.ButtonType.BUTTON_MINUS
-            else -> -1
-        }
-    }
-
-    private fun getInputBackboneLabsButtonKey(key: Int): Int {
-        return when (key) {
-            KeyEvent.KEYCODE_BUTTON_A -> NativeLibrary.ButtonType.BUTTON_B
-            KeyEvent.KEYCODE_BUTTON_B -> NativeLibrary.ButtonType.BUTTON_A
-            KeyEvent.KEYCODE_BUTTON_X -> NativeLibrary.ButtonType.BUTTON_Y
-            KeyEvent.KEYCODE_BUTTON_Y -> NativeLibrary.ButtonType.BUTTON_X
-            KeyEvent.KEYCODE_BUTTON_L1 -> NativeLibrary.ButtonType.TRIGGER_L
-            KeyEvent.KEYCODE_BUTTON_R1 -> NativeLibrary.ButtonType.TRIGGER_R
-            KeyEvent.KEYCODE_BUTTON_L2 -> NativeLibrary.ButtonType.TRIGGER_ZL
-            KeyEvent.KEYCODE_BUTTON_R2 -> NativeLibrary.ButtonType.TRIGGER_ZR
-            KeyEvent.KEYCODE_BUTTON_THUMBL -> NativeLibrary.ButtonType.STICK_L
-            KeyEvent.KEYCODE_BUTTON_THUMBR -> NativeLibrary.ButtonType.STICK_R
-            KeyEvent.KEYCODE_BUTTON_START -> NativeLibrary.ButtonType.BUTTON_PLUS
-            KeyEvent.KEYCODE_BUTTON_SELECT -> NativeLibrary.ButtonType.BUTTON_MINUS
-            else -> -1
-        }
-    }
-
    private fun getInputGenericButtonKey(key: Int): Int {
        return when (key) {
            KeyEvent.KEYCODE_BUTTON_A -> NativeLibrary.ButtonType.BUTTON_A
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/NativeConfig.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/NativeConfig.kt
@@ -3,33 +3,7 @@

 package org.yuzu.yuzu_emu.utils

-import org.yuzu.yuzu_emu.model.GameDir
-
 object NativeConfig {
-    /**
-     * Creates a Config object and opens the emulation config.
-     */
-    @Synchronized
-    external fun initializeConfig()
-
-    /**
-     * Destroys the stored config object. This automatically saves the existing config.
-     */
-    @Synchronized
-    external fun unloadConfig()
-
-    /**
-     * Reads values saved to the config file and saves them.
-     */
-    @Synchronized
-    external fun reloadSettings()
-
-    /**
-     * Saves settings values in memory to disk.
-     */
-    @Synchronized
-    external fun saveSettings()
-
    external fun getBoolean(key: String, getDefault: Boolean): Boolean
    external fun setBoolean(key: String, value: Boolean)

@@ -56,22 +30,4 @@ object NativeConfig {
    external fun getConfigHeader(category: Int): String

    external fun getPairedSettingKey(key: String): String
-
-    /**
-     * Gets every [GameDir] in AndroidSettings::values.game_dirs
-     */
-    @Synchronized
-    external fun getGameDirs(): Array<GameDir>
-
-    /**
-     * Clears the AndroidSettings::values.game_dirs array and replaces them with the provided array
-     */
-    @Synchronized
-    external fun setGameDirs(dirs: Array<GameDir>)
-
-    /**
-     * Adds a single [GameDir] to the AndroidSettings::values.game_dirs array
-     */
-    @Synchronized
-    external fun addGameDir(dir: GameDir)
 }
--- a/src/android/app/src/main/jni/CMakeLists.txt
+++ b/src/android/app/src/main/jni/CMakeLists.txt
@@ -6,6 +6,9 @@ add_library(yuzu-android SHARED
    android_common/android_common.h
    applets/software_keyboard.cpp
    applets/software_keyboard.h
+    config.cpp
+    config.h
+    default_ini.h
    emu_window/emu_window.cpp
    emu_window/emu_window.h
    id_cache.cpp
@@ -13,17 +16,15 @@ add_library(yuzu-android SHARED
    native.cpp
    native.h
    native_config.cpp
-    android_settings.cpp
+    uisettings.cpp
    game_metadata.cpp
    native_log.cpp
-    android_config.cpp
-    android_config.h
 )

 set_property(TARGET yuzu-android PROPERTY IMPORTED_LOCATION ${FFmpeg_LIBRARY_DIR})

-target_link_libraries(yuzu-android PRIVATE audio_core common core input_common frontend_common)
-target_link_libraries(yuzu-android PRIVATE android camera2ndk EGL glad jnigraphics log)
+target_link_libraries(yuzu-android PRIVATE audio_core common core input_common)
+target_link_libraries(yuzu-android PRIVATE android camera2ndk EGL glad inih jnigraphics log)
 if (ARCHITECTURE_arm64)
    target_link_libraries(yuzu-android PRIVATE adrenotools)
 endif()
--- a/src/android/app/src/main/jni/android_config.cpp
+++ b/src/android/app/src/main/jni/android_config.cpp
@@ -1,120 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "android_config.h"
-#include "android_settings.h"
-#include "common/settings_setting.h"
-
-AndroidConfig::AndroidConfig(const std::string& config_name, ConfigType config_type)
-    : Config(config_type) {
-    Initialize(config_name);
-    if (config_type != ConfigType::InputProfile) {
-        ReadAndroidValues();
-        SaveAndroidValues();
-    }
-}
-
-AndroidConfig::~AndroidConfig() {
-    if (global) {
-        AndroidConfig::SaveAllValues();
-    }
-}
-
-void AndroidConfig::ReloadAllValues() {
-    Reload();
-    ReadAndroidValues();
-    SaveAndroidValues();
-}
-
-void AndroidConfig::SaveAllValues() {
-    Save();
-    SaveAndroidValues();
-}
-
-void AndroidConfig::ReadAndroidValues() {
-    if (global) {
-        ReadAndroidUIValues();
-        ReadUIValues();
-    }
-}
-
-void AndroidConfig::ReadAndroidUIValues() {
-    BeginGroup(Settings::TranslateCategory(Settings::Category::Android));
-
-    ReadCategory(Settings::Category::Android);
-
-    EndGroup();
-}
-
-void AndroidConfig::ReadUIValues() {
-    BeginGroup(Settings::TranslateCategory(Settings::Category::Ui));
-
-    ReadPathValues();
-
-    EndGroup();
-}
-
-void AndroidConfig::ReadPathValues() {
-    BeginGroup(Settings::TranslateCategory(Settings::Category::Paths));
-
-    const int gamedirs_size = BeginArray(std::string("gamedirs"));
-    for (int i = 0; i < gamedirs_size; ++i) {
-        SetArrayIndex(i);
-        AndroidSettings::GameDir game_dir;
-        game_dir.path = ReadStringSetting(std::string("path"));
-        game_dir.deep_scan =
-            ReadBooleanSetting(std::string("deep_scan"), std::make_optional(false));
-        AndroidSettings::values.game_dirs.push_back(game_dir);
-    }
-    EndArray();
-
-    EndGroup();
-}
-
-void AndroidConfig::SaveAndroidValues() {
-    if (global) {
-        SaveAndroidUIValues();
-        SaveUIValues();
-    }
-
-    WriteToIni();
-}
-
-void AndroidConfig::SaveAndroidUIValues() {
-    BeginGroup(Settings::TranslateCategory(Settings::Category::Android));
-
-    WriteCategory(Settings::Category::Android);
-
-    EndGroup();
-}
-
-void AndroidConfig::SaveUIValues() {
-    BeginGroup(Settings::TranslateCategory(Settings::Category::Ui));
-
-    SavePathValues();
-
-    EndGroup();
-}
-
-void AndroidConfig::SavePathValues() {
-    BeginGroup(Settings::TranslateCategory(Settings::Category::Paths));
-
-    BeginArray(std::string("gamedirs"));
-    for (size_t i = 0; i < AndroidSettings::values.game_dirs.size(); ++i) {
-        SetArrayIndex(i);
-        const auto& game_dir = AndroidSettings::values.game_dirs[i];
-        WriteSetting(std::string("path"), game_dir.path);
-        WriteSetting(std::string("deep_scan"), game_dir.deep_scan, std::make_optional(false));
-    }
-    EndArray();
-
-    EndGroup();
-}
-
-std::vector<Settings::BasicSetting*>& AndroidConfig::FindRelevantList(Settings::Category category) {
-    auto& map = Settings::values.linkage.by_category;
-    if (map.contains(category)) {
-        return Settings::values.linkage.by_category[category];
-    }
-    return AndroidSettings::values.linkage.by_category[category];
-}
--- a/src/android/app/src/main/jni/android_config.h
+++ b/src/android/app/src/main/jni/android_config.h
@@ -1,41 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "frontend_common/config.h"
-
-class AndroidConfig final : public Config {
-public:
-    explicit AndroidConfig(const std::string& config_name = "config",
-                           ConfigType config_type = ConfigType::GlobalConfig);
-    ~AndroidConfig() override;
-
-    void ReloadAllValues() override;
-    void SaveAllValues() override;
-
-protected:
-    void ReadAndroidValues();
-    void ReadAndroidUIValues();
-    void ReadHidbusValues() override {}
-    void ReadDebugControlValues() override {}
-    void ReadPathValues() override;
-    void ReadShortcutValues() override {}
-    void ReadUIValues() override;
-    void ReadUIGamelistValues() override {}
-    void ReadUILayoutValues() override {}
-    void ReadMultiplayerValues() override {}
-
-    void SaveAndroidValues();
-    void SaveAndroidUIValues();
-    void SaveHidbusValues() override {}
-    void SaveDebugControlValues() override {}
-    void SavePathValues() override;
-    void SaveShortcutValues() override {}
-    void SaveUIValues() override;
-    void SaveUIGamelistValues() override {}
-    void SaveUILayoutValues() override {}
-    void SaveMultiplayerValues() override {}
-
-    std::vector<Settings::BasicSetting*>& FindRelevantList(Settings::Category category) override;
-};
--- a/src/android/app/src/main/jni/config.cpp
+++ b/src/android/app/src/main/jni/config.cpp
@@ -0,0 +1,331 @@
+// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include <memory>
+#include <optional>
+#include <sstream>
+
+#include <INIReader.h>
+#include "common/fs/file.h"
+#include "common/fs/fs.h"
+#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"
+#include "jni/default_ini.h"
+#include "uisettings.h"
+
+namespace FS = Common::FS;
+
+Config::Config(const std::string& config_name, ConfigType config_type)
+    : type(config_type), global{config_type == ConfigType::GlobalConfig} {
+    Initialize(config_name);
+}
+
+Config::~Config() = default;
+
+bool Config::LoadINI(const std::string& default_contents, bool retry) {
+    void(FS::CreateParentDir(config_loc));
+    config = std::make_unique<INIReader>(FS::PathToUTF8String(config_loc));
+    const auto config_loc_str = FS::PathToUTF8String(config_loc);
+    if (config->ParseError() < 0) {
+        if (retry) {
+            LOG_WARNING(Config, "Failed to load {}. Creating file from defaults...",
+                        config_loc_str);
+
+            void(FS::CreateParentDir(config_loc));
+            void(FS::WriteStringToFile(config_loc, FS::FileType::TextFile, default_contents));
+
+            config = std::make_unique<INIReader>(config_loc_str);
+
+            return LoadINI(default_contents, false);
+        }
+        LOG_ERROR(Config, "Failed.");
+        return false;
+    }
+    LOG_INFO(Config, "Successfully loaded {}", config_loc_str);
+    return true;
+}
+
+template <>
+void Config::ReadSetting(const std::string& group, Settings::Setting<std::string>& setting) {
+    std::string setting_value = config->Get(group, setting.GetLabel(), setting.GetDefault());
+    if (setting_value.empty()) {
+        setting_value = setting.GetDefault();
+    }
+    setting = std::move(setting_value);
+}
+
+template <>
+void Config::ReadSetting(const std::string& group, Settings::Setting<bool>& setting) {
+    setting = config->GetBoolean(group, setting.GetLabel(), setting.GetDefault());
+}
+
+template <typename Type, bool ranged>
+void Config::ReadSetting(const std::string& group, Settings::Setting<Type, ranged>& setting) {
+    setting = static_cast<Type>(
+        config->GetInteger(group, setting.GetLabel(), static_cast<long>(setting.GetDefault())));
+}
+
+void Config::ReadValues() {
+    ReadSetting("ControlsGeneral", Settings::values.mouse_enabled);
+    ReadSetting("ControlsGeneral", Settings::values.touch_device);
+    ReadSetting("ControlsGeneral", Settings::values.keyboard_enabled);
+    ReadSetting("ControlsGeneral", Settings::values.debug_pad_enabled);
+    ReadSetting("ControlsGeneral", Settings::values.vibration_enabled);
+    ReadSetting("ControlsGeneral", Settings::values.enable_accurate_vibrations);
+    ReadSetting("ControlsGeneral", Settings::values.motion_enabled);
+    Settings::values.touchscreen.enabled =
+        config->GetBoolean("ControlsGeneral", "touch_enabled", true);
+    Settings::values.touchscreen.rotation_angle =
+        config->GetInteger("ControlsGeneral", "touch_angle", 0);
+    Settings::values.touchscreen.diameter_x =
+        config->GetInteger("ControlsGeneral", "touch_diameter_x", 15);
+    Settings::values.touchscreen.diameter_y =
+        config->GetInteger("ControlsGeneral", "touch_diameter_y", 15);
+
+    int num_touch_from_button_maps =
+        config->GetInteger("ControlsGeneral", "touch_from_button_map", 0);
+    if (num_touch_from_button_maps > 0) {
+        for (int i = 0; i < num_touch_from_button_maps; ++i) {
+            Settings::TouchFromButtonMap map;
+            map.name = config->Get("ControlsGeneral",
+                                   std::string("touch_from_button_maps_") + std::to_string(i) +
+                                       std::string("_name"),
+                                   "default");
+            const int num_touch_maps = config->GetInteger(
+                "ControlsGeneral",
+                std::string("touch_from_button_maps_") + std::to_string(i) + std::string("_count"),
+                0);
+            map.buttons.reserve(num_touch_maps);
+
+            for (int j = 0; j < num_touch_maps; ++j) {
+                std::string touch_mapping =
+                    config->Get("ControlsGeneral",
+                                std::string("touch_from_button_maps_") + std::to_string(i) +
+                                    std::string("_bind_") + std::to_string(j),
+                                "");
+                map.buttons.emplace_back(std::move(touch_mapping));
+            }
+
+            Settings::values.touch_from_button_maps.emplace_back(std::move(map));
+        }
+    } else {
+        Settings::values.touch_from_button_maps.emplace_back(
+            Settings::TouchFromButtonMap{"default", {}});
+        num_touch_from_button_maps = 1;
+    }
+    Settings::values.touch_from_button_map_index = std::clamp(
+        Settings::values.touch_from_button_map_index.GetValue(), 0, num_touch_from_button_maps - 1);
+
+    ReadSetting("ControlsGeneral", Settings::values.udp_input_servers);
+
+    // Data Storage
+    ReadSetting("Data Storage", Settings::values.use_virtual_sd);
+    FS::SetYuzuPath(FS::YuzuPath::NANDDir,
+                    config->Get("Data Storage", "nand_directory",
+                                FS::GetYuzuPathString(FS::YuzuPath::NANDDir)));
+    FS::SetYuzuPath(FS::YuzuPath::SDMCDir,
+                    config->Get("Data Storage", "sdmc_directory",
+                                FS::GetYuzuPathString(FS::YuzuPath::SDMCDir)));
+    FS::SetYuzuPath(FS::YuzuPath::LoadDir,
+                    config->Get("Data Storage", "load_directory",
+                                FS::GetYuzuPathString(FS::YuzuPath::LoadDir)));
+    FS::SetYuzuPath(FS::YuzuPath::DumpDir,
+                    config->Get("Data Storage", "dump_directory",
+                                FS::GetYuzuPathString(FS::YuzuPath::DumpDir)));
+    ReadSetting("Data Storage", Settings::values.gamecard_inserted);
+    ReadSetting("Data Storage", Settings::values.gamecard_current_game);
+    ReadSetting("Data Storage", Settings::values.gamecard_path);
+
+    // System
+    ReadSetting("System", Settings::values.current_user);
+    Settings::values.current_user = std::clamp<int>(Settings::values.current_user.GetValue(), 0,
+                                                    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);
+
+    const auto rng_seed_enabled = config->GetBoolean("System", "rng_seed_enabled", false);
+    if (rng_seed_enabled) {
+        Settings::values.rng_seed.SetValue(config->GetInteger("System", "rng_seed", 0));
+    } else {
+        Settings::values.rng_seed.SetValue(0);
+    }
+    Settings::values.rng_seed_enabled.SetValue(rng_seed_enabled);
+
+    const auto custom_rtc_enabled = config->GetBoolean("System", "custom_rtc_enabled", false);
+    if (custom_rtc_enabled) {
+        Settings::values.custom_rtc = config->GetInteger("System", "custom_rtc", 0);
+    } else {
+        Settings::values.custom_rtc = 0;
+    }
+    Settings::values.custom_rtc_enabled = custom_rtc_enabled;
+
+    ReadSetting("System", Settings::values.language_index);
+    ReadSetting("System", Settings::values.region_index);
+    ReadSetting("System", Settings::values.time_zone_index);
+    ReadSetting("System", Settings::values.sound_index);
+
+    // Core
+    ReadSetting("Core", Settings::values.use_multi_core);
+    ReadSetting("Core", Settings::values.memory_layout_mode);
+
+    // Cpu
+    ReadSetting("Cpu", Settings::values.cpu_backend);
+    ReadSetting("Cpu", Settings::values.cpu_accuracy);
+    ReadSetting("Cpu", Settings::values.cpu_debug_mode);
+    ReadSetting("Cpu", Settings::values.cpuopt_page_tables);
+    ReadSetting("Cpu", Settings::values.cpuopt_block_linking);
+    ReadSetting("Cpu", Settings::values.cpuopt_return_stack_buffer);
+    ReadSetting("Cpu", Settings::values.cpuopt_fast_dispatcher);
+    ReadSetting("Cpu", Settings::values.cpuopt_context_elimination);
+    ReadSetting("Cpu", Settings::values.cpuopt_const_prop);
+    ReadSetting("Cpu", Settings::values.cpuopt_misc_ir);
+    ReadSetting("Cpu", Settings::values.cpuopt_reduce_misalign_checks);
+    ReadSetting("Cpu", Settings::values.cpuopt_fastmem);
+    ReadSetting("Cpu", Settings::values.cpuopt_fastmem_exclusives);
+    ReadSetting("Cpu", Settings::values.cpuopt_recompile_exclusives);
+    ReadSetting("Cpu", Settings::values.cpuopt_ignore_memory_aborts);
+    ReadSetting("Cpu", Settings::values.cpuopt_unsafe_unfuse_fma);
+    ReadSetting("Cpu", Settings::values.cpuopt_unsafe_reduce_fp_error);
+    ReadSetting("Cpu", Settings::values.cpuopt_unsafe_ignore_standard_fpcr);
+    ReadSetting("Cpu", Settings::values.cpuopt_unsafe_inaccurate_nan);
+    ReadSetting("Cpu", Settings::values.cpuopt_unsafe_fastmem_check);
+    ReadSetting("Cpu", Settings::values.cpuopt_unsafe_ignore_global_monitor);
+
+    // Renderer
+    ReadSetting("Renderer", Settings::values.renderer_backend);
+    ReadSetting("Renderer", Settings::values.renderer_debug);
+    ReadSetting("Renderer", Settings::values.renderer_shader_feedback);
+    ReadSetting("Renderer", Settings::values.enable_nsight_aftermath);
+    ReadSetting("Renderer", Settings::values.disable_shader_loop_safety_checks);
+    ReadSetting("Renderer", Settings::values.vulkan_device);
+
+    ReadSetting("Renderer", Settings::values.resolution_setup);
+    ReadSetting("Renderer", Settings::values.scaling_filter);
+    ReadSetting("Renderer", Settings::values.fsr_sharpening_slider);
+    ReadSetting("Renderer", Settings::values.anti_aliasing);
+    ReadSetting("Renderer", Settings::values.fullscreen_mode);
+    ReadSetting("Renderer", Settings::values.aspect_ratio);
+    ReadSetting("Renderer", Settings::values.max_anisotropy);
+    ReadSetting("Renderer", Settings::values.use_speed_limit);
+    ReadSetting("Renderer", Settings::values.speed_limit);
+    ReadSetting("Renderer", Settings::values.use_disk_shader_cache);
+    ReadSetting("Renderer", Settings::values.use_asynchronous_gpu_emulation);
+    ReadSetting("Renderer", Settings::values.vsync_mode);
+    ReadSetting("Renderer", Settings::values.shader_backend);
+    ReadSetting("Renderer", Settings::values.use_asynchronous_shaders);
+    ReadSetting("Renderer", Settings::values.nvdec_emulation);
+    ReadSetting("Renderer", Settings::values.use_fast_gpu_time);
+    ReadSetting("Renderer", Settings::values.use_vulkan_driver_pipeline_cache);
+
+    ReadSetting("Renderer", Settings::values.bg_red);
+    ReadSetting("Renderer", Settings::values.bg_green);
+    ReadSetting("Renderer", Settings::values.bg_blue);
+
+    // Use GPU accuracy normal by default on Android
+    Settings::values.gpu_accuracy = static_cast<Settings::GpuAccuracy>(config->GetInteger(
+        "Renderer", "gpu_accuracy", static_cast<u32>(Settings::GpuAccuracy::Normal)));
+
+    // Use GPU default anisotropic filtering on Android
+    Settings::values.max_anisotropy =
+        static_cast<Settings::AnisotropyMode>(config->GetInteger("Renderer", "max_anisotropy", 1));
+
+    // Disable ASTC compute by default on Android
+    Settings::values.accelerate_astc.SetValue(
+        config->GetBoolean("Renderer", "accelerate_astc", false) ? Settings::AstcDecodeMode::Gpu
+                                                                 : Settings::AstcDecodeMode::Cpu);
+
+    // Enable asynchronous presentation by default on Android
+    Settings::values.async_presentation =
+        config->GetBoolean("Renderer", "async_presentation", true);
+
+    // Disable force_max_clock by default on Android
+    Settings::values.renderer_force_max_clock =
+        config->GetBoolean("Renderer", "force_max_clock", false);
+
+    // Disable use_reactive_flushing by default on Android
+    Settings::values.use_reactive_flushing =
+        config->GetBoolean("Renderer", "use_reactive_flushing", false);
+
+    // Audio
+    ReadSetting("Audio", Settings::values.sink_id);
+    ReadSetting("Audio", Settings::values.audio_output_device_id);
+    ReadSetting("Audio", Settings::values.volume);
+
+    // Miscellaneous
+    // log_filter has a different default here than from common
+    Settings::values.log_filter = "*:Info";
+    ReadSetting("Miscellaneous", Settings::values.use_dev_keys);
+
+    // Debugging
+    Settings::values.record_frame_times =
+        config->GetBoolean("Debugging", "record_frame_times", false);
+    ReadSetting("Debugging", Settings::values.dump_exefs);
+    ReadSetting("Debugging", Settings::values.dump_nso);
+    ReadSetting("Debugging", Settings::values.enable_fs_access_log);
+    ReadSetting("Debugging", Settings::values.reporting_services);
+    ReadSetting("Debugging", Settings::values.quest_flag);
+    ReadSetting("Debugging", Settings::values.use_debug_asserts);
+    ReadSetting("Debugging", Settings::values.use_auto_stub);
+    ReadSetting("Debugging", Settings::values.disable_macro_jit);
+    ReadSetting("Debugging", Settings::values.disable_macro_hle);
+    ReadSetting("Debugging", Settings::values.use_gdbstub);
+    ReadSetting("Debugging", Settings::values.gdbstub_port);
+
+    const auto title_list = config->Get("AddOns", "title_ids", "");
+    std::stringstream ss(title_list);
+    std::string line;
+    while (std::getline(ss, line, '|')) {
+        const auto title_id = std::strtoul(line.c_str(), nullptr, 16);
+        const auto disabled_list = config->Get("AddOns", "disabled_" + line, "");
+
+        std::stringstream inner_ss(disabled_list);
+        std::string inner_line;
+        std::vector<std::string> out;
+        while (std::getline(inner_ss, inner_line, '|')) {
+            out.push_back(inner_line);
+        }
+
+        Settings::values.disabled_addons.insert_or_assign(title_id, out);
+    }
+
+    // Web Service
+    ReadSetting("WebService", Settings::values.enable_telemetry);
+    ReadSetting("WebService", Settings::values.web_api_url);
+    ReadSetting("WebService", Settings::values.yuzu_username);
+    ReadSetting("WebService", Settings::values.yuzu_token);
+
+    // Network
+    ReadSetting("Network", Settings::values.network_interface);
+
+    // Android
+    ReadSetting("Android", AndroidSettings::values.picture_in_picture);
+    ReadSetting("Android", AndroidSettings::values.screen_layout);
+}
+
+void Config::Initialize(const std::string& config_name) {
+    const auto fs_config_loc = FS::GetYuzuPath(FS::YuzuPath::ConfigDir);
+    const auto config_file = fmt::format("{}.ini", config_name);
+
+    switch (type) {
+    case ConfigType::GlobalConfig:
+        config_loc = FS::PathToUTF8String(fs_config_loc / config_file);
+        break;
+    case ConfigType::PerGameConfig:
+        config_loc = FS::PathToUTF8String(fs_config_loc / "custom" / FS::ToU8String(config_file));
+        break;
+    case ConfigType::InputProfile:
+        config_loc = FS::PathToUTF8String(fs_config_loc / "input" / config_file);
+        LoadINI(DefaultINI::android_config_file);
+        return;
+    }
+    LoadINI(DefaultINI::android_config_file);
+    ReadValues();
+}
--- a/src/android/app/src/main/jni/config.h
+++ b/src/android/app/src/main/jni/config.h
@@ -0,0 +1,47 @@
+// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <filesystem>
+#include <memory>
+#include <optional>
+#include <string>
+
+#include "common/settings.h"
+
+class INIReader;
+
+class Config {
+    bool LoadINI(const std::string& default_contents = "", bool retry = true);
+
+public:
+    enum class ConfigType {
+        GlobalConfig,
+        PerGameConfig,
+        InputProfile,
+    };
+
+    explicit Config(const std::string& config_name = "config",
+                    ConfigType config_type = ConfigType::GlobalConfig);
+    ~Config();
+
+    void Initialize(const std::string& config_name);
+
+private:
+    /**
+     * Applies a value read from the config to a Setting.
+     *
+     * @param group The name of the INI group
+     * @param setting The yuzu setting to modify
+     */
+    template <typename Type, bool ranged>
+    void ReadSetting(const std::string& group, Settings::Setting<Type, ranged>& setting);
+
+    void ReadValues();
+
+    const ConfigType type;
+    std::unique_ptr<INIReader> config;
+    std::string config_loc;
+    const bool global;
+};
--- a/src/android/app/src/main/jni/default_ini.h
+++ b/src/android/app/src/main/jni/default_ini.h
@@ -0,0 +1,511 @@
+// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+namespace DefaultINI {
+
+const char* android_config_file = R"(
+
+[ControlsP0]
+# The input devices and parameters for each Switch native input
+# The config section determines the player number where the config will be applied on. For example "ControlsP0", "ControlsP1", ...
+# It should be in the format of "engine:[engine_name],[param1]:[value1],[param2]:[value2]..."
+# Escape characters $0 (for ':'), $1 (for ',') and $2 (for '$') can be used in values
+
+# Indicates if this player should be connected at boot
+connected=
+
+# for button input, the following devices are available:
+#  - "keyboard" (default) for keyboard input. Required parameters:
+#      - "code": the code of the key to bind
+#  - "sdl" for joystick input using SDL. Required parameters:
+#      - "guid": SDL identification GUID of the joystick
+#      - "port": the index of the joystick to bind
+#      - "button"(optional): the index of the button to bind
+#      - "hat"(optional): the index of the hat to bind as direction buttons
+#      - "axis"(optional): the index of the axis to bind
+#      - "direction"(only used for hat): the direction name of the hat to bind. Can be "up", "down", "left" or "right"
+#      - "threshold"(only used for axis): a float value in (-1.0, 1.0) which the button is
+#          triggered if the axis value crosses
+#      - "direction"(only used for axis): "+" means the button is triggered when the axis value
+#          is greater than the threshold; "-" means the button is triggered when the axis value
+#          is smaller than the threshold
+button_a=
+button_b=
+button_x=
+button_y=
+button_lstick=
+button_rstick=
+button_l=
+button_r=
+button_zl=
+button_zr=
+button_plus=
+button_minus=
+button_dleft=
+button_dup=
+button_dright=
+button_ddown=
+button_lstick_left=
+button_lstick_up=
+button_lstick_right=
+button_lstick_down=
+button_sl=
+button_sr=
+button_home=
+button_screenshot=
+
+# for analog input, the following devices are available:
+#  - "analog_from_button" (default) for emulating analog input from direction buttons. Required parameters:
+#      - "up", "down", "left", "right": sub-devices for each direction.
+#          Should be in the format as a button input devices using escape characters, for example, "engine$0keyboard$1code$00"
+#      - "modifier": sub-devices as a modifier.
+#      - "modifier_scale": a float number representing the applied modifier scale to the analog input.
+#          Must be in range of 0.0-1.0. Defaults to 0.5
+#  - "sdl" for joystick input using SDL. Required parameters:
+#      - "guid": SDL identification GUID of the joystick
+#      - "port": the index of the joystick to bind
+#      - "axis_x": the index of the axis to bind as x-axis (default to 0)
+#      - "axis_y": the index of the axis to bind as y-axis (default to 1)
+lstick=
+rstick=
+
+# for motion input, the following devices are available:
+#  - "keyboard" (default) for emulating random motion input from buttons. Required parameters:
+#      - "code": the code of the key to bind
+#  - "sdl" for motion input using SDL. Required parameters:
+#      - "guid": SDL identification GUID of the joystick
+#      - "port": the index of the joystick to bind
+#      - "motion": the index of the motion sensor to bind
+#  - "cemuhookudp" for motion input using Cemu Hook protocol. Required parameters:
+#      - "guid": the IP address of the cemu hook server encoded to a hex string. for example 192.168.0.1 = "c0a80001"
+#      - "port": the port of the cemu hook server
+#      - "pad": the index of the joystick
+#      - "motion": the index of the motion sensor of the joystick to bind
+motionleft=
+motionright=
+
+[ControlsGeneral]
+# To use the debug_pad, prepend `debug_pad_` before each button setting above.
+# i.e. debug_pad_button_a=
+
+# Enable debug pad inputs to the guest
+# 0 (default): Disabled, 1: Enabled
+debug_pad_enabled =
+
+# Whether to enable or disable vibration
+# 0: Disabled, 1 (default): Enabled
+vibration_enabled=
+
+# Whether to enable or disable accurate vibrations
+# 0 (default): Disabled, 1: Enabled
+enable_accurate_vibrations=
+
+# Enables controller motion inputs
+# 0: Disabled, 1 (default): Enabled
+motion_enabled =
+
+# Defines the udp device's touch screen coordinate system for cemuhookudp devices
+#  - "min_x", "min_y", "max_x", "max_y"
+touch_device=
+
+# for mapping buttons to touch inputs.
+#touch_from_button_map=1
+#touch_from_button_maps_0_name=default
+#touch_from_button_maps_0_count=2
+#touch_from_button_maps_0_bind_0=foo
+#touch_from_button_maps_0_bind_1=bar
+# etc.
+
+# List of Cemuhook UDP servers, delimited by ','.
+# Default: 127.0.0.1:26760
+# Example: 127.0.0.1:26760,123.4.5.67:26761
+udp_input_servers =
+
+# Enable controlling an axis via a mouse input.
+# 0 (default): Off, 1: On
+mouse_panning =
+
+# Set mouse sensitivity.
+# Default: 1.0
+mouse_panning_sensitivity =
+
+# Emulate an analog control stick from keyboard inputs.
+# 0 (default): Disabled, 1: Enabled
+emulate_analog_keyboard =
+
+# Enable mouse inputs to the guest
+# 0 (default): Disabled, 1: Enabled
+mouse_enabled =
+
+# Enable keyboard inputs to the guest
+# 0 (default): Disabled, 1: Enabled
+keyboard_enabled =
+
+[Core]
+# Whether to use multi-core for CPU emulation
+# 0: Disabled, 1 (default): Enabled
+use_multi_core =
+
+# Enable unsafe extended guest system memory layout (8GB DRAM)
+# 0 (default): Disabled, 1: Enabled
+use_unsafe_extended_memory_layout =
+
+[Cpu]
+# Adjusts various optimizations.
+# Auto-select mode enables choice unsafe optimizations.
+# Accurate enables only safe optimizations.
+# Unsafe allows any unsafe optimizations.
+# 0 (default): Auto-select, 1: Accurate, 2: Enable unsafe optimizations
+cpu_accuracy =
+
+# Allow disabling safe optimizations.
+# 0 (default): Disabled, 1: Enabled
+cpu_debug_mode =
+
+# Enable inline page tables optimization (faster guest memory access)
+# 0: Disabled, 1 (default): Enabled
+cpuopt_page_tables =
+
+# Enable block linking CPU optimization (reduce block dispatcher use during predictable jumps)
+# 0: Disabled, 1 (default): Enabled
+cpuopt_block_linking =
+
+# Enable return stack buffer CPU optimization (reduce block dispatcher use during predictable returns)
+# 0: Disabled, 1 (default): Enabled
+cpuopt_return_stack_buffer =
+
+# Enable fast dispatcher CPU optimization (use a two-tiered dispatcher architecture)
+# 0: Disabled, 1 (default): Enabled
+cpuopt_fast_dispatcher =
+
+# Enable context elimination CPU Optimization (reduce host memory use for guest context)
+# 0: Disabled, 1 (default): Enabled
+cpuopt_context_elimination =
+
+# Enable constant propagation CPU optimization (basic IR optimization)
+# 0: Disabled, 1 (default): Enabled
+cpuopt_const_prop =
+
+# Enable miscellaneous CPU optimizations (basic IR optimization)
+# 0: Disabled, 1 (default): Enabled
+cpuopt_misc_ir =
+
+# Enable reduction of memory misalignment checks (reduce memory fallbacks for misaligned access)
+# 0: Disabled, 1 (default): Enabled
+cpuopt_reduce_misalign_checks =
+
+# Enable Host MMU Emulation (faster guest memory access)
+# 0: Disabled, 1 (default): Enabled
+cpuopt_fastmem =
+
+# Enable Host MMU Emulation for exclusive memory instructions (faster guest memory access)
+# 0: Disabled, 1 (default): Enabled
+cpuopt_fastmem_exclusives =
+
+# Enable fallback on failure of fastmem of exclusive memory instructions (faster guest memory access)
+# 0: Disabled, 1 (default): Enabled
+cpuopt_recompile_exclusives =
+
+# Enable optimization to ignore invalid memory accesses (faster guest memory access)
+# 0: Disabled, 1 (default): Enabled
+cpuopt_ignore_memory_aborts =
+
+# Enable unfuse FMA (improve performance on CPUs without FMA)
+# Only enabled if cpu_accuracy is set to Unsafe. Automatically chosen with cpu_accuracy = Auto-select.
+# 0: Disabled, 1 (default): Enabled
+cpuopt_unsafe_unfuse_fma =
+
+# Enable faster FRSQRTE and FRECPE
+# Only enabled if cpu_accuracy is set to Unsafe.
+# 0: Disabled, 1 (default): Enabled
+cpuopt_unsafe_reduce_fp_error =
+
+# Enable faster ASIMD instructions (32 bits only)
+# Only enabled if cpu_accuracy is set to Unsafe. Automatically chosen with cpu_accuracy = Auto-select.
+# 0: Disabled, 1 (default): Enabled
+cpuopt_unsafe_ignore_standard_fpcr =
+
+# Enable inaccurate NaN handling
+# Only enabled if cpu_accuracy is set to Unsafe. Automatically chosen with cpu_accuracy = Auto-select.
+# 0: Disabled, 1 (default): Enabled
+cpuopt_unsafe_inaccurate_nan =
+
+# Disable address space checks (64 bits only)
+# Only enabled if cpu_accuracy is set to Unsafe. Automatically chosen with cpu_accuracy = Auto-select.
+# 0: Disabled, 1 (default): Enabled
+cpuopt_unsafe_fastmem_check =
+
+# Enable faster exclusive instructions
+# Only enabled if cpu_accuracy is set to Unsafe. Automatically chosen with cpu_accuracy = Auto-select.
+# 0: Disabled, 1 (default): Enabled
+cpuopt_unsafe_ignore_global_monitor =
+
+[Renderer]
+# Which backend API to use.
+# 0: OpenGL (unsupported), 1 (default): Vulkan, 2: Null
+backend =
+
+# Whether to enable asynchronous presentation (Vulkan only)
+# 0: Off, 1 (default): On
+async_presentation =
+
+# Forces the GPU to run at the maximum possible clocks (thermal constraints will still be applied).
+# 0 (default): Disabled, 1: Enabled
+force_max_clock =
+
+# Enable graphics API debugging mode.
+# 0 (default): Disabled, 1: Enabled
+debug =
+
+# Enable shader feedback.
+# 0 (default): Disabled, 1: Enabled
+renderer_shader_feedback =
+
+# Enable Nsight Aftermath crash dumps
+# 0 (default): Disabled, 1: Enabled
+nsight_aftermath =
+
+# Disable shader loop safety checks, executing the shader without loop logic changes
+# 0 (default): Disabled, 1: Enabled
+disable_shader_loop_safety_checks =
+
+# Which Vulkan physical device to use (defaults to 0)
+vulkan_device =
+
+# 0: 0.5x (360p/540p) [EXPERIMENTAL]
+# 1: 0.75x (540p/810p) [EXPERIMENTAL]
+# 2 (default): 1x (720p/1080p)
+# 3: 2x (1440p/2160p)
+# 4: 3x (2160p/3240p)
+# 5: 4x (2880p/4320p)
+# 6: 5x (3600p/5400p)
+# 7: 6x (4320p/6480p)
+resolution_setup =
+
+# Pixel filter to use when up- or down-sampling rendered frames.
+# 0: Nearest Neighbor
+# 1 (default): Bilinear
+# 2: Bicubic
+# 3: Gaussian
+# 4: ScaleForce
+# 5: AMD FidelityFX™️ Super Resolution [Vulkan Only]
+scaling_filter =
+
+# Anti-Aliasing (AA)
+# 0 (default): None, 1: FXAA
+anti_aliasing =
+
+# Whether to use fullscreen or borderless window mode
+# 0 (Windows default): Borderless window, 1 (All other default): Exclusive fullscreen
+fullscreen_mode =
+
+# Aspect ratio
+# 0: Default (16:9), 1: Force 4:3, 2: Force 21:9, 3: Force 16:10, 4: Stretch to Window
+aspect_ratio =
+
+# Anisotropic filtering
+# 0: Default, 1: 2x, 2: 4x, 3: 8x, 4: 16x
+max_anisotropy =
+
+# Whether to enable VSync or not.
+# OpenGL: Values other than 0 enable VSync
+# Vulkan: FIFO is selected if the requested mode is not supported by the driver.
+# FIFO (VSync) does not drop frames or exhibit tearing but is limited by the screen refresh rate.
+# FIFO Relaxed is similar to FIFO but allows tearing as it recovers from a slow down.
+# Mailbox can have lower latency than FIFO and does not tear but may drop frames.
+# Immediate (no synchronization) just presents whatever is available and can exhibit tearing.
+# 0: Immediate (Off), 1 (Default): Mailbox (On), 2: FIFO, 3: FIFO Relaxed
+use_vsync =
+
+# Selects the OpenGL shader backend. NV_gpu_program5 is required for GLASM. If NV_gpu_program5 is
+# not available and GLASM is selected, GLSL will be used.
+# 0: GLSL, 1 (default): GLASM, 2: SPIR-V
+shader_backend =
+
+# Whether to allow asynchronous shader building.
+# 0 (default): Off, 1: On
+use_asynchronous_shaders =
+
+# Uses reactive flushing instead of predictive flushing. Allowing a more accurate syncing of memory.
+# 0 (default): Off, 1: On
+use_reactive_flushing =
+
+# NVDEC emulation.
+# 0: Disabled, 1: CPU Decoding, 2 (default): GPU Decoding
+nvdec_emulation =
+
+# Accelerate ASTC texture decoding.
+# 0 (default): Off, 1: On
+accelerate_astc =
+
+# Turns on the speed limiter, which will limit the emulation speed to the desired speed limit value
+# 0: Off, 1: On (default)
+use_speed_limit =
+
+# Limits the speed of the game to run no faster than this value as a percentage of target speed
+# 1 - 9999: Speed limit as a percentage of target game speed. 100 (default)
+speed_limit =
+
+# Whether to use disk based shader cache
+# 0: Off, 1 (default): On
+use_disk_shader_cache =
+
+# Which gpu accuracy level to use
+# 0 (default): Normal, 1: High, 2: Extreme (Very slow)
+gpu_accuracy =
+
+# Whether to use asynchronous GPU emulation
+# 0 : Off (slow), 1 (default): On (fast)
+use_asynchronous_gpu_emulation =
+
+# Inform the guest that GPU operations completed more quickly than they did.
+# 0: Off, 1 (default): On
+use_fast_gpu_time =
+
+# Force unmodified buffers to be flushed, which can cost performance.
+# 0: Off (default), 1: On
+use_pessimistic_flushes =
+
+# Whether to use garbage collection or not for GPU caches.
+# 0 (default): Off, 1: On
+use_caches_gc =
+
+# The clear color for the renderer. What shows up on the sides of the bottom screen.
+# Must be in range of 0-255. Defaults to 0 for all.
+bg_red =
+bg_blue =
+bg_green =
+
+[Audio]
+# Which audio output engine to use.
+# auto (default): Auto-select
+# cubeb: Cubeb audio engine (if available)
+# sdl2: SDL2 audio engine (if available)
+# null: No audio output
+output_engine =
+
+# Which audio device to use.
+# auto (default): Auto-select
+output_device =
+
+# Output volume.
+# 100 (default): 100%, 0; mute
+volume =
+
+[Data Storage]
+# Whether to create a virtual SD card.
+# 1: Yes, 0 (default): No
+use_virtual_sd =
+
+# Whether or not to enable gamecard emulation
+# 1: Yes, 0 (default): No
+gamecard_inserted =
+
+# Whether or not the gamecard should be emulated as the current game
+# If 'gamecard_inserted' is 0 this setting is irrelevant
+# 1: Yes, 0 (default): No
+gamecard_current_game =
+
+# Path to an XCI file to use as the gamecard
+# If 'gamecard_inserted' is 0 this setting is irrelevant
+# If 'gamecard_current_game' is 1 this setting is irrelevant
+gamecard_path =
+
+[System]
+# Whether the system is docked
+# 1 (default): Yes, 0: No
+use_docked_mode =
+
+# Sets the seed for the RNG generator built into the switch
+# rng_seed will be ignored and randomly generated if rng_seed_enabled is false
+rng_seed_enabled =
+rng_seed =
+
+# Sets the current time (in seconds since 12:00 AM Jan 1, 1970) that will be used by the time service
+# This will auto-increment, with the time set being the time the game is started
+# This override will only occur if custom_rtc_enabled is true, otherwise the current time is used
+custom_rtc_enabled =
+custom_rtc =
+
+# Sets the systems language index
+# 0: Japanese, 1: English (default), 2: French, 3: German, 4: Italian, 5: Spanish, 6: Chinese,
+# 7: Korean, 8: Dutch, 9: Portuguese, 10: Russian, 11: Taiwanese, 12: British English, 13: Canadian French,
+# 14: Latin American Spanish, 15: Simplified Chinese, 16: Traditional Chinese, 17: Brazilian Portuguese
+language_index =
+
+# The system region that yuzu will use during emulation
+# -1: Auto-select (default), 0: Japan, 1: USA, 2: Europe, 3: Australia, 4: China, 5: Korea, 6: Taiwan
+region_index =
+
+# The system time zone that yuzu will use during emulation
+# 0: Auto-select (default), 1: Default (system archive value), Others: Index for specified time zone
+time_zone_index =
+
+# Sets the sound output mode.
+# 0: Mono, 1 (default): Stereo, 2: Surround
+sound_index =
+
+[Miscellaneous]
+# A filter which removes logs below a certain logging level.
+# Examples: *:Debug Kernel.SVC:Trace Service.*:Critical
+log_filter = *:Trace
+
+# Use developer keys
+# 0 (default): Disabled, 1: Enabled
+use_dev_keys =
+
+[Debugging]
+# Record frame time data, can be found in the log directory. Boolean value
+record_frame_times =
+# Determines whether or not yuzu will dump the ExeFS of all games it attempts to load while loading them
+dump_exefs=false
+# Determines whether or not yuzu will dump all NSOs it attempts to load while loading them
+dump_nso=false
+# Determines whether or not yuzu will save the filesystem access log.
+enable_fs_access_log=false
+# Enables verbose reporting services
+reporting_services =
+# Determines whether or not yuzu will report to the game that the emulated console is in Kiosk Mode
+# false: Retail/Normal Mode (default), true: Kiosk Mode
+quest_flag =
+# Determines whether debug asserts should be enabled, which will throw an exception on asserts.
+# false: Disabled (default), true: Enabled
+use_debug_asserts =
+# Determines whether unimplemented HLE service calls should be automatically stubbed.
+# false: Disabled (default), true: Enabled
+use_auto_stub =
+# Enables/Disables the macro JIT compiler
+disable_macro_jit=false
+# Determines whether to enable the GDB stub and wait for the debugger to attach before running.
+# false: Disabled (default), true: Enabled
+use_gdbstub=false
+# The port to use for the GDB server, if it is enabled.
+gdbstub_port=6543
+
+[WebService]
+# Whether or not to enable telemetry
+# 0: No, 1 (default): Yes
+enable_telemetry =
+# URL for Web API
+web_api_url = https://api.yuzu-emu.org
+# Username and token for yuzu Web Service
+# See https://profile.yuzu-emu.org/ for more info
+yuzu_username =
+yuzu_token =
+
+[Network]
+# Name of the network interface device to use with yuzu LAN play.
+# e.g. On *nix: 'enp7s0', 'wlp6s0u1u3u3', 'lo'
+# e.g. On Windows: 'Ethernet', 'Wi-Fi'
+network_interface =
+
+[AddOns]
+# Used to disable add-ons
+# List of title IDs of games that will have add-ons disabled (separated by '|'):
+title_ids =
+# For each title ID, have a key/value pair called `disabled_<title_id>` equal to the names of the add-ons to disable (sep. by '|')
+# e.x. disabled_0100000000010000 = Update|DLC <- disables Updates and DLC on Super Mario Odyssey
+)";
+} // namespace DefaultINI
--- a/src/android/app/src/main/jni/id_cache.cpp
+++ b/src/android/app/src/main/jni/id_cache.cpp
@@ -13,8 +13,6 @@ static JavaVM* s_java_vm;
 static jclass s_native_library_class;
 static jclass s_disk_cache_progress_class;
 static jclass s_load_callback_stage_class;
-static jclass s_game_dir_class;
-static jmethodID s_game_dir_constructor;
 static jmethodID s_exit_emulation_activity;
 static jmethodID s_disk_cache_load_progress;
 static jmethodID s_on_emulation_started;
@@ -55,14 +53,6 @@ jclass GetDiskCacheLoadCallbackStageClass() {
    return s_load_callback_stage_class;
 }

-jclass GetGameDirClass() {
-    return s_game_dir_class;
-}
-
-jmethodID GetGameDirConstructor() {
-    return s_game_dir_constructor;
-}
-
 jmethodID GetExitEmulationActivity() {
    return s_exit_emulation_activity;
 }
@@ -100,11 +90,6 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) {
    s_load_callback_stage_class = reinterpret_cast<jclass>(env->NewGlobalRef(env->FindClass(
        "org/yuzu/yuzu_emu/disk_shader_cache/DiskShaderCacheProgress$LoadCallbackStage")));

-    const jclass game_dir_class = env->FindClass("org/yuzu/yuzu_emu/model/GameDir");
-    s_game_dir_class = reinterpret_cast<jclass>(env->NewGlobalRef(game_dir_class));
-    s_game_dir_constructor = env->GetMethodID(game_dir_class, "<init>", "(Ljava/lang/String;Z)V");
-    env->DeleteLocalRef(game_dir_class);
-
    // Initialize methods
    s_exit_emulation_activity =
        env->GetStaticMethodID(s_native_library_class, "exitEmulationActivity", "(I)V");
@@ -135,7 +120,6 @@ void JNI_OnUnload(JavaVM* vm, void* reserved) {
    env->DeleteGlobalRef(s_native_library_class);
    env->DeleteGlobalRef(s_disk_cache_progress_class);
    env->DeleteGlobalRef(s_load_callback_stage_class);
-    env->DeleteGlobalRef(s_game_dir_class);

    // UnInitialize applets
    SoftwareKeyboard::CleanupJNI(env);
--- a/src/android/app/src/main/jni/id_cache.h
+++ b/src/android/app/src/main/jni/id_cache.h
@@ -13,8 +13,6 @@ JNIEnv* GetEnvForThread();
 jclass GetNativeLibraryClass();
 jclass GetDiskCacheProgressClass();
 jclass GetDiskCacheLoadCallbackStageClass();
-jclass GetGameDirClass();
-jmethodID GetGameDirConstructor();
 jmethodID GetExitEmulationActivity();
 jmethodID GetDiskCacheLoadProgress();
 jmethodID GetOnEmulationStarted();
--- a/src/android/app/src/main/jni/native.cpp
+++ b/src/android/app/src/main/jni/native.cpp
@@ -52,8 +52,8 @@
 #include "core/hle/service/am/applets/applets.h"
 #include "core/hle/service/filesystem/filesystem.h"
 #include "core/loader/loader.h"
-#include "frontend_common/config.h"
 #include "jni/android_common/android_common.h"
+#include "jni/config.h"
 #include "jni/id_cache.h"
 #include "jni/native.h"
 #include "video_core/renderer_base.h"
@@ -316,8 +316,10 @@ void EmulationSession::ShutdownEmulation() {

    m_is_running = false;

-    // Unload user input.
-    m_system.HIDCore().UnloadInputDevices();
+    SCOPE_EXIT({
+        // Unload user input.
+        m_system.HIDCore().UnloadInputDevices();
+    });

    // Shutdown the main emulated process
    if (m_load_result == Core::SystemResultStatus::Success) {
@@ -664,6 +666,8 @@ void Java_org_yuzu_yuzu_1emu_NativeLibrary_onTouchReleased(JNIEnv* env, jclass c

 void Java_org_yuzu_yuzu_1emu_NativeLibrary_initializeSystem(JNIEnv* env, jclass clazz,
                                                            jboolean reload) {
+    // Create the default config.ini.
+    Config{};
    // Initialize the emulated system.
    if (!reload) {
        EmulationSession::GetInstance().System().Initialize();
@@ -678,6 +682,17 @@ jint Java_org_yuzu_yuzu_1emu_NativeLibrary_defaultCPUCore(JNIEnv* env, jclass cl
 void Java_org_yuzu_yuzu_1emu_NativeLibrary_run__Ljava_lang_String_2Ljava_lang_String_2Z(
    JNIEnv* env, jclass clazz, jstring j_file, jstring j_savestate, jboolean j_delete_savestate) {}

+void Java_org_yuzu_yuzu_1emu_NativeLibrary_reloadSettings(JNIEnv* env, jclass clazz) {
+    Config{};
+}
+
+void Java_org_yuzu_yuzu_1emu_NativeLibrary_initGameIni(JNIEnv* env, jclass clazz,
+                                                       jstring j_game_id) {
+    std::string_view game_id = env->GetStringUTFChars(j_game_id, 0);
+
+    env->ReleaseStringUTFChars(j_game_id, game_id.data());
+}
+
 jdoubleArray Java_org_yuzu_yuzu_1emu_NativeLibrary_getPerfStats(JNIEnv* env, jclass clazz) {
    jdoubleArray j_stats = env->NewDoubleArray(4);

--- a/src/android/app/src/main/jni/native_config.cpp
+++ b/src/android/app/src/main/jni/native_config.cpp
@@ -5,15 +5,11 @@

 #include <jni.h>

-#include "android_config.h"
-#include "android_settings.h"
 #include "common/logging/log.h"
 #include "common/settings.h"
-#include "frontend_common/config.h"
 #include "jni/android_common/android_common.h"
-#include "jni/id_cache.h"
-
-std::unique_ptr<AndroidConfig> config;
+#include "jni/config.h"
+#include "uisettings.h"

 template <typename T>
 Settings::Setting<T>* getSetting(JNIEnv* env, jstring jkey) {
@@ -32,22 +28,6 @@ Settings::Setting<T>* getSetting(JNIEnv* env, jstring jkey) {

 extern "C" {

-void Java_org_yuzu_yuzu_1emu_utils_NativeConfig_initializeConfig(JNIEnv* env, jobject obj) {
-    config = std::make_unique<AndroidConfig>();
-}
-
-void Java_org_yuzu_yuzu_1emu_utils_NativeConfig_unloadConfig(JNIEnv* env, jobject obj) {
-    config.reset();
-}
-
-void Java_org_yuzu_yuzu_1emu_utils_NativeConfig_reloadSettings(JNIEnv* env, jobject obj) {
-    config->AndroidConfig::ReloadAllValues();
-}
-
-void Java_org_yuzu_yuzu_1emu_utils_NativeConfig_saveSettings(JNIEnv* env, jobject obj) {
-    config->AndroidConfig::SaveAllValues();
-}
-
 jboolean Java_org_yuzu_yuzu_1emu_utils_NativeConfig_getBoolean(JNIEnv* env, jobject obj,
                                                               jstring jkey, jboolean getDefault) {
    auto setting = getSetting<bool>(env, jkey);
@@ -254,55 +234,4 @@ jstring Java_org_yuzu_yuzu_1emu_utils_NativeConfig_getPairedSettingKey(JNIEnv* e
    return ToJString(env, setting->PairedSetting()->GetLabel());
 }

-jobjectArray Java_org_yuzu_yuzu_1emu_utils_NativeConfig_getGameDirs(JNIEnv* env, jobject obj) {
-    jclass gameDirClass = IDCache::GetGameDirClass();
-    jmethodID gameDirConstructor = IDCache::GetGameDirConstructor();
-    jobjectArray jgameDirArray =
-        env->NewObjectArray(AndroidSettings::values.game_dirs.size(), gameDirClass, nullptr);
-    for (size_t i = 0; i < AndroidSettings::values.game_dirs.size(); ++i) {
-        jobject jgameDir =
-            env->NewObject(gameDirClass, gameDirConstructor,
-                           ToJString(env, AndroidSettings::values.game_dirs[i].path),
-                           static_cast<jboolean>(AndroidSettings::values.game_dirs[i].deep_scan));
-        env->SetObjectArrayElement(jgameDirArray, i, jgameDir);
-    }
-    return jgameDirArray;
-}
-
-void Java_org_yuzu_yuzu_1emu_utils_NativeConfig_setGameDirs(JNIEnv* env, jobject obj,
-                                                            jobjectArray gameDirs) {
-    AndroidSettings::values.game_dirs.clear();
-    int size = env->GetArrayLength(gameDirs);
-
-    if (size == 0) {
-        return;
-    }
-
-    jobject dir = env->GetObjectArrayElement(gameDirs, 0);
-    jclass gameDirClass = IDCache::GetGameDirClass();
-    jfieldID uriStringField = env->GetFieldID(gameDirClass, "uriString", "Ljava/lang/String;");
-    jfieldID deepScanBooleanField = env->GetFieldID(gameDirClass, "deepScan", "Z");
-    for (int i = 0; i < size; ++i) {
-        dir = env->GetObjectArrayElement(gameDirs, i);
-        jstring juriString = static_cast<jstring>(env->GetObjectField(dir, uriStringField));
-        jboolean jdeepScanBoolean = env->GetBooleanField(dir, deepScanBooleanField);
-        std::string uriString = GetJString(env, juriString);
-        AndroidSettings::values.game_dirs.push_back(
-            AndroidSettings::GameDir{uriString, static_cast<bool>(jdeepScanBoolean)});
-    }
-}
-
-void Java_org_yuzu_yuzu_1emu_utils_NativeConfig_addGameDir(JNIEnv* env, jobject obj,
-                                                           jobject gameDir) {
-    jclass gameDirClass = IDCache::GetGameDirClass();
-    jfieldID uriStringField = env->GetFieldID(gameDirClass, "uriString", "Ljava/lang/String;");
-    jfieldID deepScanBooleanField = env->GetFieldID(gameDirClass, "deepScan", "Z");
-
-    jstring juriString = static_cast<jstring>(env->GetObjectField(gameDir, uriStringField));
-    jboolean jdeepScanBoolean = env->GetBooleanField(gameDir, deepScanBooleanField);
-    std::string uriString = GetJString(env, juriString);
-    AndroidSettings::values.game_dirs.push_back(
-        AndroidSettings::GameDir{uriString, static_cast<bool>(jdeepScanBoolean)});
-}
-
 } // extern "C"
--- a/src/android/app/src/main/jni/android_settings.cpp
+++ b/src/android/app/src/main/jni/android_settings.cpp
@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

-#include "android_settings.h"
+#include "uisettings.h"

 namespace AndroidSettings {

--- a/src/android/app/src/main/jni/android_settings.h
+++ b/src/android/app/src/main/jni/android_settings.h
@@ -9,17 +9,9 @@

 namespace AndroidSettings {

-struct GameDir {
-    std::string path;
-    bool deep_scan = false;
-};
-
 struct Values {
    Settings::Linkage linkage;

-    // Path settings
-    std::vector<GameDir> game_dirs;
-
    // Android
    Settings::Setting<bool> picture_in_picture{linkage, false, "picture_in_picture",
                                               Settings::Category::Android};
--- a/src/android/app/src/main/res/layout/card_folder.xml
+++ b/src/android/app/src/main/res/layout/card_folder.xml
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    style="?attr/materialCardViewOutlinedStyle"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginHorizontal="16dp"
-    android:layout_marginVertical="12dp"
-    android:focusable="true">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:padding="16dp"
-        android:layout_gravity="center_vertical"
-        android:animateLayoutChanges="true">
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/path"
-            style="@style/TextAppearance.Material3.BodyLarge"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical|start"
-            android:ellipsize="none"
-            android:marqueeRepeatLimit="marquee_forever"
-            android:requiresFadingEdge="horizontal"
-            android:singleLine="true"
-            android:textAlignment="viewStart"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/button_layout"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:text="@string/select_gpu_driver_default" />
-
-        <LinearLayout
-            android:id="@+id/button_layout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <Button
-                android:id="@+id/button_edit"
-                style="@style/Widget.Material3.Button.IconButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:contentDescription="@string/delete"
-                android:tooltipText="@string/edit"
-                app:icon="@drawable/ic_edit"
-                app:iconTint="?attr/colorControlNormal" />
-
-            <Button
-                android:id="@+id/button_delete"
-                style="@style/Widget.Material3.Button.IconButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:contentDescription="@string/delete"
-                android:tooltipText="@string/delete"
-                app:icon="@drawable/ic_delete"
-                app:iconTint="?attr/colorControlNormal" />
-
-        </LinearLayout>
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</com.google.android.material.card.MaterialCardView>
--- a/src/android/app/src/main/res/layout/dialog_add_folder.xml
+++ b/src/android/app/src/main/res/layout/dialog_add_folder.xml
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="24dp"
-    android:orientation="vertical">
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/path"
-        style="@style/TextAppearance.Material3.BodyLarge"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_gravity="center_vertical|start"
-        android:layout_weight="1"
-        android:ellipsize="marquee"
-        android:marqueeRepeatLimit="marquee_forever"
-        android:requiresFadingEdge="horizontal"
-        android:singleLine="true"
-        android:textAlignment="viewStart"
-        tools:text="folder/folder/folder/folder" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:paddingTop="8dp">
-
-        <com.google.android.material.textview.MaterialTextView
-            style="@style/TextAppearance.Material3.BodyMedium"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical|start"
-            android:layout_weight="1"
-            android:text="@string/deep_scan"
-            android:textAlignment="viewStart" />
-
-        <com.google.android.material.checkbox.MaterialCheckBox
-            android:id="@+id/deep_scan_switch"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-    </LinearLayout>
-
-</LinearLayout>
--- a/src/android/app/src/main/res/layout/dialog_folder_properties.xml
+++ b/src/android/app/src/main/res/layout/dialog_folder_properties.xml
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="24dp"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:id="@+id/deep_scan_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <com.google.android.material.textview.MaterialTextView
-            style="@style/TextAppearance.Material3.BodyMedium"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical|start"
-            android:layout_weight="1"
-            android:text="@string/deep_scan"
-            android:textAlignment="viewStart" />
-
-        <com.google.android.material.checkbox.MaterialCheckBox
-            android:id="@+id/deep_scan_switch"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content" />
-
-    </LinearLayout>
-
-</LinearLayout>
--- a/src/android/app/src/main/res/layout/fragment_folders.xml
+++ b/src/android/app/src/main/res/layout/fragment_folders.xml
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/coordinator_folders"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?attr/colorSurface">
-
-    <androidx.coordinatorlayout.widget.CoordinatorLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <com.google.android.material.appbar.AppBarLayout
-            android:id="@+id/appbar_folders"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:fitsSystemWindows="true"
-            app:liftOnScrollTargetViewId="@id/list_folders">
-
-            <com.google.android.material.appbar.MaterialToolbar
-                android:id="@+id/toolbar_folders"
-                android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                app:navigationIcon="@drawable/ic_back"
-                app:title="@string/game_folders" />
-
-        </com.google.android.material.appbar.AppBarLayout>
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/list_folders"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:clipToPadding="false"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
-
-    </androidx.coordinatorlayout.widget.CoordinatorLayout>
-
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/button_add"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:contentDescription="@string/add_games"
-        app:srcCompat="@drawable/ic_add"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
--- a/src/android/app/src/main/res/navigation/home_navigation.xml
+++ b/src/android/app/src/main/res/navigation/home_navigation.xml
@@ -28,9 +28,6 @@
        <action
            android:id="@+id/action_homeSettingsFragment_to_appletLauncherFragment"
            app:destination="@id/appletLauncherFragment" />
-        <action
-            android:id="@+id/action_homeSettingsFragment_to_gameFoldersFragment"
-            app:destination="@id/gameFoldersFragment" />
    </fragment>

    <fragment
@@ -120,9 +117,5 @@
        android:id="@+id/cabinetLauncherDialogFragment"
        android:name="org.yuzu.yuzu_emu.fragments.CabinetLauncherDialogFragment"
        android:label="CabinetLauncherDialogFragment" />
-    <fragment
-        android:id="@+id/gameFoldersFragment"
-        android:name="org.yuzu.yuzu_emu.fragments.GameFoldersFragment"
-        android:label="GameFoldersFragment" />

 </navigation>
--- a/src/android/app/src/main/res/values/dimens.xml
+++ b/src/android/app/src/main/res/values/dimens.xml
@@ -13,7 +13,7 @@
    <dimen name="menu_width">256dp</dimen>
    <dimen name="card_width">165dp</dimen>
    <dimen name="icon_inset">24dp</dimen>
-    <dimen name="spacing_bottom_list_fab">76dp</dimen>
+    <dimen name="spacing_bottom_list_fab">72dp</dimen>
    <dimen name="spacing_fab">24dp</dimen>

    <dimen name="dialog_margin">20dp</dimen>
--- a/src/android/app/src/main/res/values/strings.xml
+++ b/src/android/app/src/main/res/values/strings.xml
@@ -38,7 +38,6 @@
    <string name="empty_gamelist">No files were found or no game directory has been selected yet.</string>
    <string name="search_and_filter_games">Search and filter games</string>
    <string name="select_games_folder">Select games folder</string>
-    <string name="manage_game_folders">Manage game folders</string>
    <string name="select_games_folder_description">Allows yuzu to populate the games list</string>
    <string name="add_games_warning">Skip selecting games folder?</string>
    <string name="add_games_warning_description">Games won\'t be displayed in the Games list if a folder isn\'t selected.</string>
@@ -125,11 +124,6 @@
    <string name="manage_yuzu_data_description">Import/export firmware, keys, user data, and more!</string>
    <string name="share_save_file">Share save file</string>
    <string name="export_save_failed">Failed to export save</string>
-    <string name="game_folders">Game folders</string>
-    <string name="deep_scan">Deep scan</string>
-    <string name="add_game_folder">Add game folder</string>
-    <string name="folder_already_added">This folder was already added!</string>
-    <string name="game_folder_properties">Game folder properties</string>

    <!-- Applet launcher strings -->
    <string name="applets">Applet launcher</string>
@@ -264,7 +258,6 @@
    <string name="cancelling">Cancelling</string>
    <string name="install">Install</string>
    <string name="delete">Delete</string>
-    <string name="edit">Edit</string>
    <string name="export_success">Exported successfully</string>

    <!-- GPU driver installation -->
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -182,15 +182,6 @@ if(ANDROID)
    )
 endif()

-if (UNIX AND NOT APPLE)
-  target_sources(common PRIVATE
-    linux/gamemode.cpp
-    linux/gamemode.h
-  )
-
-  target_link_libraries(common PRIVATE gamemode::headers)
-endif()
-
 if(ARCHITECTURE_x86_64)
    target_sources(common
        PRIVATE
@@ -208,7 +199,7 @@ if(ARCHITECTURE_x86_64)
    target_link_libraries(common PRIVATE xbyak::xbyak)
 endif()

-if (HAS_NCE)
+if (ARCHITECTURE_arm64 AND (ANDROID OR LINUX))
    target_sources(common
        PRIVATE
            arm64/native_clock.cpp
--- a/src/common/host_memory.cpp
+++ b/src/common/host_memory.cpp
@@ -541,7 +541,7 @@ public:
        if (write) {
            flags |= PROT_WRITE;
        }
-#ifdef HAS_NCE
+#ifdef ARCHITECTURE_arm64
        if (execute) {
            flags |= PROT_EXEC;
        }
@@ -621,8 +621,6 @@ public:

    void Protect(size_t virtual_offset, size_t length, bool read, bool write, bool execute) {}

-    void EnableDirectMappedAddress() {}
-
    u8* backing_base{nullptr};
    u8* virtual_base{nullptr};
 };
--- a/src/common/linux/gamemode.cpp
+++ b/src/common/linux/gamemode.cpp
@@ -1,40 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include <gamemode_client.h>
-
-#include "common/linux/gamemode.h"
-#include "common/logging/log.h"
-#include "common/settings.h"
-
-namespace Common::Linux {
-
-void StartGamemode() {
-    if (Settings::values.enable_gamemode) {
-        if (gamemode_request_start() < 0) {
-            LOG_WARNING(Frontend, "Failed to start gamemode: {}", gamemode_error_string());
-        } else {
-            LOG_INFO(Frontend, "Started gamemode");
-        }
-    }
-}
-
-void StopGamemode() {
-    if (Settings::values.enable_gamemode) {
-        if (gamemode_request_end() < 0) {
-            LOG_WARNING(Frontend, "Failed to stop gamemode: {}", gamemode_error_string());
-        } else {
-            LOG_INFO(Frontend, "Stopped gamemode");
-        }
-    }
-}
-
-void SetGamemodeState(bool state) {
-    if (state) {
-        StartGamemode();
-    } else {
-        StopGamemode();
-    }
-}
-
-} // namespace Common::Linux
--- a/src/common/linux/gamemode.h
+++ b/src/common/linux/gamemode.h
@@ -1,24 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-namespace Common::Linux {
-
-/**
- * Start the (Feral Interactive) Linux gamemode if it is installed and it is activated
- */
-void StartGamemode();
-
-/**
- * Stop the (Feral Interactive) Linux gamemode if it is installed and it is activated
- */
-void StopGamemode();
-
-/**
- * Start or stop the (Feral Interactive) Linux gamemode if it is installed and it is activated
- * @param state The new state the gamemode should have
- */
-void SetGamemodeState(bool state);
-
-} // namespace Common::Linux
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -223,9 +223,9 @@ const char* TranslateCategory(Category category) {
    case Category::UiAudio:
        return "UiAudio";
    case Category::UiLayout:
-        return "UILayout";
+        return "UiLayout";
    case Category::UiGameList:
-        return "UIGameList";
+        return "UiGameList";
    case Category::Screenshots:
        return "Screenshots";
    case Category::Shortcuts:
@@ -236,8 +236,6 @@ const char* TranslateCategory(Category category) {
        return "Services";
    case Category::Paths:
        return "Paths";
-    case Category::Linux:
-        return "Linux";
    case Category::MaxEnum:
        break;
    }
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -182,7 +182,7 @@ struct Values {
    // Cpu
    SwitchableSetting<CpuBackend, true> cpu_backend{
        linkage,         CpuBackend::Dynarmic, CpuBackend::Dynarmic,
-#ifdef HAS_NCE
+#ifdef ARCHITECTURE_arm64
        CpuBackend::Nce,
 #else
                                                    CpuBackend::Dynarmic,
@@ -241,11 +241,7 @@ struct Values {
    SwitchableSetting<bool> use_asynchronous_gpu_emulation{
        linkage, true, "use_asynchronous_gpu_emulation", Category::Renderer};
    SwitchableSetting<AstcDecodeMode, true> accelerate_astc{linkage,
-#ifdef ANDROID
-                                                            AstcDecodeMode::Cpu,
-#else
                                                            AstcDecodeMode::Gpu,
-#endif
                                                            AstcDecodeMode::Cpu,
                                                            AstcDecodeMode::CpuAsynchronous,
                                                            "accelerate_astc",
@@ -317,11 +313,7 @@ struct Values {
        linkage, 0, "bg_blue", Category::Renderer, Specialization::Default, true, true};

    SwitchableSetting<GpuAccuracy, true> gpu_accuracy{linkage,
-#ifdef ANDROID
-                                                      GpuAccuracy::Normal,
-#else
                                                      GpuAccuracy::High,
-#endif
                                                      GpuAccuracy::Normal,
                                                      GpuAccuracy::Extreme,
                                                      "gpu_accuracy",
@@ -330,38 +322,20 @@ struct Values {
                                                      true,
                                                      true};
    GpuAccuracy current_gpu_accuracy{GpuAccuracy::High};
-    SwitchableSetting<AnisotropyMode, true> max_anisotropy{linkage,
-#ifdef ANDROID
-                                                           AnisotropyMode::Default,
-#else
-                                                           AnisotropyMode::Automatic,
-#endif
-                                                           AnisotropyMode::Automatic,
-                                                           AnisotropyMode::X16,
-                                                           "max_anisotropy",
-                                                           Category::RendererAdvanced};
+    SwitchableSetting<AnisotropyMode, true> max_anisotropy{
+        linkage,          AnisotropyMode::Automatic, AnisotropyMode::Automatic, AnisotropyMode::X16,
+        "max_anisotropy", Category::RendererAdvanced};
    SwitchableSetting<AstcRecompression, true> astc_recompression{linkage,
                                                                  AstcRecompression::Uncompressed,
                                                                  AstcRecompression::Uncompressed,
                                                                  AstcRecompression::Bc3,
                                                                  "astc_recompression",
                                                                  Category::RendererAdvanced};
-    SwitchableSetting<bool> async_presentation{linkage,
-#ifdef ANDROID
-                                               true,
-#else
-                                               false,
-#endif
-                                               "async_presentation", Category::RendererAdvanced};
+    SwitchableSetting<bool> async_presentation{linkage, false, "async_presentation",
+                                               Category::RendererAdvanced};
    SwitchableSetting<bool> renderer_force_max_clock{linkage, false, "force_max_clock",
                                                     Category::RendererAdvanced};
-    SwitchableSetting<bool> use_reactive_flushing{linkage,
-#ifdef ANDROID
-                                                  false,
-#else
-                                                  true,
-#endif
-                                                  "use_reactive_flushing",
+    SwitchableSetting<bool> use_reactive_flushing{linkage, true, "use_reactive_flushing",
                                                  Category::RendererAdvanced};
    SwitchableSetting<bool> use_asynchronous_shaders{linkage, false, "use_asynchronous_shaders",
                                                     Category::RendererAdvanced};
@@ -427,20 +401,13 @@ struct Values {
    Setting<s32> current_user{linkage, 0, "current_user", Category::System};

    SwitchableSetting<ConsoleMode> use_docked_mode{linkage,
-#ifdef ANDROID
-                                                   ConsoleMode::Handheld,
-#else
                                                   ConsoleMode::Docked,
-#endif
                                                   "use_docked_mode",
                                                   Category::System,
                                                   Specialization::Radio,
                                                   true,
                                                   true};

-    // Linux
-    SwitchableSetting<bool> enable_gamemode{linkage, true, "enable_gamemode", Category::Linux};
-
    // Controls
    InputSetting<std::array<PlayerInput, 10>> players;

--- a/src/common/settings_common.h
+++ b/src/common/settings_common.h
@@ -41,7 +41,6 @@ enum class Category : u32 {
    Multiplayer,
    Services,
    Paths,
-    Linux,
    MaxEnum,
 };

--- a/src/common/wall_clock.cpp
+++ b/src/common/wall_clock.cpp
@@ -10,7 +10,7 @@
 #include "common/x64/rdtsc.h"
 #endif

-#ifdef HAS_NCE
+#if defined(ARCHITECTURE_arm64) && defined(__linux__)
 #include "common/arm64/native_clock.h"
 #endif

@@ -68,7 +68,7 @@ std::unique_ptr<WallClock> CreateOptimalClock() {
        // - Is not more precise than 1 GHz (1ns resolution)
        return std::make_unique<StandardWallClock>();
    }
-#elif defined(HAS_NCE)
+#elif defined(ARCHITECTURE_arm64) && defined(__linux__)
    return std::make_unique<Arm64::NativeClock>();
 #else
    return std::make_unique<StandardWallClock>();
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -926,7 +926,8 @@ if (ENABLE_WEB_SERVICE)
    target_link_libraries(core PRIVATE web_service)
 endif()

-if (HAS_NCE)
+if (ARCHITECTURE_arm64 AND (ANDROID OR ${CMAKE_SYSTEM_NAME} STREQUAL "Linux"))
+    target_compile_definitions(core PRIVATE -DHAS_NCE)
    enable_language(C ASM)
    set(CMAKE_ASM_FLAGS "${CFLAGS} -x assembler-with-cpp")

@@ -935,8 +936,8 @@ if (HAS_NCE)
        arm/nce/arm_nce.h
        arm/nce/arm_nce.s
        arm/nce/guest_context.h
-        arm/nce/patcher.cpp
-        arm/nce/patcher.h
+        arm/nce/patch.cpp
+        arm/nce/patch.h
        arm/nce/instructions.h
    )
    target_link_libraries(core PRIVATE merry::oaknut)
--- a/src/core/arm/nce/arm_nce.cpp
+++ b/src/core/arm/nce/arm_nce.cpp
@@ -6,7 +6,7 @@

 #include "common/signal_chain.h"
 #include "core/arm/nce/arm_nce.h"
-#include "core/arm/nce/patcher.h"
+#include "core/arm/nce/patch.h"
 #include "core/core.h"
 #include "core/memory.h"

--- a/src/core/arm/nce/patcher.cpp
+++ b/src/core/arm/nce/patcher.cpp
@@ -7,7 +7,7 @@
 #include "core/arm/nce/arm_nce.h"
 #include "core/arm/nce/guest_context.h"
 #include "core/arm/nce/instructions.h"
-#include "core/arm/nce/patcher.h"
+#include "core/arm/nce/patch.h"
 #include "core/core.h"
 #include "core/core_timing.h"
 #include "core/hle/kernel/svc.h"
--- a/src/core/arm/nce/patcher.h
+++ b/src/core/arm/nce/patcher.h
@@ -6,8 +6,12 @@
 #include <span>
 #include <unordered_map>
 #include <vector>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshorten-64-to-32"
 #include <oaknut/code_block.hpp>
 #include <oaknut/oaknut.hpp>
+#pragma GCC diagnostic pop

 #include "common/common_types.h"
 #include "core/hle/kernel/code_set.h"
--- a/src/core/frontend/emu_window.h
+++ b/src/core/frontend/emu_window.h
@@ -167,11 +167,6 @@ protected:
     */
    std::pair<f32, f32> MapToTouchScreen(u32 framebuffer_x, u32 framebuffer_y) const;

-    /**
-     * Clip the provided coordinates to be inside the touchscreen area.
-     */
-    std::pair<u32, u32> ClipToTouchScreen(u32 new_x, u32 new_y) const;
-
    WindowSystemInfo window_info;

    bool strict_context_required = false;
@@ -186,6 +181,11 @@ private:
        // By default, ignore this request and do nothing.
    }

+    /**
+     * Clip the provided coordinates to be inside the touchscreen area.
+     */
+    std::pair<u32, u32> ClipToTouchScreen(u32 new_x, u32 new_y) const;
+
    Layout::FramebufferLayout framebuffer_layout; ///< Current framebuffer layout

    u32 client_area_width;  ///< Current client width, should be set by window impl.
--- a/src/core/hid/emulated_controller.cpp
+++ b/src/core/hid/emulated_controller.cpp
@@ -509,11 +509,9 @@ void EmulatedController::ReloadInput() {
        });
    }
    turbo_button_state = 0;
-    is_initalized = true;
 }

 void EmulatedController::UnloadInput() {
-    is_initalized = false;
    for (auto& button : button_devices) {
        button.reset();
    }
@@ -1209,9 +1207,6 @@ void EmulatedController::SetNfc(const Common::Input::CallbackStatus& callback) {
 }

 bool EmulatedController::SetVibration(std::size_t device_index, VibrationValue vibration) {
-    if (!is_initalized) {
-        return false;
-    }
    if (device_index >= output_devices.size()) {
        return false;
    }
@@ -1247,10 +1242,6 @@ bool EmulatedController::IsVibrationEnabled(std::size_t device_index) {
    const auto player_index = Service::HID::NpadIdTypeToIndex(npad_id_type);
    const auto& player = Settings::values.players.GetValue()[player_index];

-    if (!is_initalized) {
-        return false;
-    }
-
    if (!player.vibration_enabled) {
        return false;
    }
@@ -1270,10 +1261,6 @@ Common::Input::DriverResult EmulatedController::SetPollingMode(
    EmulatedDeviceIndex device_index, Common::Input::PollingMode polling_mode) {
    LOG_INFO(Service_HID, "Set polling mode {}, device_index={}", polling_mode, device_index);

-    if (!is_initalized) {
-        return Common::Input::DriverResult::InvalidHandle;
-    }
-
    auto& left_output_device = output_devices[static_cast<std::size_t>(DeviceIndex::Left)];
    auto& right_output_device = output_devices[static_cast<std::size_t>(DeviceIndex::Right)];
    auto& nfc_output_device = output_devices[3];
@@ -1319,10 +1306,6 @@ bool EmulatedController::SetCameraFormat(
    Core::IrSensor::ImageTransferProcessorFormat camera_format) {
    LOG_INFO(Service_HID, "Set camera format {}", camera_format);

-    if (!is_initalized) {
-        return false;
-    }
-
    auto& right_output_device = output_devices[static_cast<std::size_t>(DeviceIndex::Right)];
    auto& camera_output_device = output_devices[2];

@@ -1346,11 +1329,6 @@ void EmulatedController::SetRingParam(Common::ParamPackage param) {
 }

 bool EmulatedController::HasNfc() const {
-
-    if (!is_initalized) {
-        return false;
-    }
-
    const auto& nfc_output_device = output_devices[3];

    switch (npad_type) {
@@ -1388,10 +1366,6 @@ bool EmulatedController::RemoveNfcHandle() {
 }

 bool EmulatedController::StartNfcPolling() {
-    if (!is_initalized) {
-        return false;
-    }
-
    auto& nfc_output_device = output_devices[static_cast<std::size_t>(DeviceIndex::Right)];
    auto& nfc_virtual_output_device = output_devices[3];

@@ -1403,10 +1377,6 @@ bool EmulatedController::StartNfcPolling() {
 }

 bool EmulatedController::StopNfcPolling() {
-    if (!is_initalized) {
-        return false;
-    }
-
    auto& nfc_output_device = output_devices[static_cast<std::size_t>(DeviceIndex::Right)];
    auto& nfc_virtual_output_device = output_devices[3];

@@ -1418,10 +1388,6 @@ bool EmulatedController::StopNfcPolling() {
 }

 bool EmulatedController::ReadAmiiboData(std::vector<u8>& data) {
-    if (!is_initalized) {
-        return false;
-    }
-
    auto& nfc_output_device = output_devices[static_cast<std::size_t>(DeviceIndex::Right)];
    auto& nfc_virtual_output_device = output_devices[3];

@@ -1434,10 +1400,6 @@ bool EmulatedController::ReadAmiiboData(std::vector<u8>& data) {

 bool EmulatedController::ReadMifareData(const Common::Input::MifareRequest& request,
                                        Common::Input::MifareRequest& out_data) {
-    if (!is_initalized) {
-        return false;
-    }
-
    auto& nfc_output_device = output_devices[static_cast<std::size_t>(DeviceIndex::Right)];
    auto& nfc_virtual_output_device = output_devices[3];

@@ -1450,10 +1412,6 @@ bool EmulatedController::ReadMifareData(const Common::Input::MifareRequest& requ
 }

 bool EmulatedController::WriteMifareData(const Common::Input::MifareRequest& request) {
-    if (!is_initalized) {
-        return false;
-    }
-
    auto& nfc_output_device = output_devices[static_cast<std::size_t>(DeviceIndex::Right)];
    auto& nfc_virtual_output_device = output_devices[3];

@@ -1465,10 +1423,6 @@ bool EmulatedController::WriteMifareData(const Common::Input::MifareRequest& req
 }

 bool EmulatedController::WriteNfc(const std::vector<u8>& data) {
-    if (!is_initalized) {
-        return false;
-    }
-
    auto& nfc_output_device = output_devices[static_cast<std::size_t>(DeviceIndex::Right)];
    auto& nfc_virtual_output_device = output_devices[3];

@@ -1480,10 +1434,6 @@ bool EmulatedController::WriteNfc(const std::vector<u8>& data) {
 }

 void EmulatedController::SetLedPattern() {
-    if (!is_initalized) {
-        return;
-    }
-
    for (auto& device : output_devices) {
        if (!device) {
            continue;
--- a/src/core/hid/emulated_controller.h
+++ b/src/core/hid/emulated_controller.h
@@ -559,7 +559,6 @@ private:
    NpadStyleTag supported_style_tag{NpadStyleSet::All};
    bool is_connected{false};
    bool is_configuring{false};
-    bool is_initalized{false};
    bool system_buttons_enabled{true};
    f32 motion_sensitivity{Core::HID::MotionInput::IsAtRestStandard};
    u32 turbo_button_state{0};
--- a/src/core/hle/kernel/k_process.cpp
+++ b/src/core/hle/kernel/k_process.cpp
@@ -1215,7 +1215,7 @@ void KProcess::LoadModule(CodeSet code_set, KProcessAddress base_addr) {
    ReprotectSegment(code_set.RODataSegment(), Svc::MemoryPermission::Read);
    ReprotectSegment(code_set.DataSegment(), Svc::MemoryPermission::ReadWrite);

-#ifdef HAS_NCE
+#ifdef ARCHITECTURE_arm64
    if (Settings::IsNceEnabled()) {
        auto& buffer = m_kernel.System().DeviceMemory().buffer;
        const auto& code = code_set.CodeSegment();
--- a/src/core/hle/service/am/applets/applet_cabinet.cpp
+++ b/src/core/hle/service/am/applets/applet_cabinet.cpp
@@ -122,8 +122,7 @@ void Cabinet::DisplayCompleted(bool apply_changes, std::string_view amiibo_name)
        Service::NFP::RegisterInfoPrivate register_info{};
        std::memcpy(register_info.amiibo_name.data(), amiibo_name.data(),
                    std::min(amiibo_name.size(), register_info.amiibo_name.size() - 1));
-        register_info.mii_store_data.BuildRandom(Mii::Age::All, Mii::Gender::All, Mii::Race::All);
-        register_info.mii_store_data.SetNickname({u'y', u'u', u'z', u'u'});
+
        nfp_device->SetRegisterInfoPrivate(register_info);
        break;
    }
@@ -131,7 +130,7 @@ void Cabinet::DisplayCompleted(bool apply_changes, std::string_view amiibo_name)
        nfp_device->DeleteApplicationArea();
        break;
    case Service::NFP::CabinetMode::StartRestorer:
-        nfp_device->Restore();
+        nfp_device->RestoreAmiibo();
        break;
    case Service::NFP::CabinetMode::StartFormatter:
        nfp_device->Format();
--- a/src/core/hle/service/hid/controllers/touchscreen.cpp
+++ b/src/core/hle/service/hid/controllers/touchscreen.cpp
@@ -16,8 +16,7 @@ namespace Service::HID {
 constexpr std::size_t SHARED_MEMORY_OFFSET = 0x400;

 TouchScreen::TouchScreen(Core::HID::HIDCore& hid_core_, u8* raw_shared_memory_)
-    : ControllerBase{hid_core_}, touchscreen_width(Layout::ScreenUndocked::Width),
-      touchscreen_height(Layout::ScreenUndocked::Height) {
+    : ControllerBase{hid_core_} {
    static_assert(SHARED_MEMORY_OFFSET + sizeof(TouchSharedMemory) < shared_memory_size,
                  "TouchSharedMemory is bigger than the shared memory");
    shared_memory = std::construct_at(
@@ -96,8 +95,8 @@ void TouchScreen::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
        if (id < active_fingers_count) {
            const auto& [active_x, active_y] = active_fingers[id].position;
            touch_entry.position = {
-                .x = static_cast<u16>(active_x * static_cast<float>(touchscreen_width)),
-                .y = static_cast<u16>(active_y * static_cast<float>(touchscreen_height)),
+                .x = static_cast<u16>(active_x * Layout::ScreenUndocked::Width),
+                .y = static_cast<u16>(active_y * Layout::ScreenUndocked::Height),
            };
            touch_entry.diameter_x = Settings::values.touchscreen.diameter_x;
            touch_entry.diameter_y = Settings::values.touchscreen.diameter_y;
@@ -121,9 +120,4 @@ void TouchScreen::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
    shared_memory->touch_screen_lifo.WriteNextEntry(next_state);
 }

-void TouchScreen::SetTouchscreenDimensions(u32 width, u32 height) {
-    touchscreen_width = width;
-    touchscreen_height = height;
-}
-
 } // namespace Service::HID
--- a/src/core/hle/service/hid/controllers/touchscreen.h
+++ b/src/core/hle/service/hid/controllers/touchscreen.h
@@ -28,8 +28,6 @@ public:
    // When the controller is requesting an update for the shared memory
    void OnUpdate(const Core::Timing::CoreTiming& core_timing) override;

-    void SetTouchscreenDimensions(u32 width, u32 height);
-
 private:
    static constexpr std::size_t MAX_FINGERS = 16;

@@ -55,7 +53,5 @@ private:
    Core::HID::EmulatedConsole* console = nullptr;

    std::array<Core::HID::TouchFinger, MAX_FINGERS> fingers{};
-    u32 touchscreen_width;
-    u32 touchscreen_height;
 };
 } // namespace Service::HID
--- a/src/core/hle/service/hid/hid_server.cpp
+++ b/src/core/hle/service/hid/hid_server.cpp
@@ -208,7 +208,6 @@ IHidServer::IHidServer(Core::System& system_, std::shared_ptr<ResourceManager> r
        {1001, &IHidServer::GetNpadCommunicationMode, "GetNpadCommunicationMode"},
        {1002, &IHidServer::SetTouchScreenConfiguration, "SetTouchScreenConfiguration"},
        {1003, &IHidServer::IsFirmwareUpdateNeededForNotification, "IsFirmwareUpdateNeededForNotification"},
-        {1004, &IHidServer::SetTouchScreenResolution, "SetTouchScreenResolution"},
        {2000, nullptr, "ActivateDigitizer"},
    };
    // clang-format on
@@ -2364,21 +2363,6 @@ void IHidServer::IsFirmwareUpdateNeededForNotification(HLERequestContext& ctx) {
    rb.Push(false);
 }

-void IHidServer::SetTouchScreenResolution(HLERequestContext& ctx) {
-    IPC::RequestParser rp{ctx};
-    const auto width{rp.Pop<u32>()};
-    const auto height{rp.Pop<u32>()};
-    const auto applet_resource_user_id{rp.Pop<u64>()};
-
-    GetResourceManager()->GetTouchScreen()->SetTouchscreenDimensions(width, height);
-
-    LOG_INFO(Service_HID, "called, width={}, height={}, applet_resource_user_id={}", width, height,
-             applet_resource_user_id);
-
-    IPC::ResponseBuilder rb{ctx, 2};
-    rb.Push(ResultSuccess);
-}
-
 std::shared_ptr<ResourceManager> IHidServer::GetResourceManager() {
    resource_manager->Initialize();
    return resource_manager;
--- a/src/core/hle/service/hid/hid_server.h
+++ b/src/core/hle/service/hid/hid_server.h
@@ -141,7 +141,6 @@ private:
    void GetNpadCommunicationMode(HLERequestContext& ctx);
    void SetTouchScreenConfiguration(HLERequestContext& ctx);
    void IsFirmwareUpdateNeededForNotification(HLERequestContext& ctx);
-    void SetTouchScreenResolution(HLERequestContext& ctx);

    std::shared_ptr<ResourceManager> resource_manager;
    std::shared_ptr<HidFirmwareSettings> firmware_settings;
--- a/src/core/hle/service/mii/types/ver3_store_data.cpp
+++ b/src/core/hle/service/mii/types/ver3_store_data.cpp
@@ -98,7 +98,7 @@ void Ver3StoreData::BuildToStoreData(StoreData& out_store_data) const {
 }

 void Ver3StoreData::BuildFromStoreData(const StoreData& store_data) {
-    version = 3;
+    version = 1;
    mii_information.gender.Assign(static_cast<u8>(store_data.GetGender()));
    mii_information.favorite_color.Assign(static_cast<u8>(store_data.GetFavoriteColor()));
    height = store_data.GetHeight();
--- a/src/core/hle/service/nfc/common/device.cpp
+++ b/src/core/hle/service/nfc/common/device.cpp
@@ -401,12 +401,6 @@ Result NfcDevice::SendCommandByPassThrough(const Time::Clock::TimeSpanType& time
 }

 Result NfcDevice::Mount(NFP::ModelType model_type, NFP::MountTarget mount_target_) {
-    bool is_corrupted = false;
-
-    if (model_type != NFP::ModelType::Amiibo) {
-        return ResultInvalidArgument;
-    }
-
    if (device_state != DeviceState::TagFound) {
        LOG_ERROR(Service_NFP, "Wrong device state {}", device_state);
        return ResultWrongDeviceState;
@@ -426,32 +420,26 @@ Result NfcDevice::Mount(NFP::ModelType model_type, NFP::MountTarget mount_target
    if (is_plain_amiibo) {
        std::vector<u8> data(sizeof(NFP::NTAG215File));
        memcpy(data.data(), &tag_data, sizeof(tag_data));
+        WriteBackupData(tag_data.uid, data);
+
+        device_state = DeviceState::TagMounted;
+        mount_target = mount_target_;
+        return ResultSuccess;
    }

-    if (!is_plain_amiibo && !NFP::AmiiboCrypto::DecodeAmiibo(encrypted_tag_data, tag_data)) {
-        LOG_ERROR(Service_NFP, "Can't decode amiibo");
-        is_corrupted = true;
+    if (!NFP::AmiiboCrypto::DecodeAmiibo(encrypted_tag_data, tag_data)) {
+        bool has_backup = HasBackup(encrypted_tag_data.uuid).IsSuccess();
+        LOG_ERROR(Service_NFP, "Can't decode amiibo, has_backup= {}", has_backup);
+        return has_backup ? ResultCorruptedDataWithBackup : ResultCorruptedData;
    }

-    if (tag_data.settings.settings.amiibo_initialized && !tag_data.owner_mii.IsValid()) {
-        LOG_ERROR(Service_NFP, "Invalid mii data");
-        is_corrupted = true;
-    }
-
-    if (!is_corrupted) {
-        std::vector<u8> data(sizeof(NFP::EncryptedNTAG215File));
-        memcpy(data.data(), &encrypted_tag_data, sizeof(encrypted_tag_data));
-        WriteBackupData(encrypted_tag_data.uuid, data);
-    }
+    std::vector<u8> data(sizeof(NFP::EncryptedNTAG215File));
+    memcpy(data.data(), &encrypted_tag_data, sizeof(encrypted_tag_data));
+    WriteBackupData(encrypted_tag_data.uuid, data);

    device_state = DeviceState::TagMounted;
    mount_target = mount_target_;

-    if (is_corrupted) {
-        bool has_backup = HasBackup(encrypted_tag_data.uuid).IsSuccess();
-        return has_backup ? ResultCorruptedDataWithBackup : ResultCorruptedData;
-    }
-
    return ResultSuccess;
 }

@@ -618,17 +606,6 @@ Result NfcDevice::Restore() {
        }
    }

-    // Restore mii data in case is corrupted by previous instances of yuzu
-    if (tag_data.settings.settings.amiibo_initialized && !tag_data.owner_mii.IsValid()) {
-        LOG_ERROR(Service_NFP, "Regenerating mii data");
-        Mii::StoreData new_mii{};
-        new_mii.BuildRandom(Mii::Age::All, Mii::Gender::All, Mii::Race::All);
-        new_mii.SetNickname({u'y', u'u', u'z', u'u', u'\0'});
-
-        tag_data.owner_mii.BuildFromStoreData(new_mii);
-        tag_data.mii_extension.SetFromStoreData(new_mii);
-    }
-
    // Overwrite tag contents with backup and mount the tag
    tag_data = temporary_tag_data;
    encrypted_tag_data = temporary_encrypted_tag_data;
@@ -874,6 +851,25 @@ Result NfcDevice::SetRegisterInfoPrivate(const NFP::RegisterInfoPrivate& registe
    return Flush();
 }

+Result NfcDevice::RestoreAmiibo() {
+    if (device_state != DeviceState::TagMounted) {
+        LOG_ERROR(Service_NFP, "Wrong device state {}", device_state);
+        if (device_state == DeviceState::TagRemoved) {
+            return ResultTagRemoved;
+        }
+        return ResultWrongDeviceState;
+    }
+
+    if (mount_target == NFP::MountTarget::None || mount_target == NFP::MountTarget::Rom) {
+        LOG_ERROR(Service_NFP, "Amiibo is read only", device_state);
+        return ResultWrongDeviceState;
+    }
+
+    // TODO: Load amiibo from backup on system
+    LOG_ERROR(Service_NFP, "Not Implemented");
+    return ResultSuccess;
+}
+
 Result NfcDevice::Format() {
    Result result = ResultSuccess;

@@ -881,9 +877,7 @@ Result NfcDevice::Format() {
        result = Mount(NFP::ModelType::Amiibo, NFP::MountTarget::All);
    }

-    // We are formatting all data. Corruption is not an issue.
-    if (result.IsError() &&
-        (result != ResultCorruptedData && result != ResultCorruptedDataWithBackup)) {
+    if (result.IsError()) {
        return result;
    }

--- a/src/core/hle/service/nfc/common/device.h
+++ b/src/core/hle/service/nfc/common/device.h
@@ -68,6 +68,7 @@ public:

    Result DeleteRegisterInfo();
    Result SetRegisterInfoPrivate(const NFP::RegisterInfoPrivate& register_info);
+    Result RestoreAmiibo();
    Result Format();

    Result OpenApplicationArea(u32 access_id);
--- a/src/core/hle/service/set/set_sys.cpp
+++ b/src/core/hle/service/set/set_sys.cpp
@@ -19,8 +19,19 @@

 namespace Service::Set {

-Result GetFirmwareVersionImpl(FirmwareVersionFormat& out_firmware, Core::System& system,
-                              GetFirmwareVersionType type) {
+namespace {
+constexpr u64 SYSTEM_VERSION_FILE_MINOR_REVISION_OFFSET = 0x05;
+
+enum class GetFirmwareVersionType {
+    Version1,
+    Version2,
+};
+
+void GetFirmwareVersionImpl(Core::System& system, HLERequestContext& ctx,
+                            GetFirmwareVersionType type) {
+    ASSERT_MSG(ctx.GetWriteBufferSize() == 0x100,
+               "FirmwareVersion output buffer must be 0x100 bytes in size!");
+
    constexpr u64 FirmwareVersionSystemDataId = 0x0100000000000809;
    auto& fsc = system.GetFileSystemController();

@@ -34,43 +45,46 @@ Result GetFirmwareVersionImpl(FirmwareVersionFormat& out_firmware, Core::System&
        nca = bis_system->GetEntry(FirmwareVersionSystemDataId, FileSys::ContentRecordType::Data);
    }
    if (nca) {
-        if (auto nca_romfs = nca->GetRomFS(); nca_romfs) {
-            romfs = FileSys::ExtractRomFS(nca_romfs);
-        }
+        romfs = FileSys::ExtractRomFS(nca->GetRomFS());
    }
    if (!romfs) {
        romfs = FileSys::ExtractRomFS(
            FileSys::SystemArchive::SynthesizeSystemArchive(FirmwareVersionSystemDataId));
    }

-    const auto early_exit_failure = [](std::string_view desc, Result code) {
+    const auto early_exit_failure = [&ctx](std::string_view desc, Result code) {
        LOG_ERROR(Service_SET, "General failure while attempting to resolve firmware version ({}).",
                  desc);
-        return code;
+        IPC::ResponseBuilder rb{ctx, 2};
+        rb.Push(code);
    };

    const auto ver_file = romfs->GetFile("file");
    if (ver_file == nullptr) {
-        return early_exit_failure("The system version archive didn't contain the file 'file'.",
-                                  FileSys::ERROR_INVALID_ARGUMENT);
+        early_exit_failure("The system version archive didn't contain the file 'file'.",
+                           FileSys::ERROR_INVALID_ARGUMENT);
+        return;
    }

    auto data = ver_file->ReadAllBytes();
-    if (data.size() != sizeof(FirmwareVersionFormat)) {
-        return early_exit_failure("The system version file 'file' was not the correct size.",
-                                  FileSys::ERROR_OUT_OF_BOUNDS);
+    if (data.size() != 0x100) {
+        early_exit_failure("The system version file 'file' was not the correct size.",
+                           FileSys::ERROR_OUT_OF_BOUNDS);
+        return;
    }

-    std::memcpy(&out_firmware, data.data(), sizeof(FirmwareVersionFormat));
-
    // If the command is GetFirmwareVersion (as opposed to GetFirmwareVersion2), hardware will
    // zero out the REVISION_MINOR field.
    if (type == GetFirmwareVersionType::Version1) {
-        out_firmware.revision_minor = 0;
+        data[SYSTEM_VERSION_FILE_MINOR_REVISION_OFFSET] = 0;
    }

-    return ResultSuccess;
+    ctx.WriteBuffer(data);
+
+    IPC::ResponseBuilder rb{ctx, 2};
+    rb.Push(ResultSuccess);
 }
+} // Anonymous namespace

 void SET_SYS::SetLanguageCode(HLERequestContext& ctx) {
    IPC::RequestParser rp{ctx};
@@ -84,32 +98,12 @@ void SET_SYS::SetLanguageCode(HLERequestContext& ctx) {

 void SET_SYS::GetFirmwareVersion(HLERequestContext& ctx) {
    LOG_DEBUG(Service_SET, "called");
-
-    FirmwareVersionFormat firmware_data{};
-    const auto result =
-        GetFirmwareVersionImpl(firmware_data, system, GetFirmwareVersionType::Version1);
-
-    if (result.IsSuccess()) {
-        ctx.WriteBuffer(firmware_data);
-    }
-
-    IPC::ResponseBuilder rb{ctx, 2};
-    rb.Push(result);
+    GetFirmwareVersionImpl(system, ctx, GetFirmwareVersionType::Version1);
 }

 void SET_SYS::GetFirmwareVersion2(HLERequestContext& ctx) {
    LOG_DEBUG(Service_SET, "called");
-
-    FirmwareVersionFormat firmware_data{};
-    const auto result =
-        GetFirmwareVersionImpl(firmware_data, system, GetFirmwareVersionType::Version2);
-
-    if (result.IsSuccess()) {
-        ctx.WriteBuffer(firmware_data);
-    }
-
-    IPC::ResponseBuilder rb{ctx, 2};
-    rb.Push(result);
+    GetFirmwareVersionImpl(system, ctx, GetFirmwareVersionType::Version2);
 }

 void SET_SYS::GetAccountSettings(HLERequestContext& ctx) {
--- a/src/core/hle/service/set/set_sys.h
+++ b/src/core/hle/service/set/set_sys.h
@@ -4,7 +4,6 @@
 #pragma once

 #include "common/uuid.h"
-#include "core/hle/result.h"
 #include "core/hle/service/service.h"
 #include "core/hle/service/time/clock_types.h"

@@ -13,29 +12,6 @@ class System;
 }

 namespace Service::Set {
-enum class LanguageCode : u64;
-enum class GetFirmwareVersionType {
-    Version1,
-    Version2,
-};
-
-struct FirmwareVersionFormat {
-    u8 major;
-    u8 minor;
-    u8 micro;
-    INSERT_PADDING_BYTES(1);
-    u8 revision_major;
-    u8 revision_minor;
-    INSERT_PADDING_BYTES(2);
-    std::array<char, 0x20> platform;
-    std::array<u8, 0x40> version_hash;
-    std::array<char, 0x18> display_version;
-    std::array<char, 0x80> display_title;
-};
-static_assert(sizeof(FirmwareVersionFormat) == 0x100, "FirmwareVersionFormat is an invalid size");
-
-Result GetFirmwareVersionImpl(FirmwareVersionFormat& out_firmware, Core::System& system,
-                              GetFirmwareVersionType type);

 class SET_SYS final : public ServiceFramework<SET_SYS> {
 public:
--- a/src/core/hle/service/time/clock_types.h
+++ b/src/core/hle/service/time/clock_types.h
@@ -11,11 +11,6 @@
 #include "core/hle/service/time/errors.h"
 #include "core/hle/service/time/time_zone_types.h"

-// Defined by WinBase.h on Windows
-#ifdef GetCurrentTime
-#undef GetCurrentTime
-#endif
-
 namespace Service::Time::Clock {

 enum class TimeType : u8 {
--- a/src/core/loader/deconstructed_rom_directory.cpp
+++ b/src/core/loader/deconstructed_rom_directory.cpp
@@ -16,7 +16,7 @@
 #include "core/loader/nso.h"

 #ifdef HAS_NCE
-#include "core/arm/nce/patcher.h"
+#include "core/arm/nce/patch.h"
 #endif

 namespace Loader {
--- a/src/core/loader/nro.cpp
+++ b/src/core/loader/nro.cpp
@@ -23,7 +23,7 @@
 #include "core/memory.h"

 #ifdef HAS_NCE
-#include "core/arm/nce/patcher.h"
+#include "core/arm/nce/patch.h"
 #endif

 namespace Loader {
--- a/src/core/loader/nso.cpp
+++ b/src/core/loader/nso.cpp
@@ -21,7 +21,7 @@
 #include "core/memory.h"

 #ifdef HAS_NCE
-#include "core/arm/nce/patcher.h"
+#include "core/arm/nce/patch.h"
 #endif

 namespace Loader {
@@ -165,7 +165,7 @@ std::optional<VAddr> AppLoader_NSO::LoadModule(Kernel::KProcess& process, Core::
        patch->PatchText(program_image, code);

        // Add patch section size to the module size.
-        image_size += static_cast<u32>(patch->GetSectionSize());
+        image_size += patch->GetSectionSize();
    } else if (patch) {
        // Relocate code patch and copy to the program_image.
        patch->RelocateAndCopy(load_base, code, program_image, &process.GetPostHandlers());
--- a/src/frontend_common/CMakeLists.txt
+++ b/src/frontend_common/CMakeLists.txt
@@ -1,10 +0,0 @@
-# SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-add_library(frontend_common STATIC
-    config.cpp
-    config.h
-)
-
-create_target_directory_groups(frontend_common)
-target_link_libraries(frontend_common PUBLIC core SimpleIni::SimpleIni PRIVATE common Boost::headers)
--- a/src/frontend_common/config.cpp
+++ b/src/frontend_common/config.cpp
--- a/src/frontend_common/config.h
+++ b/src/frontend_common/config.h
@@ -1,211 +0,0 @@
-// SPDX-FileCopyrightText: 2023 yuzu Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <memory>
-#include <string>
-#include "common/settings.h"
-
-#define SI_NO_CONVERSION
-#include <SimpleIni.h>
-#include <boost/algorithm/string/replace.hpp>
-
-// Workaround for conflicting definition in libloaderapi.h caused by SimpleIni
-#undef LoadString
-#undef CreateFile
-#undef DeleteFile
-#undef CopyFile
-#undef CreateDirectory
-#undef MoveFile
-
-namespace Core {
-class System;
-}
-
-class Config {
-public:
-    enum class ConfigType {
-        GlobalConfig,
-        PerGameConfig,
-        InputProfile,
-    };
-
-    virtual ~Config() = default;
-
-    void ClearControlPlayerValues() const;
-
-    [[nodiscard]] const std::string& GetConfigFilePath() const;
-
-    [[nodiscard]] bool Exists(const std::string& section, const std::string& key) const;
-
-protected:
-    explicit Config(ConfigType config_type = ConfigType::GlobalConfig);
-
-    void Initialize(const std::string& config_name = "config");
-    void Initialize(std::optional<std::string> config_path);
-
-    void WriteToIni() const;
-
-    void SetUpIni();
-    [[nodiscard]] bool IsCustomConfig() const;
-
-    void Reload();
-    void Save();
-
-    /**
-     * Derived config classes must implement this so they can reload all platform-specific
-     * values and global ones.
-     */
-    virtual void ReloadAllValues() = 0;
-
-    /**
-     * Derived config classes must implement this so they can save all platform-specific
-     * and global values.
-     */
-    virtual void SaveAllValues() = 0;
-
-    void ReadValues();
-    void ReadPlayerValues(std::size_t player_index);
-
-    void ReadTouchscreenValues();
-    void ReadMotionTouchValues();
-
-    // Read functions bases off the respective config section names.
-    void ReadAudioValues();
-    void ReadControlValues();
-    void ReadCoreValues();
-    void ReadDataStorageValues();
-    void ReadDebuggingValues();
-    void ReadServiceValues();
-    void ReadDisabledAddOnValues();
-    void ReadMiscellaneousValues();
-    void ReadCpuValues();
-    void ReadRendererValues();
-    void ReadScreenshotValues();
-    void ReadSystemValues();
-    void ReadWebServiceValues();
-    void ReadNetworkValues();
-
-    // Read platform specific sections
-    virtual void ReadHidbusValues() = 0;
-    virtual void ReadDebugControlValues() = 0;
-    virtual void ReadPathValues() = 0;
-    virtual void ReadShortcutValues() = 0;
-    virtual void ReadUIValues() = 0;
-    virtual void ReadUIGamelistValues() = 0;
-    virtual void ReadUILayoutValues() = 0;
-    virtual void ReadMultiplayerValues() = 0;
-
-    void SaveValues();
-    void SavePlayerValues(std::size_t player_index);
-    void SaveTouchscreenValues();
-    void SaveMotionTouchValues();
-
-    // Save functions based off the respective config section names.
-    void SaveAudioValues();
-    void SaveControlValues();
-    void SaveCoreValues();
-    void SaveDataStorageValues();
-    void SaveDebuggingValues();
-    void SaveNetworkValues();
-    void SaveDisabledAddOnValues();
-    void SaveMiscellaneousValues();
-    void SaveCpuValues();
-    void SaveRendererValues();
-    void SaveScreenshotValues();
-    void SaveSystemValues();
-    void SaveWebServiceValues();
-
-    // Save platform specific sections
-    virtual void SaveHidbusValues() = 0;
-    virtual void SaveDebugControlValues() = 0;
-    virtual void SavePathValues() = 0;
-    virtual void SaveShortcutValues() = 0;
-    virtual void SaveUIValues() = 0;
-    virtual void SaveUIGamelistValues() = 0;
-    virtual void SaveUILayoutValues() = 0;
-    virtual void SaveMultiplayerValues() = 0;
-
-    virtual std::vector<Settings::BasicSetting*>& FindRelevantList(Settings::Category category) = 0;
-
-    /**
-     * Reads a setting from the qt_config.
-     *
-     * @param key The setting's identifier
-     * @param default_value The value to use when the setting is not already present in the config
-     */
-    bool ReadBooleanSetting(const std::string& key,
-                            std::optional<bool> default_value = std::nullopt);
-    s64 ReadIntegerSetting(const std::string& key, std::optional<s64> default_value = std::nullopt);
-    u64 ReadUnsignedIntegerSetting(const std::string& key,
-                                   std::optional<u64> default_value = std::nullopt);
-    double ReadDoubleSetting(const std::string& key,
-                             std::optional<double> default_value = std::nullopt);
-    std::string ReadStringSetting(const std::string& key,
-                                  std::optional<std::string> default_value = std::nullopt);
-
-    /**
-     * Writes a setting to the qt_config.
-     *
-     * @param key The setting's idetentifier
-     * @param value Value of the setting
-     * @param default_value Default of the setting if not present in config
-     * @param use_global Specifies if the custom or global config should be in use, for custom
-     * configs
-     */
-    template <typename Type = int>
-    void WriteSetting(const std::string& key, const Type& value,
-                      const std::optional<Type>& default_value = std::nullopt,
-                      const std::optional<bool>& use_global = std::nullopt);
-    void WriteSettingInternal(const std::string& key, const std::string& value);
-
-    void ReadCategory(Settings::Category category);
-    void WriteCategory(Settings::Category category);
-    void ReadSettingGeneric(Settings::BasicSetting* setting);
-    void WriteSettingGeneric(const Settings::BasicSetting* setting);
-
-    template <typename T>
-    [[nodiscard]] std::string ToString(const T& value_) {
-        if constexpr (std::is_same_v<T, std::string>) {
-            return value_;
-        } else if constexpr (std::is_same_v<T, std::optional<u32>>) {
-            return value_.has_value() ? std::to_string(*value_) : "none";
-        } else if constexpr (std::is_same_v<T, bool>) {
-            return value_ ? "true" : "false";
-        } else if constexpr (std::is_same_v<T, u64>) {
-            return std::to_string(static_cast<u64>(value_));
-        } else {
-            return std::to_string(static_cast<s64>(value_));
-        }
-    }
-
-    void BeginGroup(const std::string& group);
-    void EndGroup();
-    std::string GetSection();
-    [[nodiscard]] std::string GetGroup() const;
-    static std::string AdjustKey(const std::string& key);
-    static std::string AdjustOutputString(const std::string& string);
-    std::string GetFullKey(const std::string& key, bool skipArrayIndex);
-    int BeginArray(const std::string& array);
-    void EndArray();
-    void SetArrayIndex(int index);
-
-    const ConfigType type;
-    std::unique_ptr<CSimpleIniA> config;
-    std::string config_loc;
-    const bool global;
-
-private:
-    inline static std::array<char, 19> special_characters = {'!', '#', '$',  '%',  '^', '&', '*',
-                                                             '|', ';', '\'', '\"', ',', '<', '.',
-                                                             '>', '?', '`',  '~',  '='};
-
-    struct ConfigArray {
-        std::string name;
-        int size;
-        int index;
-    };
-    std::vector<ConfigArray> array_stack;
-    std::vector<std::string> key_stack;
-};
--- a/src/shader_recompiler/backend/glasm/emit_glasm_memory.cpp
+++ b/src/shader_recompiler/backend/glasm/emit_glasm_memory.cpp
@@ -5,7 +5,6 @@
 #include "shader_recompiler/backend/glasm/glasm_emit_context.h"
 #include "shader_recompiler/frontend/ir/program.h"
 #include "shader_recompiler/frontend/ir/value.h"
-#include "shader_recompiler/profile.h"
 #include "shader_recompiler/runtime_info.h"

 namespace Shader::Backend::GLASM {
@@ -36,9 +35,7 @@ void GlobalStorageOp(EmitContext& ctx, Register address, bool pointer_based, std
            continue;
        }
        const auto& ssbo{ctx.info.storage_buffers_descriptors[index]};
-        const u64 ssbo_align_mask{~(ctx.profile.min_ssbo_alignment - 1U)};
-        ctx.Add("LDC.U64 DC.x,c{}[{}];"    // unaligned_ssbo_addr
-                "AND.U64 DC.x,DC.x,{};"    // ssbo_addr = unaligned_ssbo_addr & ssbo_align_mask
+        ctx.Add("LDC.U64 DC.x,c{}[{}];"    // ssbo_addr
                "LDC.U32 RC.x,c{}[{}];"    // ssbo_size_u32
                "CVT.U64.U32 DC.y,RC.x;"   // ssbo_size = ssbo_size_u32
                "ADD.U64 DC.y,DC.y,DC.x;"  // ssbo_end = ssbo_addr + ssbo_size
@@ -47,8 +44,8 @@ void GlobalStorageOp(EmitContext& ctx, Register address, bool pointer_based, std
                "AND.U.CC RC.x,RC.x,RC.y;" // cond = a && b
                "IF NE.x;"                 // if cond
                "SUB.U64 DC.x,{}.x,DC.x;", // offset = input_addr - ssbo_addr
-                ssbo.cbuf_index, ssbo.cbuf_offset, ssbo_align_mask, ssbo.cbuf_index,
-                ssbo.cbuf_offset + 8, address, address, address);
+                ssbo.cbuf_index, ssbo.cbuf_offset, ssbo.cbuf_index, ssbo.cbuf_offset + 8, address,
+                address, address);
        if (pointer_based) {
            ctx.Add("PK64.U DC.y,c[{}];"      // host_ssbo = cbuf
                    "ADD.U64 DC.x,DC.x,DC.y;" // host_addr = host_ssbo + offset
--- a/src/shader_recompiler/backend/glsl/glsl_emit_context.cpp
+++ b/src/shader_recompiler/backend/glsl/glsl_emit_context.cpp
@@ -601,10 +601,7 @@ std::string EmitContext::DefineGlobalMemoryFunctions() {
            addr_xy[i] = fmt::format("ftou({}[{}].{})", cbuf, addr_loc / 16, Swizzle(addr_loc));
            size_xy[i] = fmt::format("ftou({}[{}].{})", cbuf, size_loc / 16, Swizzle(size_loc));
        }
-        const u32 ssbo_align_mask{~(static_cast<u32>(profile.min_ssbo_alignment) - 1U)};
-        const auto aligned_low_addr{fmt::format("{}&{}", addr_xy[0], ssbo_align_mask)};
-        const auto aligned_addr{fmt::format("uvec2({},{})", aligned_low_addr, addr_xy[1])};
-        const auto addr_pack{fmt::format("packUint2x32({})", aligned_addr)};
+        const auto addr_pack{fmt::format("packUint2x32(uvec2({},{}))", addr_xy[0], addr_xy[1])};
        const auto addr_statment{fmt::format("uint64_t {}={};", ssbo_addr, addr_pack)};
        func += addr_statment;

--- a/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp
+++ b/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp
@@ -891,9 +891,7 @@ void EmitContext::DefineGlobalMemoryFunctions(const Info& info) {
            const Id ssbo_size_pointer{OpAccessChain(uniform_types.U32, cbufs[ssbo.cbuf_index].U32,
                                                     zero, ssbo_size_cbuf_offset)};

-            const u64 ssbo_align_mask{~(profile.min_ssbo_alignment - 1U)};
-            const Id unaligned_addr{OpBitcast(U64, OpLoad(U32[2], ssbo_addr_pointer))};
-            const Id ssbo_addr{OpBitwiseAnd(U64, unaligned_addr, Constant(U64, ssbo_align_mask))};
+            const Id ssbo_addr{OpBitcast(U64, OpLoad(U32[2], ssbo_addr_pointer))};
            const Id ssbo_size{OpUConvert(U64, OpLoad(U32[1], ssbo_size_pointer))};
            const Id ssbo_end{OpIAdd(U64, ssbo_addr, ssbo_size)};
            const Id cond{OpLogicalAnd(U1, OpUGreaterThanEqual(U1, addr, ssbo_addr),
--- a/src/shader_recompiler/frontend/maxwell/translate_program.cpp
+++ b/src/shader_recompiler/frontend/maxwell/translate_program.cpp
@@ -298,7 +298,7 @@ IR::Program TranslateProgram(ObjectPool<IR::Inst>& inst_pool, ObjectPool<IR::Blo

    Optimization::PositionPass(env, program);

-    Optimization::GlobalMemoryToStorageBufferPass(program, host_info);
+    Optimization::GlobalMemoryToStorageBufferPass(program);
    Optimization::TexturePass(env, program, host_info);

    if (Settings::values.resolution_info.active) {
--- a/src/shader_recompiler/host_translate_info.h
+++ b/src/shader_recompiler/host_translate_info.h
@@ -16,7 +16,6 @@ struct HostTranslateInfo {
    bool needs_demote_reorder{}; ///< True when the device needs DemoteToHelperInvocation reordered
    bool support_snorm_render_buffer{};  ///< True when the device supports SNORM render buffers
    bool support_viewport_index_layer{}; ///< True when the device supports gl_Layer in VS
-    u32 min_ssbo_alignment{};            ///< Minimum alignment supported by the device for SSBOs
    bool support_geometry_shader_passthrough{}; ///< True when the device supports geometry
                                                ///< passthrough shaders
    bool support_conditional_barrier{}; ///< True when the device supports barriers in conditional
--- a/src/shader_recompiler/ir_opt/global_memory_to_storage_buffer_pass.cpp
+++ b/src/shader_recompiler/ir_opt/global_memory_to_storage_buffer_pass.cpp
@@ -11,7 +11,6 @@
 #include "shader_recompiler/frontend/ir/breadth_first_search.h"
 #include "shader_recompiler/frontend/ir/ir_emitter.h"
 #include "shader_recompiler/frontend/ir/value.h"
-#include "shader_recompiler/host_translate_info.h"
 #include "shader_recompiler/ir_opt/passes.h"

 namespace Shader::Optimization {
@@ -409,7 +408,7 @@ void CollectStorageBuffers(IR::Block& block, IR::Inst& inst, StorageInfo& info)
 }

 /// Returns the offset in indices (not bytes) for an equivalent storage instruction
-IR::U32 StorageOffset(IR::Block& block, IR::Inst& inst, StorageBufferAddr buffer, u32 alignment) {
+IR::U32 StorageOffset(IR::Block& block, IR::Inst& inst, StorageBufferAddr buffer) {
    IR::IREmitter ir{block, IR::Block::InstructionList::s_iterator_to(inst)};
    IR::U32 offset;
    if (const std::optional<LowAddrInfo> low_addr{TrackLowAddress(&inst)}) {
@@ -422,10 +421,7 @@ IR::U32 StorageOffset(IR::Block& block, IR::Inst& inst, StorageBufferAddr buffer
    }
    // Subtract the least significant 32 bits from the guest offset. The result is the storage
    // buffer offset in bytes.
-    IR::U32 low_cbuf{ir.GetCbuf(ir.Imm32(buffer.index), ir.Imm32(buffer.offset))};
-
-    // Align the offset base to match the host alignment requirements
-    low_cbuf = ir.BitwiseAnd(low_cbuf, ir.Imm32(~(alignment - 1U)));
+    const IR::U32 low_cbuf{ir.GetCbuf(ir.Imm32(buffer.index), ir.Imm32(buffer.offset))};
    return ir.ISub(offset, low_cbuf);
 }

@@ -520,7 +516,7 @@ void Replace(IR::Block& block, IR::Inst& inst, const IR::U32& storage_index,
 }
 } // Anonymous namespace

-void GlobalMemoryToStorageBufferPass(IR::Program& program, const HostTranslateInfo& host_info) {
+void GlobalMemoryToStorageBufferPass(IR::Program& program) {
    StorageInfo info;
    for (IR::Block* const block : program.post_order_blocks) {
        for (IR::Inst& inst : block->Instructions()) {
@@ -544,8 +540,7 @@ void GlobalMemoryToStorageBufferPass(IR::Program& program, const HostTranslateIn
        const IR::U32 index{IR::Value{static_cast<u32>(info.set.index_of(it))}};
        IR::Block* const block{storage_inst.block};
        IR::Inst* const inst{storage_inst.inst};
-        const IR::U32 offset{
-            StorageOffset(*block, *inst, storage_buffer, host_info.min_ssbo_alignment)};
+        const IR::U32 offset{StorageOffset(*block, *inst, storage_buffer)};
        Replace(*block, *inst, index, offset);
    }
 }
--- a/src/shader_recompiler/ir_opt/passes.h
+++ b/src/shader_recompiler/ir_opt/passes.h
@@ -16,7 +16,7 @@ void CollectShaderInfoPass(Environment& env, IR::Program& program);
 void ConditionalBarrierPass(IR::Program& program);
 void ConstantPropagationPass(Environment& env, IR::Program& program);
 void DeadCodeEliminationPass(IR::Program& program);
-void GlobalMemoryToStorageBufferPass(IR::Program& program, const HostTranslateInfo& host_info);
+void GlobalMemoryToStorageBufferPass(IR::Program& program);
 void IdentityRemovalPass(IR::Program& program);
 void LowerFp64ToFp32(IR::Program& program);
 void LowerFp16ToFp32(IR::Program& program);
--- a/src/shader_recompiler/profile.h
+++ b/src/shader_recompiler/profile.h
@@ -85,8 +85,6 @@ struct Profile {

    /// Maxwell and earlier nVidia architectures have broken robust support
    bool has_broken_robust{};
-
-    u64 min_ssbo_alignment{};
 };

 } // namespace Shader
--- a/src/video_core/buffer_cache/buffer_cache.h
+++ b/src/video_core/buffer_cache/buffer_cache.h
@@ -1753,25 +1753,15 @@ Binding BufferCache<P>::StorageBufferBinding(GPUVAddr ssbo_addr, u32 cbuf_index,
        const u32 memory_layout_size = static_cast<u32>(gpu_memory->GetMemoryLayoutSize(gpu_addr));
        return std::min(memory_layout_size, static_cast<u32>(8_MiB));
    }();
-    // Alignment only applies to the offset of the buffer
-    const u32 alignment = runtime.GetStorageBufferAlignment();
-    const GPUVAddr aligned_gpu_addr = Common::AlignDown(gpu_addr, alignment);
-    const u32 aligned_size = static_cast<u32>(gpu_addr - aligned_gpu_addr) + size;
-
-    const std::optional<VAddr> aligned_cpu_addr = gpu_memory->GpuToCpuAddress(aligned_gpu_addr);
-    if (!aligned_cpu_addr || size == 0) {
+    const std::optional<VAddr> cpu_addr = gpu_memory->GpuToCpuAddress(gpu_addr);
+    if (!cpu_addr || size == 0) {
        LOG_WARNING(HW_GPU, "Failed to find storage buffer for cbuf index {}", cbuf_index);
        return NULL_BINDING;
    }
-    const std::optional<VAddr> cpu_addr = gpu_memory->GpuToCpuAddress(gpu_addr);
-    ASSERT_MSG(cpu_addr, "Unaligned storage buffer address not found for cbuf index {}",
-               cbuf_index);
-    // The end address used for size calculation does not need to be aligned
-    const VAddr cpu_end = Common::AlignUp(*cpu_addr + size, Core::Memory::YUZU_PAGESIZE);
-
+    const VAddr cpu_end = Common::AlignUp(*cpu_addr + size, YUZU_PAGESIZE);
    const Binding binding{
-        .cpu_addr = *aligned_cpu_addr,
-        .size = is_written ? aligned_size : static_cast<u32>(cpu_end - *aligned_cpu_addr),
+        .cpu_addr = *cpu_addr,
+        .size = is_written ? size : static_cast<u32>(cpu_end - *cpu_addr),
        .buffer_id = BufferId{},
    };
    return binding;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
yuzubot	63a1f6bc63	Android #140	2023-11-24 00:57:08 +00:00
yuzubot	8d65fb6c74	Merge PR 12142	2023-11-24 00:57:08 +00:00
yuzubot	24b2842914	Merge PR 12140	2023-11-24 00:57:08 +00:00
yuzubot	5e59b0b5e0	Merge PR 12110	2023-11-24 00:57:08 +00:00
yuzubot	bffd64d293	Merge PR 12074	2023-11-24 00:57:08 +00:00
yuzubot	c9be49a9c6	Merge PR 11535	2023-11-24 00:57:08 +00:00