cheats: Use global cheat engine

.ci/pack.sh

@@ -7,6 +7,13 @@ REV_NAME="citra-${OS}-${TARGET}-${GITDATE}-${GITREV}"
 # Find out what release we are building
 if [[ "$GITHUB_REF_NAME" =~ ^canary- ]] || [[ "$GITHUB_REF_NAME" =~ ^nightly- ]]; then
     RELEASE_NAME=$(echo $GITHUB_REF_NAME | cut -d- -f1)
+    # For compatibility with existing installs, use mingw/osx in the archive and target names.
+    if [ "$TARGET" = "msys2" ]; then
+        REV_NAME="citra-${OS}-mingw-${GITDATE}-${GITREV}"
+        RELEASE_NAME="${RELEASE_NAME}-mingw"
+    elif [ "$OS" = "macos" ]; then
+        REV_NAME="citra-osx-${TARGET}-${GITDATE}-${GITREV}"
+    fi
 else
     RELEASE_NAME=head
 fi

.github/workflows/ci-merge.js

@@ -11,7 +11,7 @@ async function checkBaseChanges(github, context) {
         repository(name:$name, owner:$owner) {
             ref(qualifiedName:$ref) {
                 target {
-                    ... on Commit { id committedDate oid }
+                    ... on Commit { id pushedDate oid }
                 }
             }
         }
@@ -22,9 +22,9 @@ async function checkBaseChanges(github, context) {
         ref: 'refs/heads/master',
     };
     const result = await github.graphql(query, variables);
-    const committedAt = result.repository.ref.target.committedDate;
-    console.log(`Last commit committed at ${committedAt}.`);
-    const delta = new Date() - new Date(committedAt);
+    const pushedAt = result.repository.ref.target.pushedDate;
+    console.log(`Last commit pushed at ${pushedAt}.`);
+    const delta = new Date() - new Date(pushedAt);
     if (delta <= DETECTION_TIME_FRAME) {
         console.info('New changes detected, triggering a new build.');
         return true;

.github/workflows/ci.yml

@@ -158,24 +158,12 @@ jobs:
           key: ${{ runner.os }}-${{ matrix.target }}-${{ github.sha }}
           restore-keys: |
             ${{ runner.os }}-${{ matrix.target }}-
-      - name: Increase Pagefile size
-        uses: al-cheb/configure-pagefile-action@v1.2
-        with:
-          minimum-size: 2GB
-          maximum-size: 6GB
       - name: Set up MSVC
         uses: ilammy/msvc-dev-cmd@v1
         if: ${{ matrix.target == 'msvc' }}
-      - name: Install extra tools (MSVC)
+      - name: Install MSVC extra tools
         run: choco install ccache ninja wget
         if: ${{ matrix.target == 'msvc' }}
-      - name: Set up Vulkan SDK (MSVC)
-        uses: humbletim/setup-vulkan-sdk@v1.2.0
-        if: ${{ matrix.target == 'msvc' }}
-        with:
-          vulkan-query-version: latest
-          vulkan-components: Glslang
-          vulkan-use-cache: true
       - name: Set up MSYS2
         uses: msys2/setup-msys2@v2
         if: ${{ matrix.target == 'msys2' }}
@@ -184,10 +172,16 @@ jobs:
           update: true
           install: git make p7zip
           pacboy: >-
-            toolchain:p ccache:p cmake:p ninja:p glslang:p
+            toolchain:p ccache:p cmake:p ninja:p
             qt6-base:p qt6-multimedia:p qt6-multimedia-wmf:p qt6-tools:p qt6-translations:p
-      - name: Test glslang
-        run: glslang --version || glslangValidator --version
+      - name: Setup Vulkan SDK
+        uses: humbletim/setup-vulkan-sdk@v1.2.0
+        with:
+          vulkan-query-version: latest
+          vulkan-components: Glslang
+          vulkan-use-cache: true
+      - name: Test glslangValidator
+        run: glslangValidator --version
       - name: Disable line ending translation
         run: git config --global core.autocrlf input
       - name: Build

.gitignore

@@ -9,12 +9,10 @@ src/common/scm_rev.cpp
 
 # Project/editor files
 *.swp
-*.kdev4
 .idea/
 .vs/
 .vscode/
 .cache/
-.kdev4/
 cmake-build-debug/
 cmake-build-release/
 CMakeLists.txt.user*

.gitmodules

@@ -82,6 +82,3 @@
 [submodule "library-headers"]
     path = externals/library-headers/library-headers
     url = https://github.com/citra-emu/ext-library-headers.git
-[submodule "libadrenotools"]
-    path = externals/libadrenotools
-    url = https://github.com/bylaws/libadrenotools

CMakeLists.txt

@@ -40,10 +40,8 @@ endif()
 
 if (CMAKE_BUILD_TYPE STREQUAL Debug)
     set(IS_DEBUG_BUILD ON)
-    set(IS_RELEASE_BUILD OFF)
 else()
     set(IS_DEBUG_BUILD OFF)
-    set(IS_RELEASE_BUILD ON)
 endif()
 
 option(ENABLE_SDL2 "Enable using SDL2" ON)
@@ -59,7 +57,6 @@ CMAKE_DEPENDENT_OPTION(ENABLE_TESTS "Enable generating tests executable" ON "NOT
 CMAKE_DEPENDENT_OPTION(ENABLE_DEDICATED_ROOM "Enable generating dedicated room executable" ON "NOT ANDROID AND NOT IOS" OFF)
 
 option(ENABLE_WEB_SERVICE "Enable web services (telemetry, etc.)" ON)
-option(ENABLE_SCRIPTING "Enable RPC server for scripting" ON)
 
 CMAKE_DEPENDENT_OPTION(ENABLE_CUBEB "Enables the cubeb audio backend" ON "NOT IOS" OFF)
 option(ENABLE_OPENAL "Enables the OpenAL audio backend" ON)
@@ -71,11 +68,9 @@ option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF)
 CMAKE_DEPENDENT_OPTION(ENABLE_MF "Use Media Foundation decoder (preferred over FFmpeg)" ON "WIN32" OFF)
 CMAKE_DEPENDENT_OPTION(ENABLE_AUDIOTOOLBOX "Use AudioToolbox decoder (preferred over FFmpeg)" ON "APPLE" OFF)
 
-CMAKE_DEPENDENT_OPTION(CITRA_ENABLE_BUNDLE_TARGET "Enable the distribution bundling target." ON "NOT ANDROID AND NOT IOS" OFF)
-
 # Compile options
 CMAKE_DEPENDENT_OPTION(COMPILE_WITH_DWARF "Add DWARF debugging information" ${IS_DEBUG_BUILD} "MINGW" OFF)
-option(ENABLE_LTO "Enable link time optimization" ${IS_RELEASE_BUILD})
+option(ENABLE_LTO "Enable link time optimization" OFF)
 option(CITRA_USE_PRECOMPILED_HEADERS "Use precompiled headers" ON)
 option(CITRA_WARNINGS_AS_ERRORS "Enable warnings as errors" ON)
 
@@ -224,7 +219,7 @@ find_package(Threads REQUIRED)
 
 if (ENABLE_QT)
     if (NOT USE_SYSTEM_QT)
-        download_qt(6.5.1)
+        download_qt(6.5.0)
     endif()
 
     find_package(Qt6 REQUIRED COMPONENTS Widgets Multimedia Concurrent)
@@ -346,6 +341,13 @@ function(get_timestamp _var)
     set(${_var} "${timestamp}" PARENT_SCOPE)
 endfunction()
 
+# Prevent boost from linking against libs when building
+add_definitions(-DBOOST_ERROR_CODE_HEADER_ONLY
+    -DBOOST_SYSTEM_NO_LIB
+    -DBOOST_DATE_TIME_NO_LIB
+    -DBOOST_REGEX_NO_LIB
+)
+
 # generate git/build information
 include(GetGitRevisionDescription)
 get_git_head_revision(GIT_REF_SPEC GIT_REV)
@@ -353,23 +355,17 @@ git_describe(GIT_DESC --always --long --dirty)
 git_branch_name(GIT_BRANCH)
 get_timestamp(BUILD_DATE)
 
-# Boost
-# Prevent boost from linking against libs when building
-add_definitions(-DBOOST_ERROR_CODE_HEADER_ONLY
-    -DBOOST_SYSTEM_NO_LIB
-    -DBOOST_DATE_TIME_NO_LIB
-    -DBOOST_REGEX_NO_LIB
-)
-if (USE_SYSTEM_BOOST)
-    find_package(Boost 1.70.0 COMPONENTS container locale serialization iostreams REQUIRED)
+if (NOT USE_SYSTEM_BOOST)
+    add_definitions( -DBOOST_ALL_NO_LIB )
 endif()
 
 enable_testing()
 add_subdirectory(externals)
 
-# Boost (bundled)
-if (NOT USE_SYSTEM_BOOST)
-    add_definitions( -DBOOST_ALL_NO_LIB )
+# Boost
+if (USE_SYSTEM_BOOST)
+    find_package(Boost 1.70.0 COMPONENTS serialization iostreams REQUIRED)
+else()
     add_library(Boost::boost ALIAS boost)
     add_library(Boost::serialization ALIAS boost_serialization)
     add_library(Boost::iostreams ALIAS boost_iostreams)
@@ -401,7 +397,7 @@ else()
 endif()
 
 # Create target for outputting distributable bundles.
-if (CITRA_ENABLE_BUNDLE_TARGET)
+if (NOT ANDROID AND NOT IOS)
     include(BundleTarget)
     if (ENABLE_SDL2_FRONTEND)
         bundle_target(citra)

CMakeModules/BuildInstaller.cmake

@@ -1,5 +1,4 @@
 # To use this as a script, make sure you pass in the variables BASE_DIR, SRC_DIR, BUILD_DIR, and TARGET_FILE
-cmake_minimum_required(VERSION 3.15)
 
 if(WIN32)
     set(PLATFORM "windows")
@@ -13,8 +12,7 @@ endif()
 
 list(APPEND CMAKE_MODULE_PATH "${BASE_DIR}/CMakeModules")
 include(DownloadExternals)
-download_qt(tools_ifw)
-get_external_prefix(qt QT_PREFIX)
+download_qt(tools_ifw QT_PREFIX)
 
 file(GLOB_RECURSE INSTALLER_BASE "${QT_PREFIX}/**/installerbase*")
 file(GLOB_RECURSE BINARY_CREATOR "${QT_PREFIX}/**/binarycreator*")

CMakeModules/BundleTarget.cmake

@@ -189,12 +189,6 @@ else()
             add_custom_command(
                 TARGET bundle
                 COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/bundle/")
-            add_custom_command(
-                TARGET bundle
-                COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/bundle/dist/")
-            add_custom_command(
-                TARGET bundle
-                COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/dist/icon.png" "${CMAKE_BINARY_DIR}/bundle/dist/citra.png")
             add_custom_command(
                 TARGET bundle
                 COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/license.txt" "${CMAKE_BINARY_DIR}/bundle/")

CMakeModules/DownloadExternals.cmake

@@ -1,19 +1,13 @@
 
-# This function downloads Qt using aqt. The path of the downloaded content will be added to the CMAKE_PREFIX_PATH.
+# This function downloads Qt using aqt.
 # Params:
 #   target: Qt dependency to install. Specify a version number to download Qt, or "tools_(name)" for a specific build tool.
+#   prefix_var: Name of a variable which will be set with the path to the extracted contents.
 function(download_qt target)
-    if (target MATCHES "tools_.*")
-        set(DOWNLOAD_QT_TOOL ON)
-    else()
-        set(DOWNLOAD_QT_TOOL OFF)
-    endif()
-
     # Determine installation parameters for OS, architecture, and compiler
     if (WIN32)
         set(host "windows")
         set(type "desktop")
-        if (NOT DOWNLOAD_QT_TOOL)
         if (MINGW)
             set(arch "win64_mingw")
             set(arch_path "mingw_64")
@@ -29,10 +23,9 @@ function(download_qt target)
         else()
             message(FATAL_ERROR "Unsupported bundled Qt toolchain. Enable USE_SYSTEM_QT and provide your own.")
         endif()
-        endif()
     elseif (APPLE)
         set(host "mac")
-        if (IOS AND NOT DOWNLOAD_QT_TOOL)
+        if (IOS)
             set(type "ios")
             set(arch "ios")
             set(arch_path "ios")
@@ -52,8 +45,8 @@ function(download_qt target)
     get_external_prefix(qt base_path)
     file(MAKE_DIRECTORY "${base_path}")
 
-    if (DOWNLOAD_QT_TOOL)
-        set(prefix "${base_path}/Tools")
+    if (target MATCHES "tools_.*")
+        set(prefix "${base_path}")
         set(install_args install-tool --outputdir ${base_path} ${host} desktop ${target})
     else()
         set(prefix "${base_path}/${target}/${arch_path}")
@@ -61,8 +54,7 @@ function(download_qt target)
             set(host_flag "--autodesktop")
             set(host_prefix "${base_path}/${target}/${host_arch_path}")
         endif()
-        set(install_args install-qt --outputdir ${base_path} ${host} ${type} ${target} ${arch} ${host_flag}
-                                    -m qtmultimedia --archives qttranslations qttools qtsvg qtbase)
+        set(install_args install-qt --outputdir ${base_path} ${host} ${type} ${target} ${arch} ${host_flag} -m qtmultimedia)
     endif()
 
     if (NOT EXISTS "${prefix}")
@@ -70,7 +62,7 @@ function(download_qt target)
         if (WIN32)
             set(aqt_path "${base_path}/aqt.exe")
             file(DOWNLOAD
-                https://github.com/miurahr/aqtinstall/releases/download/v3.1.7/aqt.exe
+                https://github.com/miurahr/aqtinstall/releases/download/v3.1.4/aqt.exe
                 ${aqt_path} SHOW_PROGRESS)
             execute_process(COMMAND ${aqt_path} ${install_args}
                     WORKING_DIRECTORY ${base_path})

CMakeModules/GenerateBuildInfo.cmake

@@ -57,6 +57,8 @@ if (DEFINED ENV{CI})
             set(BUILD_VERSION ${CMAKE_MATCH_1})
         endif()
         if (BUILD_VERSION)
+            # This leaves a trailing space on the last word, but we actually want that
+            # because of how it's styled in the title bar.
             set(BUILD_FULLNAME "${REPO_NAME} ${BUILD_VERSION} ")
         else()
             set(BUILD_FULLNAME "")

CMakeModules/GenerateSCMRev.cmake

@@ -12,16 +12,8 @@ set(HASH_FILES
     "${VIDEO_CORE}/renderer_opengl/gl_shader_gen.h"
     "${VIDEO_CORE}/renderer_opengl/gl_shader_util.cpp"
     "${VIDEO_CORE}/renderer_opengl/gl_shader_util.h"
-    "${VIDEO_CORE}/renderer_vulkan/vk_shader_gen.cpp"
-    "${VIDEO_CORE}/renderer_vulkan/vk_shader_gen.h"
-    "${VIDEO_CORE}/renderer_vulkan/vk_shader_gen_spv.cpp"
-    "${VIDEO_CORE}/renderer_vulkan/vk_shader_gen_spv.h"
-    "${VIDEO_CORE}/renderer_vulkan/vk_shader_util.cpp"
-    "${VIDEO_CORE}/renderer_vulkan/vk_shader_util.h"
     "${VIDEO_CORE}/shader/shader.cpp"
     "${VIDEO_CORE}/shader/shader.h"
-    "${VIDEO_CORE}/shader/shader_uniforms.cpp"
-    "${VIDEO_CORE}/shader/shader_uniforms.h"
     "${VIDEO_CORE}/pica.cpp"
     "${VIDEO_CORE}/pica.h"
     "${VIDEO_CORE}/regs_framebuffer.h"

dist/installer/CMakeLists.txt

@@ -13,8 +13,6 @@ set(BUILD_DIR "${CMAKE_BINARY_DIR}/installer")
 set(DIST_DIR "${BUILD_DIR}/dist")
 set(TARGET_FILE "${DIST_DIR}/citra-setup-${PLATFORM}")
 
-file(MAKE_DIRECTORY "${BUILD_DIR}" "${DIST_DIR}")
-
 # Adds a custom target that will run the BuildInstaller.cmake file
 # CMake can't just run a cmake function as a custom command, so this is a way around it.
 # Calls the cmake command and runs a cmake file in "scripting" mode passing in variables with -D

dist/qt_themes/default/style.qss

@@ -26,8 +26,3 @@ QPushButton#3DOptionStatusBarButton {
 QPushButton#3DOptionStatusBarButton:hover {
     border: 1px solid #76797C;
 }
-
-QPushButton#button_reset_defaults {
-    min-width: 57px;
-    padding: 4px 8px;
-}

dist/qt_themes/qdarkstyle/style.qss

@@ -298,11 +298,6 @@ QAbstractItemView:read-only {
     alternate-background-color: #232629;
 }
 
-/* Workaround for https://bugreports.qt.io/browse/QTBUG-115529 */
-QAbstractItemView:item {
-    border: 0px;
-}
-
 QWidget:focus {
     border: 1px solid #3daee9;
 }

dist/qt_themes/qdarkstyle_midnight_blue/style.qss

@@ -481,11 +481,6 @@ QAbstractItemView QLineEdit {
   padding: 2px;
 }
 
-/* Workaround for https://bugreports.qt.io/browse/QTBUG-115529 */
-QAbstractItemView:item {
-    border: 0px;
-}
-
 /* QAbstractScrollArea ----------------------------------------------------
 
 https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qabstractscrollarea
@@ -1072,10 +1067,6 @@ QPushButton:focus {
   border: 1px solid #1464A0;
 }
 
-QPushButton#button_reset_defaults {
-    padding: 3px 6px;
-}
-
 /* QToolButton ------------------------------------------------------------
 
 https://doc.qt.io/qt-5/stylesheet-examples.html#customizing-qtoolbutton

externals/CMakeLists.txt

@@ -12,8 +12,6 @@ include(DownloadExternals)
 include(ExternalProject)
 
 # Boost
-if (NOT USE_SYSTEM_BOOST)
-    message(STATUS "Including vendored Boost library")
 set(BOOST_ROOT "${CMAKE_SOURCE_DIR}/externals/boost" CACHE STRING "")
 set(Boost_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/externals/boost" CACHE STRING "")
 set(Boost_NO_SYSTEM_PATHS ON CACHE BOOL "")
@@ -33,8 +31,8 @@ if (NOT USE_SYSTEM_BOOST)
     ${CMAKE_SOURCE_DIR}/externals/boost/libs/iostreams/src/mapped_file.cpp
 )
 target_link_libraries(boost_iostreams PUBLIC boost)
+
 # Add additional boost libs here; remember to ALIAS them in the root CMakeLists!
-endif()
 
 # Catch2
 set(CATCH_INSTALL_DOCS OFF CACHE BOOL "")
@@ -97,7 +95,6 @@ set(ENABLE_GLSLANG_BINARIES OFF CACHE BOOL "")
 set(ENABLE_SPVREMAPPER OFF CACHE BOOL "")
 set(ENABLE_CTEST OFF CACHE BOOL "")
 set(ENABLE_HLSL OFF CACHE BOOL "")
-set(BUILD_EXTERNAL OFF CACHE BOOL "")
 add_subdirectory(glslang)
 
 # inih
@@ -174,7 +171,7 @@ endif()
 add_library(json-headers INTERFACE)
 target_include_directories(json-headers INTERFACE ./json)
 
-# OpenSSL
+if (ENABLE_WEB_SERVICE)
     if (USE_SYSTEM_OPENSSL)
         find_package(OpenSSL 1.1)
         if (OPENSSL_FOUND)
@@ -194,19 +191,17 @@ if (NOT OPENSSL_FOUND)
             DEFINITION OPENSSL_LIBS)
     endif()
 
+    if(ANDROID)
+        add_subdirectory(android-ifaddrs)
+    endif()
+
     # httplib
     add_library(httplib INTERFACE)
     target_include_directories(httplib INTERFACE ./httplib)
     target_compile_options(httplib INTERFACE -DCPPHTTPLIB_OPENSSL_SUPPORT)
     target_link_libraries(httplib INTERFACE ${OPENSSL_LIBRARIES})
 
-if(ANDROID)
-    add_subdirectory(android-ifaddrs)
-    target_link_libraries(httplib INTERFACE ifaddrs)
-endif()
-
     # cpp-jwt
-if (ENABLE_WEB_SERVICE)
     add_library(cpp-jwt INTERFACE)
     target_include_directories(cpp-jwt INTERFACE ./cpp-jwt/include)
     target_compile_definitions(cpp-jwt INTERFACE CPP_JWT_USE_VENDORED_NLOHMANN_JSON)
@@ -242,11 +237,3 @@ target_include_directories(vma SYSTEM INTERFACE ./vma/include)
 # vulkan-headers
 add_library(vulkan-headers INTERFACE)
 target_include_directories(vulkan-headers SYSTEM INTERFACE ./vulkan-headers/include)
-if (APPLE)
-    target_include_directories(vulkan-headers SYSTEM INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/MoltenVK)
-endif()
-
-# adrenotools
-if (ANDROID)
-    add_subdirectory(libadrenotools)
-endif()

externals/glad/include/glad/glad.h

@@ -1,32 +1,28 @@
 /*
 
-    OpenGL, OpenGL ES loader generated by glad 0.1.34 on Sat Aug 26 18:38:43 2023.
+    OpenGL, OpenGL ES loader generated by glad 0.1.36 on Sat Apr  1 20:34:42 2023.
 
     Language/Generator: C/C++
     Specification: gl
     APIs: gl=4.3, gles2=3.2
     Profile: core
     Extensions:
-        GL_AMD_blend_minmax_factor,
         GL_ARB_buffer_storage,
         GL_ARB_clear_texture,
         GL_ARB_get_texture_sub_image,
         GL_ARB_texture_compression_bptc,
-        GL_ARM_shader_framebuffer_fetch,
         GL_EXT_buffer_storage,
         GL_EXT_clip_cull_distance,
-        GL_EXT_shader_framebuffer_fetch,
-        GL_EXT_texture_compression_s3tc,
-        GL_NV_blend_minmax_factor
+        GL_EXT_texture_compression_s3tc
     Loader: True
     Local files: False
     Omit khrplatform: False
     Reproducible: False
 
     Commandline:
-        --profile="core" --api="gl=4.3,gles2=3.2" --generator="c" --spec="gl" --extensions="GL_AMD_blend_minmax_factor,GL_ARB_buffer_storage,GL_ARB_clear_texture,GL_ARB_get_texture_sub_image,GL_ARB_texture_compression_bptc,GL_ARM_shader_framebuffer_fetch,GL_EXT_buffer_storage,GL_EXT_clip_cull_distance,GL_EXT_shader_framebuffer_fetch,GL_EXT_texture_compression_s3tc,GL_NV_blend_minmax_factor"
+        --profile="core" --api="gl=4.3,gles2=3.2" --generator="c" --spec="gl" --extensions="GL_ARB_buffer_storage,GL_ARB_clear_texture,GL_ARB_get_texture_sub_image,GL_ARB_texture_compression_bptc,GL_EXT_buffer_storage,GL_EXT_clip_cull_distance,GL_EXT_texture_compression_s3tc"
     Online:
-        https://glad.dav1d.de/#profile=core&language=c&specification=gl&loader=on&api=gl%3D4.3&api=gles2%3D3.2&extensions=GL_AMD_blend_minmax_factor&extensions=GL_ARB_buffer_storage&extensions=GL_ARB_clear_texture&extensions=GL_ARB_get_texture_sub_image&extensions=GL_ARB_texture_compression_bptc&extensions=GL_ARM_shader_framebuffer_fetch&extensions=GL_EXT_buffer_storage&extensions=GL_EXT_clip_cull_distance&extensions=GL_EXT_shader_framebuffer_fetch&extensions=GL_EXT_texture_compression_s3tc&extensions=GL_NV_blend_minmax_factor
+        https://glad.dav1d.de/#profile=core&language=c&specification=gl&loader=on&api=gl%3D4.3&api=gles2%3D3.2&extensions=GL_ARB_buffer_storage&extensions=GL_ARB_clear_texture&extensions=GL_ARB_get_texture_sub_image&extensions=GL_ARB_texture_compression_bptc&extensions=GL_EXT_buffer_storage&extensions=GL_EXT_clip_cull_distance&extensions=GL_EXT_texture_compression_s3tc
 */
 
 
@@ -3324,8 +3320,6 @@ typedef void (APIENTRYP PFNGLGETNUNIFORMUIVPROC)(GLuint program, GLint location,
 GLAPI PFNGLGETNUNIFORMUIVPROC glad_glGetnUniformuiv;
 #define glGetnUniformuiv glad_glGetnUniformuiv
 #endif
-#define GL_FACTOR_MIN_AMD 0x901C
-#define GL_FACTOR_MAX_AMD 0x901D
 #define GL_MAP_PERSISTENT_BIT 0x0040
 #define GL_MAP_COHERENT_BIT 0x0080
 #define GL_DYNAMIC_STORAGE_BIT 0x0100
@@ -3338,13 +3332,10 @@ GLAPI PFNGLGETNUNIFORMUIVPROC glad_glGetnUniformuiv;
 #define GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_ARB 0x8E8D
 #define GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_ARB 0x8E8E
 #define GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB 0x8E8F
-#define GL_FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT 0x8A52
 #define GL_COMPRESSED_RGB_S3TC_DXT1_EXT 0x83F0
 #define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT 0x83F1
 #define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT 0x83F2
 #define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT 0x83F3
-#define GL_FETCH_PER_SAMPLE_ARM 0x8F65
-#define GL_FRAGMENT_SHADER_FRAMEBUFFER_FETCH_MRT_ARM 0x8F66
 #define GL_MAP_PERSISTENT_BIT_EXT 0x0040
 #define GL_MAP_COHERENT_BIT_EXT 0x0080
 #define GL_DYNAMIC_STORAGE_BIT_EXT 0x0100
@@ -3363,10 +3354,6 @@ GLAPI PFNGLGETNUNIFORMUIVPROC glad_glGetnUniformuiv;
 #define GL_CLIP_DISTANCE5_EXT 0x3005
 #define GL_CLIP_DISTANCE6_EXT 0x3006
 #define GL_CLIP_DISTANCE7_EXT 0x3007
-#ifndef GL_AMD_blend_minmax_factor
-#define GL_AMD_blend_minmax_factor 1
-GLAPI int GLAD_GL_AMD_blend_minmax_factor;
-#endif
 #ifndef GL_ARB_buffer_storage
 #define GL_ARB_buffer_storage 1
 GLAPI int GLAD_GL_ARB_buffer_storage;
@@ -3398,22 +3385,10 @@ GLAPI PFNGLGETCOMPRESSEDTEXTURESUBIMAGEPROC glad_glGetCompressedTextureSubImage;
 #define GL_ARB_texture_compression_bptc 1
 GLAPI int GLAD_GL_ARB_texture_compression_bptc;
 #endif
-#ifndef GL_EXT_shader_framebuffer_fetch
-#define GL_EXT_shader_framebuffer_fetch 1
-GLAPI int GLAD_GL_EXT_shader_framebuffer_fetch;
-#endif
 #ifndef GL_EXT_texture_compression_s3tc
 #define GL_EXT_texture_compression_s3tc 1
 GLAPI int GLAD_GL_EXT_texture_compression_s3tc;
 #endif
-#ifndef GL_NV_blend_minmax_factor
-#define GL_NV_blend_minmax_factor 1
-GLAPI int GLAD_GL_NV_blend_minmax_factor;
-#endif
-#ifndef GL_ARM_shader_framebuffer_fetch
-#define GL_ARM_shader_framebuffer_fetch 1
-GLAPI int GLAD_GL_ARM_shader_framebuffer_fetch;
-#endif
 #ifndef GL_EXT_buffer_storage
 #define GL_EXT_buffer_storage 1
 GLAPI int GLAD_GL_EXT_buffer_storage;
@@ -3425,18 +3400,10 @@ GLAPI PFNGLBUFFERSTORAGEEXTPROC glad_glBufferStorageEXT;
 #define GL_EXT_clip_cull_distance 1
 GLAPI int GLAD_GL_EXT_clip_cull_distance;
 #endif
-#ifndef GL_EXT_shader_framebuffer_fetch
-#define GL_EXT_shader_framebuffer_fetch 1
-GLAPI int GLAD_GL_EXT_shader_framebuffer_fetch;
-#endif
 #ifndef GL_EXT_texture_compression_s3tc
 #define GL_EXT_texture_compression_s3tc 1
 GLAPI int GLAD_GL_EXT_texture_compression_s3tc;
 #endif
-#ifndef GL_NV_blend_minmax_factor
-#define GL_NV_blend_minmax_factor 1
-GLAPI int GLAD_GL_NV_blend_minmax_factor;
-#endif
 
 #ifdef __cplusplus
 }

externals/glad/src/glad.c

@@ -1,32 +1,28 @@
 /*
 
-    OpenGL, OpenGL ES loader generated by glad 0.1.34 on Sat Aug 26 18:38:43 2023.
+    OpenGL, OpenGL ES loader generated by glad 0.1.36 on Sat Apr  1 20:34:42 2023.
 
     Language/Generator: C/C++
     Specification: gl
     APIs: gl=4.3, gles2=3.2
     Profile: core
     Extensions:
-        GL_AMD_blend_minmax_factor,
         GL_ARB_buffer_storage,
         GL_ARB_clear_texture,
         GL_ARB_get_texture_sub_image,
         GL_ARB_texture_compression_bptc,
-        GL_ARM_shader_framebuffer_fetch,
         GL_EXT_buffer_storage,
         GL_EXT_clip_cull_distance,
-        GL_EXT_shader_framebuffer_fetch,
-        GL_EXT_texture_compression_s3tc,
-        GL_NV_blend_minmax_factor
+        GL_EXT_texture_compression_s3tc
     Loader: True
     Local files: False
     Omit khrplatform: False
     Reproducible: False
 
     Commandline:
-        --profile="core" --api="gl=4.3,gles2=3.2" --generator="c" --spec="gl" --extensions="GL_AMD_blend_minmax_factor,GL_ARB_buffer_storage,GL_ARB_clear_texture,GL_ARB_get_texture_sub_image,GL_ARB_texture_compression_bptc,GL_ARM_shader_framebuffer_fetch,GL_EXT_buffer_storage,GL_EXT_clip_cull_distance,GL_EXT_shader_framebuffer_fetch,GL_EXT_texture_compression_s3tc,GL_NV_blend_minmax_factor"
+        --profile="core" --api="gl=4.3,gles2=3.2" --generator="c" --spec="gl" --extensions="GL_ARB_buffer_storage,GL_ARB_clear_texture,GL_ARB_get_texture_sub_image,GL_ARB_texture_compression_bptc,GL_EXT_buffer_storage,GL_EXT_clip_cull_distance,GL_EXT_texture_compression_s3tc"
     Online:
-        https://glad.dav1d.de/#profile=core&language=c&specification=gl&loader=on&api=gl%3D4.3&api=gles2%3D3.2&extensions=GL_AMD_blend_minmax_factor&extensions=GL_ARB_buffer_storage&extensions=GL_ARB_clear_texture&extensions=GL_ARB_get_texture_sub_image&extensions=GL_ARB_texture_compression_bptc&extensions=GL_ARM_shader_framebuffer_fetch&extensions=GL_EXT_buffer_storage&extensions=GL_EXT_clip_cull_distance&extensions=GL_EXT_shader_framebuffer_fetch&extensions=GL_EXT_texture_compression_s3tc&extensions=GL_NV_blend_minmax_factor
+        https://glad.dav1d.de/#profile=core&language=c&specification=gl&loader=on&api=gl%3D4.3&api=gles2%3D3.2&extensions=GL_ARB_buffer_storage&extensions=GL_ARB_clear_texture&extensions=GL_ARB_get_texture_sub_image&extensions=GL_ARB_texture_compression_bptc&extensions=GL_EXT_buffer_storage&extensions=GL_EXT_clip_cull_distance&extensions=GL_EXT_texture_compression_s3tc
 */
 
 #include <stdio.h>
@@ -857,17 +853,13 @@ PFNGLVIEWPORTARRAYVPROC glad_glViewportArrayv = NULL;
 PFNGLVIEWPORTINDEXEDFPROC glad_glViewportIndexedf = NULL;
 PFNGLVIEWPORTINDEXEDFVPROC glad_glViewportIndexedfv = NULL;
 PFNGLWAITSYNCPROC glad_glWaitSync = NULL;
-int GLAD_GL_AMD_blend_minmax_factor = 0;
 int GLAD_GL_ARB_buffer_storage = 0;
 int GLAD_GL_ARB_clear_texture = 0;
 int GLAD_GL_ARB_get_texture_sub_image = 0;
 int GLAD_GL_ARB_texture_compression_bptc = 0;
-int GLAD_GL_ARM_shader_framebuffer_fetch = 0;
 int GLAD_GL_EXT_buffer_storage = 0;
 int GLAD_GL_EXT_clip_cull_distance = 0;
-int GLAD_GL_EXT_shader_framebuffer_fetch = 0;
 int GLAD_GL_EXT_texture_compression_s3tc = 0;
-int GLAD_GL_NV_blend_minmax_factor = 0;
 PFNGLBUFFERSTORAGEPROC glad_glBufferStorage = NULL;
 PFNGLCLEARTEXIMAGEPROC glad_glClearTexImage = NULL;
 PFNGLCLEARTEXSUBIMAGEPROC glad_glClearTexSubImage = NULL;
@@ -1506,14 +1498,11 @@ static void load_GL_ARB_get_texture_sub_image(GLADloadproc load) {
 }
 static int find_extensionsGL(void) {
 	if (!get_exts()) return 0;
-	GLAD_GL_AMD_blend_minmax_factor = has_ext("GL_AMD_blend_minmax_factor");
 	GLAD_GL_ARB_buffer_storage = has_ext("GL_ARB_buffer_storage");
 	GLAD_GL_ARB_clear_texture = has_ext("GL_ARB_clear_texture");
 	GLAD_GL_ARB_get_texture_sub_image = has_ext("GL_ARB_get_texture_sub_image");
 	GLAD_GL_ARB_texture_compression_bptc = has_ext("GL_ARB_texture_compression_bptc");
-	GLAD_GL_EXT_shader_framebuffer_fetch = has_ext("GL_EXT_shader_framebuffer_fetch");
 	GLAD_GL_EXT_texture_compression_s3tc = has_ext("GL_EXT_texture_compression_s3tc");
-	GLAD_GL_NV_blend_minmax_factor = has_ext("GL_NV_blend_minmax_factor");
 	free_exts();
 	return 1;
 }
@@ -1982,12 +1971,9 @@ static void load_GL_EXT_buffer_storage(GLADloadproc load) {
 }
 static int find_extensionsGLES2(void) {
 	if (!get_exts()) return 0;
-	GLAD_GL_ARM_shader_framebuffer_fetch = has_ext("GL_ARM_shader_framebuffer_fetch");
 	GLAD_GL_EXT_buffer_storage = has_ext("GL_EXT_buffer_storage");
 	GLAD_GL_EXT_clip_cull_distance = has_ext("GL_EXT_clip_cull_distance");
-	GLAD_GL_EXT_shader_framebuffer_fetch = has_ext("GL_EXT_shader_framebuffer_fetch");
 	GLAD_GL_EXT_texture_compression_s3tc = has_ext("GL_EXT_texture_compression_s3tc");
-	GLAD_GL_NV_blend_minmax_factor = has_ext("GL_NV_blend_minmax_factor");
 	free_exts();
 	return 1;
 }

src/CMakeLists.txt

@@ -5,10 +5,6 @@ include_directories(.)
 set_property(DIRECTORY APPEND PROPERTY
     COMPILE_DEFINITIONS $<$<CONFIG:Debug>:_DEBUG> $<$<NOT:$<CONFIG:Debug>>:NDEBUG>)
 
-if (ENABLE_LTO)
-    set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
-endif()
-
 # Set compilation flags
 if (MSVC)
     set(CMAKE_CONFIGURATION_TYPES Debug Release CACHE STRING "" FORCE)

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

@@ -29,7 +29,6 @@
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <application
         android:name="org.citra.citra_emu.CitraApplication"

src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.java

@@ -359,8 +359,6 @@ public final class SettingsFragmentPresenter {
 
         SettingSection rendererSection = mSettings.getSection(Settings.SECTION_RENDERER);
         Setting graphicsApi = rendererSection.getSetting(SettingsFile.KEY_GRAPHICS_API);
-        Setting spirvShaderGen = rendererSection.getSetting(SettingsFile.KEY_SPIRV_SHADER_GEN);
-        Setting asyncShaders = rendererSection.getSetting(SettingsFile.KEY_ASYNC_SHADERS);
         Setting resolutionFactor = rendererSection.getSetting(SettingsFile.KEY_RESOLUTION_FACTOR);
         Setting filterMode = rendererSection.getSetting(SettingsFile.KEY_FILTER_MODE);
         Setting shadersAccurateMul = rendererSection.getSetting(SettingsFile.KEY_SHADERS_ACCURATE_MUL);
@@ -379,8 +377,6 @@ public final class SettingsFragmentPresenter {
 
         sl.add(new HeaderSetting(null, null, R.string.renderer, 0));
         sl.add(new SingleChoiceSetting(SettingsFile.KEY_GRAPHICS_API, Settings.SECTION_RENDERER, R.string.graphics_api, 0, R.array.graphicsApiNames, R.array.graphicsApiValues, 0, graphicsApi));
-        sl.add(new CheckBoxSetting(SettingsFile.KEY_SPIRV_SHADER_GEN, Settings.SECTION_RENDERER, R.string.spirv_shader_gen, R.string.spirv_shader_gen_description, true, spirvShaderGen));
-        sl.add(new CheckBoxSetting(SettingsFile.KEY_ASYNC_SHADERS, Settings.SECTION_RENDERER, R.string.async_shaders, R.string.async_shaders_description, false, asyncShaders));
         sl.add(new SliderSetting(SettingsFile.KEY_RESOLUTION_FACTOR, Settings.SECTION_RENDERER, R.string.internal_resolution, R.string.internal_resolution_description, 1, 4, "x", 1, resolutionFactor));
         sl.add(new CheckBoxSetting(SettingsFile.KEY_FILTER_MODE, Settings.SECTION_RENDERER, R.string.linear_filtering, R.string.linear_filtering_description, true, filterMode));
         sl.add(new CheckBoxSetting(SettingsFile.KEY_SHADERS_ACCURATE_MUL, Settings.SECTION_RENDERER, R.string.shaders_accurate_mul, R.string.shaders_accurate_mul_description, false, shadersAccurateMul));
@@ -428,6 +424,6 @@ public final class SettingsFragmentPresenter {
         sl.add(new CheckBoxSetting(SettingsFile.KEY_CPU_JIT, Settings.SECTION_CORE, R.string.cpu_jit, R.string.cpu_jit_description, true, useCpuJit, true, mView));
         sl.add(new CheckBoxSetting(SettingsFile.KEY_HW_SHADER, Settings.SECTION_RENDERER, R.string.hw_shaders, R.string.hw_shaders_description, true, hardwareShader, true, mView));
         sl.add(new CheckBoxSetting(SettingsFile.KEY_USE_VSYNC, Settings.SECTION_RENDERER, R.string.vsync, R.string.vsync_description, true, vsyncEnable));
-        sl.add(new CheckBoxSetting(SettingsFile.KEY_RENDERER_DEBUG, Settings.SECTION_DEBUG, R.string.renderer_debug, R.string.renderer_debug_description, false, rendererDebug));
+        sl.add(new CheckBoxSetting(SettingsFile.KEY_RENDERER_DEBUG, Settings.SECTION_RENDERER, R.string.renderer_debug, R.string.renderer_debug_description, false, rendererDebug));
     }
 }

src/android/app/src/main/java/org/citra/citra_emu/features/settings/utils/SettingsFile.java

@@ -45,8 +45,6 @@ public final class SettingsFile {
     public static final String KEY_PREMIUM = "premium";
 
     public static final String KEY_GRAPHICS_API = "graphics_api";
-    public static final String KEY_SPIRV_SHADER_GEN = "spirv_shader_gen";
-    public static final String KEY_ASYNC_SHADERS = "async_shader_compilation";
     public static final String KEY_RENDERER_DEBUG = "renderer_debug";
     public static final String KEY_HW_SHADER = "use_hw_shader";
     public static final String KEY_SHADERS_ACCURATE_MUL = "shaders_accurate_mul";

src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainActivity.java

@@ -1,10 +1,7 @@
 package org.citra.citra_emu.ui.main;
 
-import android.Manifest;
 import android.content.Intent;
-import android.content.pm.PackageManager;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -16,7 +13,6 @@ import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
-import androidx.core.content.ContextCompat;
 import androidx.core.splashscreen.SplashScreen;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import java.util.Collections;
@@ -128,9 +124,6 @@ public final class MainActivity extends AppCompatActivity implements MainView {
             );
         });
 
-    private final ActivityResultLauncher<String> requestNotificationPermissionLauncher =
-        registerForActivityResult(new ActivityResultContracts.RequestPermission(), isGranted -> { });
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         SplashScreen splashScreen = SplashScreen.installSplashScreen(this);
@@ -172,12 +165,6 @@ public final class MainActivity extends AppCompatActivity implements MainView {
         EmulationActivity.tryDismissRunningNotification(this);
 
         setInsets();
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            if (ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) {
-                requestNotificationPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS);
-            }
-        }
     }
 
     @Override

src/android/app/src/main/java/org/citra/citra_emu/utils/EmulationMenuSettings.java

@@ -13,8 +13,8 @@ public class EmulationMenuSettings {
     public static final int LayoutOption_SingleScreen = 1;
     public static final int LayoutOption_LargeScreen = 2;
     public static final int LayoutOption_SideScreen = 3;
-    public static final int LayoutOption_MobilePortrait = 5;
-    public static final int LayoutOption_MobileLandscape = 6;
+    public static final int LayoutOption_MobilePortrait = 4;
+    public static final int LayoutOption_MobileLandscape = 5;
 
     public static boolean getJoystickRelCenter() {
         return mPreferences.getBoolean("EmulationMenuSettings_JoystickRelCenter", true);

src/android/app/src/main/jni/CMakeLists.txt

@@ -19,10 +19,6 @@ add_library(citra-android SHARED
     default_ini.h
     emu_window/emu_window.cpp
     emu_window/emu_window.h
-    emu_window/emu_window_gl.cpp
-    emu_window/emu_window_gl.h
-    emu_window/emu_window_vk.cpp
-    emu_window/emu_window_vk.h
     game_info.cpp
     game_settings.cpp
     game_settings.h
@@ -34,7 +30,7 @@ add_library(citra-android SHARED
     ndk_motion.h
 )
 
-target_link_libraries(citra-android PRIVATE audio_core citra_common citra_core input_common network adrenotools)
+target_link_libraries(citra-android PRIVATE audio_core citra_common citra_core input_common network)
 target_link_libraries(citra-android PRIVATE android camera2ndk EGL glad inih jnigraphics log mediandk yuv)
 
 set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} citra-android)

src/android/app/src/main/jni/applets/mii_selector.cpp

@@ -53,7 +53,7 @@ void AndroidMiiSelector::Setup(const Frontend::MiiSelectorConfig& config) {
     const u32 return_code = static_cast<u32>(
         env->GetLongField(data, env->GetFieldID(s_mii_selector_data_class, "return_code", "J")));
     if (return_code == 1) {
-        Finalize(return_code, Mii::MiiData{});
+        Finalize(return_code, HLE::Applets::MiiData{});
         return;
     }
 

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

@@ -147,9 +147,6 @@ void Config::ReadValues() {
     Settings::values.shaders_accurate_mul =
         sdl2_config->GetBoolean("Renderer", "shaders_accurate_mul", false);
     ReadSetting("Renderer", Settings::values.graphics_api);
-    ReadSetting("Renderer", Settings::values.async_presentation);
-    ReadSetting("Renderer", Settings::values.async_shader_compilation);
-    ReadSetting("Renderer", Settings::values.spirv_shader_gen);
     ReadSetting("Renderer", Settings::values.use_hw_shader);
     ReadSetting("Renderer", Settings::values.use_shader_jit);
     ReadSetting("Renderer", Settings::values.resolution_factor);

src/android/app/src/main/jni/default_ini.h

@@ -99,17 +99,9 @@ cpu_clock_percentage =
 
 [Renderer]
 # Whether to render using OpenGL
-# 1: OpenGL ES (default), 2: Vulkan
+# 1: OpenGLES (default)
 graphics_api =
 
-# Whether to compile shaders on multiple worker threads (Vulkan only)
-# 0: Off, 1: On (default)
-async_shader_compilation =
-
-# Whether to emit PICA fragment shader using SPIRV or GLSL (Vulkan only)
-# 0: GLSL, 1: SPIR-V (default)
-spirv_shader_gen =
-
 # Whether to use hardware shaders to emulate 3DS shaders
 # 0: Software, 1 (default): Hardware
 use_hw_shader =

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

@@ -6,7 +6,10 @@
 #include <array>
 #include <cstdlib>
 #include <string>
+
 #include <android/native_window_jni.h>
+#include <glad/glad.h>
+
 #include "common/logging/log.h"
 #include "common/settings.h"
 #include "input_common/main.h"
@@ -17,6 +20,52 @@
 #include "video_core/renderer_base.h"
 #include "video_core/video_core.h"
 
+static constexpr std::array<EGLint, 15> egl_attribs{EGL_SURFACE_TYPE,
+                                                    EGL_WINDOW_BIT,
+                                                    EGL_RENDERABLE_TYPE,
+                                                    EGL_OPENGL_ES3_BIT_KHR,
+                                                    EGL_BLUE_SIZE,
+                                                    8,
+                                                    EGL_GREEN_SIZE,
+                                                    8,
+                                                    EGL_RED_SIZE,
+                                                    8,
+                                                    EGL_DEPTH_SIZE,
+                                                    0,
+                                                    EGL_STENCIL_SIZE,
+                                                    0,
+                                                    EGL_NONE};
+static constexpr std::array<EGLint, 5> egl_empty_attribs{EGL_WIDTH, 1, EGL_HEIGHT, 1, EGL_NONE};
+static constexpr std::array<EGLint, 4> egl_context_attribs{EGL_CONTEXT_CLIENT_VERSION, 3, EGL_NONE};
+
+SharedContext_Android::SharedContext_Android(EGLDisplay egl_display, EGLConfig egl_config,
+                                             EGLContext egl_share_context)
+    : egl_display{egl_display}, egl_surface{eglCreatePbufferSurface(egl_display, egl_config,
+                                                                    egl_empty_attribs.data())},
+      egl_context{eglCreateContext(egl_display, egl_config, egl_share_context,
+                                   egl_context_attribs.data())} {
+    ASSERT_MSG(egl_surface, "eglCreatePbufferSurface() failed!");
+    ASSERT_MSG(egl_context, "eglCreateContext() failed!");
+}
+
+SharedContext_Android::~SharedContext_Android() {
+    if (!eglDestroySurface(egl_display, egl_surface)) {
+        LOG_CRITICAL(Frontend, "eglDestroySurface() failed");
+    }
+
+    if (!eglDestroyContext(egl_display, egl_context)) {
+        LOG_CRITICAL(Frontend, "eglDestroySurface() failed");
+    }
+}
+
+void SharedContext_Android::MakeCurrent() {
+    eglMakeCurrent(egl_display, egl_surface, egl_surface, egl_context);
+}
+
+void SharedContext_Android::DoneCurrent() {
+    eglMakeCurrent(egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+}
+
 static bool IsPortraitMode() {
     return JNI_FALSE != IDCache::GetEnvForThread()->CallStaticBooleanMethod(
                             IDCache::GetNativeLibraryClass(), IDCache::GetIsPortraitMode());
@@ -30,12 +79,7 @@ static void UpdateLandscapeScreenLayout() {
 
 void EmuWindow_Android::OnSurfaceChanged(ANativeWindow* surface) {
     render_window = surface;
-
-    window_info.type = Frontend::WindowSystemType::Android;
-    window_info.render_surface = surface;
-
     StopPresenting();
-    OnFramebufferSizeChanged();
 }
 
 bool EmuWindow_Android::OnTouchEvent(int x, int y, bool pressed) {
@@ -54,7 +98,6 @@ void EmuWindow_Android::OnTouchMoved(int x, int y) {
 void EmuWindow_Android::OnFramebufferSizeChanged() {
     UpdateLandscapeScreenLayout();
     const bool is_portrait_mode{IsPortraitMode()};
-
     const int bigger{window_width > window_height ? window_width : window_height};
     const int smaller{window_width < window_height ? window_width : window_height};
     if (is_portrait_mode) {
@@ -64,7 +107,7 @@ void EmuWindow_Android::OnFramebufferSizeChanged() {
     }
 }
 
-EmuWindow_Android::EmuWindow_Android(ANativeWindow* surface) : host_window{surface} {
+EmuWindow_Android::EmuWindow_Android(ANativeWindow* surface) {
     LOG_DEBUG(Frontend, "Initializing EmuWindow_Android");
 
     if (!surface) {
@@ -72,10 +115,108 @@ EmuWindow_Android::EmuWindow_Android(ANativeWindow* surface) : host_window{surfa
         return;
     }
 
-    window_width = ANativeWindow_getWidth(surface);
-    window_height = ANativeWindow_getHeight(surface);
-
     Network::Init();
+
+    host_window = surface;
+
+    if (egl_display = eglGetDisplay(EGL_DEFAULT_DISPLAY); egl_display == EGL_NO_DISPLAY) {
+        LOG_CRITICAL(Frontend, "eglGetDisplay() failed");
+        return;
+    }
+    if (eglInitialize(egl_display, 0, 0) != EGL_TRUE) {
+        LOG_CRITICAL(Frontend, "eglInitialize() failed");
+        return;
+    }
+    if (EGLint egl_num_configs{}; eglChooseConfig(egl_display, egl_attribs.data(), &egl_config, 1,
+                                                  &egl_num_configs) != EGL_TRUE) {
+        LOG_CRITICAL(Frontend, "eglChooseConfig() failed");
+        return;
+    }
+
+    CreateWindowSurface();
+
+    if (eglQuerySurface(egl_display, egl_surface, EGL_WIDTH, &window_width) != EGL_TRUE) {
+        return;
+    }
+    if (eglQuerySurface(egl_display, egl_surface, EGL_HEIGHT, &window_height) != EGL_TRUE) {
+        return;
+    }
+
+    if (egl_context = eglCreateContext(egl_display, egl_config, 0, egl_context_attribs.data());
+        egl_context == EGL_NO_CONTEXT) {
+        LOG_CRITICAL(Frontend, "eglCreateContext() failed");
+        return;
+    }
+    if (eglSurfaceAttrib(egl_display, egl_surface, EGL_SWAP_BEHAVIOR, EGL_BUFFER_DESTROYED) !=
+        EGL_TRUE) {
+        LOG_CRITICAL(Frontend, "eglSurfaceAttrib() failed");
+        return;
+    }
+    if (core_context = CreateSharedContext(); !core_context) {
+        LOG_CRITICAL(Frontend, "CreateSharedContext() failed");
+        return;
+    }
+    if (eglMakeCurrent(egl_display, egl_surface, egl_surface, egl_context) != EGL_TRUE) {
+        LOG_CRITICAL(Frontend, "eglMakeCurrent() failed");
+        return;
+    }
+    if (!gladLoadGLES2Loader((GLADloadproc)eglGetProcAddress)) {
+        LOG_CRITICAL(Frontend, "gladLoadGLES2Loader() failed");
+        return;
+    }
+    if (!eglSwapInterval(egl_display, Settings::values.use_vsync_new ? 1 : 0)) {
+        LOG_CRITICAL(Frontend, "eglSwapInterval() failed");
+        return;
+    }
+
+    OnFramebufferSizeChanged();
+}
+
+bool EmuWindow_Android::CreateWindowSurface() {
+    if (!host_window) {
+        return true;
+    }
+
+    EGLint format{};
+    eglGetConfigAttrib(egl_display, egl_config, EGL_NATIVE_VISUAL_ID, &format);
+    ANativeWindow_setBuffersGeometry(host_window, 0, 0, format);
+
+    if (egl_surface = eglCreateWindowSurface(egl_display, egl_config, host_window, 0);
+        egl_surface == EGL_NO_SURFACE) {
+        return {};
+    }
+
+    return !!egl_surface;
+}
+
+void EmuWindow_Android::DestroyWindowSurface() {
+    if (!egl_surface) {
+        return;
+    }
+    if (eglGetCurrentSurface(EGL_DRAW) == egl_surface) {
+        eglMakeCurrent(egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+    }
+    if (!eglDestroySurface(egl_display, egl_surface)) {
+        LOG_CRITICAL(Frontend, "eglDestroySurface() failed");
+    }
+    egl_surface = EGL_NO_SURFACE;
+}
+
+void EmuWindow_Android::DestroyContext() {
+    if (!egl_context) {
+        return;
+    }
+    if (eglGetCurrentContext() == egl_context) {
+        eglMakeCurrent(egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+    }
+    if (!eglDestroyContext(egl_display, egl_context)) {
+        LOG_CRITICAL(Frontend, "eglDestroySurface() failed");
+    }
+    if (!eglTerminate(egl_display)) {
+        LOG_CRITICAL(Frontend, "eglTerminate() failed");
+    }
+    egl_context = EGL_NO_CONTEXT;
+    egl_display = EGL_NO_DISPLAY;
 }
 
 EmuWindow_Android::~EmuWindow_Android() {
@@ -83,6 +224,48 @@ EmuWindow_Android::~EmuWindow_Android() {
     DestroyContext();
 }
 
+std::unique_ptr<Frontend::GraphicsContext> EmuWindow_Android::CreateSharedContext() const {
+    return std::make_unique<SharedContext_Android>(egl_display, egl_config, egl_context);
+}
+
+void EmuWindow_Android::StopPresenting() {
+    if (presenting_state == PresentingState::Running) {
+        eglMakeCurrent(egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+    }
+    presenting_state = PresentingState::Stopped;
+}
+
+void EmuWindow_Android::TryPresenting() {
+    if (presenting_state != PresentingState::Running) {
+        if (presenting_state == PresentingState::Initial) {
+            eglMakeCurrent(egl_display, egl_surface, egl_surface, egl_context);
+            glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
+            presenting_state = PresentingState::Running;
+        } else {
+            return;
+        }
+    }
+    eglSwapInterval(egl_display, Settings::values.use_vsync_new ? 1 : 0);
+    if (VideoCore::g_renderer) {
+        VideoCore::g_renderer->TryPresent(0);
+        eglSwapBuffers(egl_display, egl_surface);
+    }
+}
+
+void EmuWindow_Android::PollEvents() {
+    if (!render_window) {
+        return;
+    }
+
+    host_window = render_window;
+    render_window = nullptr;
+
+    DestroyWindowSurface();
+    CreateWindowSurface();
+    OnFramebufferSizeChanged();
+    presenting_state = PresentingState::Initial;
+}
+
 void EmuWindow_Android::MakeCurrent() {
     core_context->MakeCurrent();
 }

src/android/app/src/main/jni/emu_window/emu_window.h

@@ -5,13 +5,38 @@
 #pragma once
 
 #include <vector>
+
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
+
 #include "core/frontend/emu_window.h"
 
+struct ANativeWindow;
+
+class SharedContext_Android : public Frontend::GraphicsContext {
+public:
+    SharedContext_Android(EGLDisplay egl_display, EGLConfig egl_config,
+                          EGLContext egl_share_context);
+
+    ~SharedContext_Android() override;
+
+    void MakeCurrent() override;
+
+    void DoneCurrent() override;
+
+private:
+    EGLDisplay egl_display{};
+    EGLSurface egl_surface{};
+    EGLContext egl_context{};
+};
+
 class EmuWindow_Android : public Frontend::EmuWindow {
 public:
     EmuWindow_Android(ANativeWindow* surface);
     ~EmuWindow_Android();
 
+    void Present();
+
     /// Called by the onSurfaceChanges() method to change the surface
     void OnSurfaceChanged(ANativeWindow* surface);
 
@@ -21,34 +46,38 @@ public:
     /// Handles movement of touch pointer
     void OnTouchMoved(int x, int y);
 
+    void PollEvents() override;
     void MakeCurrent() override;
-
     void DoneCurrent() override;
 
-    virtual void TryPresenting() {}
+    void TryPresenting();
+    void StopPresenting();
 
-    virtual void StopPresenting() {}
+    std::unique_ptr<GraphicsContext> CreateSharedContext() const override;
 
-protected:
+private:
     void OnFramebufferSizeChanged();
+    bool CreateWindowSurface();
+    void DestroyWindowSurface();
+    void DestroyContext();
 
-    /// Creates the API specific window surface
-    virtual bool CreateWindowSurface() {
-        return false;
-    }
-
-    /// Destroys the API specific window surface
-    virtual void DestroyWindowSurface() {}
-
-    /// Destroys the graphics context
-    virtual void DestroyContext() {}
-
-protected:
     ANativeWindow* render_window{};
     ANativeWindow* host_window{};
 
     int window_width{};
     int window_height{};
 
+    EGLConfig egl_config;
+    EGLSurface egl_surface{};
+    EGLContext egl_context{};
+    EGLDisplay egl_display{};
+
     std::unique_ptr<Frontend::GraphicsContext> core_context;
+
+    enum class PresentingState {
+        Initial,
+        Running,
+        Stopped,
+    };
+    PresentingState presenting_state{};
 };

src/android/app/src/main/jni/emu_window/emu_window_gl.cpp

@@ -1,215 +0,0 @@
-// Copyright 2019 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#include <algorithm>
-#include <array>
-#include <cstdlib>
-#include <string>
-
-#include <android/native_window_jni.h>
-#include <glad/glad.h>
-
-#include "common/logging/log.h"
-#include "common/settings.h"
-#include "input_common/main.h"
-#include "jni/emu_window/emu_window_gl.h"
-#include "video_core/renderer_base.h"
-#include "video_core/video_core.h"
-
-static constexpr std::array<EGLint, 15> egl_attribs{EGL_SURFACE_TYPE,
-                                                    EGL_WINDOW_BIT,
-                                                    EGL_RENDERABLE_TYPE,
-                                                    EGL_OPENGL_ES3_BIT_KHR,
-                                                    EGL_BLUE_SIZE,
-                                                    8,
-                                                    EGL_GREEN_SIZE,
-                                                    8,
-                                                    EGL_RED_SIZE,
-                                                    8,
-                                                    EGL_DEPTH_SIZE,
-                                                    0,
-                                                    EGL_STENCIL_SIZE,
-                                                    0,
-                                                    EGL_NONE};
-static constexpr std::array<EGLint, 5> egl_empty_attribs{EGL_WIDTH, 1, EGL_HEIGHT, 1, EGL_NONE};
-static constexpr std::array<EGLint, 4> egl_context_attribs{EGL_CONTEXT_CLIENT_VERSION, 3, EGL_NONE};
-
-class SharedContext_Android : public Frontend::GraphicsContext {
-public:
-    SharedContext_Android(EGLDisplay egl_display, EGLConfig egl_config,
-                          EGLContext egl_share_context)
-        : egl_display{egl_display}, egl_surface{eglCreatePbufferSurface(egl_display, egl_config,
-                                                                        egl_empty_attribs.data())},
-          egl_context{eglCreateContext(egl_display, egl_config, egl_share_context,
-                                       egl_context_attribs.data())} {
-        ASSERT_MSG(egl_surface, "eglCreatePbufferSurface() failed!");
-        ASSERT_MSG(egl_context, "eglCreateContext() failed!");
-    }
-
-    ~SharedContext_Android() override {
-        if (!eglDestroySurface(egl_display, egl_surface)) {
-            LOG_CRITICAL(Frontend, "eglDestroySurface() failed");
-        }
-
-        if (!eglDestroyContext(egl_display, egl_context)) {
-            LOG_CRITICAL(Frontend, "eglDestroySurface() failed");
-        }
-    }
-
-    void MakeCurrent() override {
-        eglMakeCurrent(egl_display, egl_surface, egl_surface, egl_context);
-    }
-
-    void DoneCurrent() override {
-        eglMakeCurrent(egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
-    }
-
-private:
-    EGLDisplay egl_display{};
-    EGLSurface egl_surface{};
-    EGLContext egl_context{};
-};
-
-EmuWindow_Android_OpenGL::EmuWindow_Android_OpenGL(ANativeWindow* surface)
-    : EmuWindow_Android{surface} {
-    if (egl_display = eglGetDisplay(EGL_DEFAULT_DISPLAY); egl_display == EGL_NO_DISPLAY) {
-        LOG_CRITICAL(Frontend, "eglGetDisplay() failed");
-        return;
-    }
-    if (eglInitialize(egl_display, 0, 0) != EGL_TRUE) {
-        LOG_CRITICAL(Frontend, "eglInitialize() failed");
-        return;
-    }
-    if (EGLint egl_num_configs{}; eglChooseConfig(egl_display, egl_attribs.data(), &egl_config, 1,
-                                                  &egl_num_configs) != EGL_TRUE) {
-        LOG_CRITICAL(Frontend, "eglChooseConfig() failed");
-        return;
-    }
-
-    CreateWindowSurface();
-
-    if (eglQuerySurface(egl_display, egl_surface, EGL_WIDTH, &window_width) != EGL_TRUE) {
-        return;
-    }
-    if (eglQuerySurface(egl_display, egl_surface, EGL_HEIGHT, &window_height) != EGL_TRUE) {
-        return;
-    }
-
-    if (egl_context = eglCreateContext(egl_display, egl_config, 0, egl_context_attribs.data());
-        egl_context == EGL_NO_CONTEXT) {
-        LOG_CRITICAL(Frontend, "eglCreateContext() failed");
-        return;
-    }
-    if (eglSurfaceAttrib(egl_display, egl_surface, EGL_SWAP_BEHAVIOR, EGL_BUFFER_DESTROYED) !=
-        EGL_TRUE) {
-        LOG_CRITICAL(Frontend, "eglSurfaceAttrib() failed");
-        return;
-    }
-    if (core_context = CreateSharedContext(); !core_context) {
-        LOG_CRITICAL(Frontend, "CreateSharedContext() failed");
-        return;
-    }
-    if (eglMakeCurrent(egl_display, egl_surface, egl_surface, egl_context) != EGL_TRUE) {
-        LOG_CRITICAL(Frontend, "eglMakeCurrent() failed");
-        return;
-    }
-    if (!gladLoadGLES2Loader((GLADloadproc)eglGetProcAddress)) {
-        LOG_CRITICAL(Frontend, "gladLoadGLES2Loader() failed");
-        return;
-    }
-    if (!eglSwapInterval(egl_display, Settings::values.use_vsync_new ? 1 : 0)) {
-        LOG_CRITICAL(Frontend, "eglSwapInterval() failed");
-        return;
-    }
-
-    OnFramebufferSizeChanged();
-}
-
-bool EmuWindow_Android_OpenGL::CreateWindowSurface() {
-    if (!host_window) {
-        return true;
-    }
-
-    EGLint format{};
-    eglGetConfigAttrib(egl_display, egl_config, EGL_NATIVE_VISUAL_ID, &format);
-    ANativeWindow_setBuffersGeometry(host_window, 0, 0, format);
-
-    if (egl_surface = eglCreateWindowSurface(egl_display, egl_config, host_window, 0);
-        egl_surface == EGL_NO_SURFACE) {
-        return {};
-    }
-
-    return egl_surface;
-}
-
-void EmuWindow_Android_OpenGL::DestroyWindowSurface() {
-    if (!egl_surface) {
-        return;
-    }
-    if (eglGetCurrentSurface(EGL_DRAW) == egl_surface) {
-        eglMakeCurrent(egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
-    }
-    if (!eglDestroySurface(egl_display, egl_surface)) {
-        LOG_CRITICAL(Frontend, "eglDestroySurface() failed");
-    }
-    egl_surface = EGL_NO_SURFACE;
-}
-
-void EmuWindow_Android_OpenGL::DestroyContext() {
-    if (!egl_context) {
-        return;
-    }
-    if (eglGetCurrentContext() == egl_context) {
-        eglMakeCurrent(egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
-    }
-    if (!eglDestroyContext(egl_display, egl_context)) {
-        LOG_CRITICAL(Frontend, "eglDestroySurface() failed");
-    }
-    if (!eglTerminate(egl_display)) {
-        LOG_CRITICAL(Frontend, "eglTerminate() failed");
-    }
-    egl_context = EGL_NO_CONTEXT;
-    egl_display = EGL_NO_DISPLAY;
-}
-
-std::unique_ptr<Frontend::GraphicsContext> EmuWindow_Android_OpenGL::CreateSharedContext() const {
-    return std::make_unique<SharedContext_Android>(egl_display, egl_config, egl_context);
-}
-
-void EmuWindow_Android_OpenGL::PollEvents() {
-    if (!render_window) {
-        return;
-    }
-
-    host_window = render_window;
-    render_window = nullptr;
-
-    DestroyWindowSurface();
-    CreateWindowSurface();
-    OnFramebufferSizeChanged();
-    presenting_state = PresentingState::Initial;
-}
-
-void EmuWindow_Android_OpenGL::StopPresenting() {
-    if (presenting_state == PresentingState::Running) {
-        eglMakeCurrent(egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
-    }
-    presenting_state = PresentingState::Stopped;
-}
-
-void EmuWindow_Android_OpenGL::TryPresenting() {
-    if (presenting_state == PresentingState::Initial) [[unlikely]] {
-        eglMakeCurrent(egl_display, egl_surface, egl_surface, egl_context);
-        glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
-        presenting_state = PresentingState::Running;
-    }
-    if (presenting_state != PresentingState::Running) [[unlikely]] {
-        return;
-    }
-    eglSwapInterval(egl_display, Settings::values.use_vsync_new ? 1 : 0);
-    if (VideoCore::g_renderer) {
-        VideoCore::g_renderer->TryPresent(0);
-        eglSwapBuffers(egl_display, egl_surface);
-    }
-}

src/android/app/src/main/jni/emu_window/emu_window_gl.h

@@ -1,44 +0,0 @@
-// Copyright 2019 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include <vector>
-
-#include <EGL/egl.h>
-#include <EGL/eglext.h>
-
-#include "jni/emu_window/emu_window.h"
-
-struct ANativeWindow;
-
-class EmuWindow_Android_OpenGL : public EmuWindow_Android {
-public:
-    EmuWindow_Android_OpenGL(ANativeWindow* surface);
-    ~EmuWindow_Android_OpenGL() override = default;
-
-    void TryPresenting() override;
-    void StopPresenting() override;
-    void PollEvents() override;
-
-    std::unique_ptr<GraphicsContext> CreateSharedContext() const override;
-
-private:
-    bool CreateWindowSurface() override;
-    void DestroyWindowSurface() override;
-    void DestroyContext() override;
-
-private:
-    EGLConfig egl_config;
-    EGLSurface egl_surface{};
-    EGLContext egl_context{};
-    EGLDisplay egl_display{};
-
-    enum class PresentingState {
-        Initial,
-        Running,
-        Stopped,
-    };
-    PresentingState presenting_state{};
-};

src/android/app/src/main/jni/emu_window/emu_window_vk.cpp

@@ -1,53 +0,0 @@
-// Copyright 2019 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#include <cstdlib>
-#include <android/native_window_jni.h>
-#include "common/logging/log.h"
-#include "common/settings.h"
-#include "jni/emu_window/emu_window_vk.h"
-#include "video_core/video_core.h"
-
-class GraphicsContext_Android final : public Frontend::GraphicsContext {
-public:
-    explicit GraphicsContext_Android(std::shared_ptr<Common::DynamicLibrary> driver_library_)
-        : driver_library{driver_library_} {}
-
-    ~GraphicsContext_Android() = default;
-
-    std::shared_ptr<Common::DynamicLibrary> GetDriverLibrary() override {
-        return driver_library;
-    }
-
-private:
-    std::shared_ptr<Common::DynamicLibrary> driver_library;
-};
-
-EmuWindow_Android_Vulkan::EmuWindow_Android_Vulkan(
-    ANativeWindow* surface, std::shared_ptr<Common::DynamicLibrary> driver_library_)
-    : EmuWindow_Android{surface}, driver_library{driver_library_} {
-    CreateWindowSurface();
-
-    if (core_context = CreateSharedContext(); !core_context) {
-        LOG_CRITICAL(Frontend, "CreateSharedContext() failed");
-        return;
-    }
-
-    OnFramebufferSizeChanged();
-}
-
-bool EmuWindow_Android_Vulkan::CreateWindowSurface() {
-    if (!host_window) {
-        return true;
-    }
-
-    window_info.type = Frontend::WindowSystemType::Android;
-    window_info.render_surface = host_window;
-
-    return true;
-}
-
-std::unique_ptr<Frontend::GraphicsContext> EmuWindow_Android_Vulkan::CreateSharedContext() const {
-    return std::make_unique<GraphicsContext_Android>(driver_library);
-}

src/android/app/src/main/jni/emu_window/emu_window_vk.h

@@ -1,26 +0,0 @@
-// Copyright 2022 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include "jni/emu_window/emu_window.h"
-
-struct ANativeWindow;
-
-class EmuWindow_Android_Vulkan : public EmuWindow_Android {
-public:
-    EmuWindow_Android_Vulkan(ANativeWindow* surface,
-                             std::shared_ptr<Common::DynamicLibrary> driver_library);
-    ~EmuWindow_Android_Vulkan() override = default;
-
-    void PollEvents() override {}
-
-    std::unique_ptr<GraphicsContext> CreateSharedContext() const override;
-
-private:
-    bool CreateWindowSurface() override;
-
-private:
-    std::shared_ptr<Common::DynamicLibrary> driver_library;
-};

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

@@ -4,16 +4,13 @@
 
 #include <algorithm>
 #include <thread>
-#include <dlfcn.h>
 
 #include <android/api-level.h>
 #include <android/native_window_jni.h>
 
 #include "audio_core/dsp_interface.h"
 #include "common/aarch64/cpu_detect.h"
-#include "common/arch.h"
 #include "common/common_paths.h"
-#include "common/dynamic_library/dynamic_library.h"
 #include "common/file_util.h"
 #include "common/logging/backend.h"
 #include "common/logging/log.h"
@@ -29,15 +26,13 @@
 #include "core/hle/service/nfc/nfc.h"
 #include "core/loader/loader.h"
 #include "core/savestate.h"
-#include "core/telemetry_session.h"
 #include "jni/android_common/android_common.h"
 #include "jni/applets/mii_selector.h"
 #include "jni/applets/swkbd.h"
 #include "jni/camera/ndk_camera.h"
 #include "jni/camera/still_image_camera.h"
 #include "jni/config.h"
-#include "jni/emu_window/emu_window_gl.h"
-#include "jni/emu_window/emu_window_vk.h"
+#include "jni/emu_window/emu_window.h"
 #include "jni/game_settings.h"
 #include "jni/id_cache.h"
 #include "jni/input_manager.h"
@@ -46,15 +41,10 @@
 #include "video_core/renderer_base.h"
 #include "video_core/video_core.h"
 
-#if CITRA_ARCH(arm64)
-#include <adrenotools/driver.h>
-#endif
-
 namespace {
 
 ANativeWindow* s_surf;
 
-std::shared_ptr<Common::DynamicLibrary> vulkan_library{};
 std::unique_ptr<EmuWindow_Android> window;
 
 std::atomic<bool> stop_run{true};
@@ -132,14 +122,11 @@ static Core::System::ResultStatus RunCitra(const std::string& filepath) {
     const auto graphics_api = Settings::values.graphics_api.GetValue();
     switch (graphics_api) {
     case Settings::GraphicsAPI::OpenGL:
-        window = std::make_unique<EmuWindow_Android_OpenGL>(s_surf);
-        break;
-    case Settings::GraphicsAPI::Vulkan:
-        window = std::make_unique<EmuWindow_Android_Vulkan>(s_surf, vulkan_library);
+        window = std::make_unique<EmuWindow_Android>(s_surf);
         break;
     default:
-        LOG_CRITICAL(Frontend, "Unknown graphics API {}, using Vulkan", graphics_api);
-        window = std::make_unique<EmuWindow_Android_Vulkan>(s_surf, vulkan_library);
+        LOG_CRITICAL(Frontend, "Unknown graphics API {}, using OpenGL", graphics_api);
+        window = std::make_unique<EmuWindow_Android>(s_surf);
     }
 
     Core::System& system{Core::System::GetInstance()};
@@ -164,12 +151,12 @@ static Core::System::ResultStatus RunCitra(const std::string& filepath) {
     Camera::RegisterFactory("ndk", std::move(ndk_factory));
 
     // Register frontend applets
-    Frontend::RegisterDefaultApplets(system);
+    Frontend::RegisterDefaultApplets();
     system.RegisterMiiSelector(std::make_shared<MiiSelector::AndroidMiiSelector>());
     system.RegisterSoftwareKeyboard(std::make_shared<SoftwareKeyboard::AndroidKeyboard>());
 
     // Register microphone permission check
-    system.RegisterMicPermissionCheck(&CheckMicPermission);
+    Core::System::GetInstance().RegisterMicPermissionCheck(&CheckMicPermission);
 
     InputManager::Init();
 
@@ -179,7 +166,7 @@ static Core::System::ResultStatus RunCitra(const std::string& filepath) {
         return load_result;
     }
 
-    auto& telemetry_session = system.TelemetrySession();
+    auto& telemetry_session = Core::System::GetInstance().TelemetrySession();
     telemetry_session.AddField(Common::Telemetry::FieldType::App, "Frontend", "Android");
 
     stop_run = false;
@@ -200,7 +187,8 @@ static Core::System::ResultStatus RunCitra(const std::string& filepath) {
     audio_stretching_event =
         system.CoreTiming().RegisterEvent("AudioStretchingEvent", [&](u64, s64 cycles_late) {
             if (Settings::values.enable_audio_stretching) {
-                system.DSP().EnableStretching(system.GetAndResetPerfStats().emulation_speed < 0.95);
+                Core::DSP().EnableStretching(
+                    Core::System::GetInstance().GetAndResetPerfStats().emulation_speed < 0.95);
             }
 
             system.CoreTiming().ScheduleEvent(audio_stretching_ticks - cycles_late,
@@ -231,7 +219,7 @@ static Core::System::ResultStatus RunCitra(const std::string& filepath) {
             SCOPE_EXIT({ Settings::values.volume = volume; });
             Settings::values.volume = 0;
 
-            std::unique_lock pause_lock{paused_mutex};
+            std::unique_lock<std::mutex> pause_lock(paused_mutex);
             running_cv.wait(pause_lock, [] { return !pause_emulation || stop_run; });
             window->PollEvents();
         }
@@ -240,37 +228,6 @@ static Core::System::ResultStatus RunCitra(const std::string& filepath) {
     return Core::System::ResultStatus::Success;
 }
 
-void InitializeGpuDriver(const std::string& hook_lib_dir, const std::string& custom_driver_dir,
-                         const std::string& custom_driver_name,
-                         const std::string& file_redirect_dir) {
-#if CITRA_ARCH(arm64)
-    void* handle{};
-    const char* file_redirect_dir_{};
-    int featureFlags{};
-
-    // Enable driver file redirection when renderer debugging is enabled.
-    if (Settings::values.renderer_debug && file_redirect_dir.size()) {
-        featureFlags |= ADRENOTOOLS_DRIVER_FILE_REDIRECT;
-        file_redirect_dir_ = file_redirect_dir.c_str();
-    }
-
-    // Try to load a custom driver.
-    if (custom_driver_name.size()) {
-        handle = adrenotools_open_libvulkan(
-            RTLD_NOW, featureFlags | ADRENOTOOLS_DRIVER_CUSTOM, nullptr, hook_lib_dir.c_str(),
-            custom_driver_dir.c_str(), custom_driver_name.c_str(), file_redirect_dir_, nullptr);
-    }
-
-    // Try to load the system driver.
-    if (!handle) {
-        handle = adrenotools_open_libvulkan(RTLD_NOW, featureFlags, nullptr, hook_lib_dir.c_str(),
-                                            nullptr, nullptr, file_redirect_dir_, nullptr);
-    }
-
-    vulkan_library = std::make_shared<Common::DynamicLibrary>(handle);
-#endif
-}
-
 extern "C" {
 
 void Java_org_citra_citra_1emu_NativeLibrary_SurfaceChanged(JNIEnv* env,
@@ -281,9 +238,6 @@ void Java_org_citra_citra_1emu_NativeLibrary_SurfaceChanged(JNIEnv* env,
     if (window) {
         window->OnSurfaceChanged(s_surf);
     }
-    if (VideoCore::g_renderer) {
-        VideoCore::g_renderer->NotifySurfaceChanged();
-    }
 
     LOG_INFO(Frontend, "Surface changed");
 }
@@ -304,15 +258,6 @@ void Java_org_citra_citra_1emu_NativeLibrary_DoFrame(JNIEnv* env, [[maybe_unused
     window->TryPresenting();
 }
 
-void JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_initializeGpuDriver(JNIEnv* env, jclass clazz,
-                                                                       jstring hook_lib_dir,
-                                                                       jstring custom_driver_dir,
-                                                                       jstring custom_driver_name,
-                                                                       jstring file_redirect_dir) {
-    InitializeGpuDriver(GetJString(env, hook_lib_dir), GetJString(env, custom_driver_dir),
-                        GetJString(env, custom_driver_name), GetJString(env, file_redirect_dir));
-}
-
 void Java_org_citra_citra_1emu_NativeLibrary_NotifyOrientationChange(JNIEnv* env,
                                                                      [[maybe_unused]] jclass clazz,
                                                                      jint layout_option,
@@ -676,7 +621,7 @@ jobjectArray Java_org_citra_citra_1emu_NativeLibrary_GetSavestateInfo(
         return nullptr;
     }
 
-    const auto savestates = Core::ListSaveStates(title_id, system.Movie().GetCurrentMovieID());
+    const auto savestates = Core::ListSaveStates(title_id);
     const jobjectArray array =
         env->NewObjectArray(static_cast<jsize>(savestates.size()), savestate_info_class, nullptr);
     for (std::size_t i = 0; i < savestates.size(); ++i) {

src/android/app/src/main/res/values/arrays.xml

@@ -178,12 +178,10 @@
 
     <string-array name="graphicsApiNames">
         <item>OpenGLES</item>
-        <item>Vulkan</item>
     </string-array>
 
     <integer-array name="graphicsApiValues">
         <item>1</item>
-        <item>2</item>
     </integer-array>
 
     <string-array name="textureFilterNames">

src/android/app/src/main/res/values/strings.xml

@@ -74,10 +74,6 @@
     <!-- Graphics settings strings -->
     <string name="renderer">Renderer</string>
     <string name="graphics_api">Graphics API</string>
-    <string name="spirv_shader_gen">Enable SPIR-V shader generation</string>
-    <string name="spirv_shader_gen_description">Emits the fragment shader used to emulate PICA using SPIR-V instead of GLSL</string>
-    <string name="async_shaders">Enable asynchronous shader compilation</string>
-    <string name="async_shaders_description">Compiles shaders in the background to reduce stuttering during gameplay. When enabled expect temporary graphical glitches</string>
     <string name="renderer_debug">Debug Renderer</string>
     <string name="renderer_debug_description">Log additional graphics related debug information. When enabled, game performance will be significantly reduced.</string>
     <string name="vsync">Enable V-Sync</string>

src/audio_core/CMakeLists.txt

@@ -47,8 +47,9 @@ add_library(audio_core STATIC
 
 create_target_directory_groups(audio_core)
 
-target_link_libraries(audio_core PUBLIC citra_common citra_core)
+target_link_libraries(audio_core PUBLIC citra_common)
 target_link_libraries(audio_core PRIVATE SoundTouch teakra)
+set_target_properties(audio_core PROPERTIES INTERPROCEDURAL_OPTIMIZATION ${ENABLE_LTO})
 add_definitions(-DSOUNDTOUCH_INTEGER_SAMPLES)
 
 if(ENABLE_MF)

src/audio_core/cubeb_input.cpp

@@ -37,33 +37,39 @@ CubebInput::CubebInput(std::string device_id)
 }
 
 CubebInput::~CubebInput() {
+    if (!impl->ctx)
+        return;
+
     if (impl->stream) {
         if (cubeb_stream_stop(impl->stream) != CUBEB_OK) {
             LOG_ERROR(Audio, "Error stopping cubeb input stream.");
         }
+
         cubeb_stream_destroy(impl->stream);
     }
 
-    if (impl->ctx) {
     cubeb_destroy(impl->ctx);
 }
-}
 
 void CubebInput::StartSampling(const InputParameters& params) {
     // Cubeb apparently only supports signed 16 bit PCM (and float32 which the 3ds doesn't support)
-    // TODO: Resample the input stream.
+    // TODO resample the input stream
     if (params.sign == Signedness::Unsigned) {
         LOG_ERROR(Audio,
-                  "Application requested unsupported unsigned pcm format. Falling back to signed.");
+                  "Application requested unsupported unsigned pcm format. Falling back to signed");
     }
 
-    parameters = params;
     impl->sample_size_in_bytes = params.sample_size / 8;
 
+    parameters = params;
+    is_sampling = true;
+
     cubeb_devid input_device = nullptr;
     if (device_id != auto_device_name && !device_id.empty()) {
         cubeb_device_collection collection;
-        if (cubeb_enumerate_devices(impl->ctx, CUBEB_DEVICE_TYPE_INPUT, &collection) == CUBEB_OK) {
+        if (cubeb_enumerate_devices(impl->ctx, CUBEB_DEVICE_TYPE_INPUT, &collection) != CUBEB_OK) {
+            LOG_WARNING(Audio, "Audio input device enumeration not supported");
+        } else {
             const auto collection_end = collection.device + collection.count;
             const auto device = std::find_if(
                 collection.device, collection_end, [this](const cubeb_device_info& info) {
@@ -73,42 +79,39 @@ void CubebInput::StartSampling(const InputParameters& params) {
                 input_device = device->devid;
             }
             cubeb_device_collection_destroy(impl->ctx, &collection);
-        } else {
-            LOG_WARNING(Audio_Sink,
-                        "Audio input device enumeration not supported, using default device.");
         }
     }
 
-    cubeb_stream_params input_params = {
-        .format = CUBEB_SAMPLE_S16LE,
-        .rate = params.sample_rate,
-        .channels = 1,
-        .layout = CUBEB_LAYOUT_UNDEFINED,
-    };
+    cubeb_stream_params input_params;
+    input_params.channels = 1;
+    input_params.layout = CUBEB_LAYOUT_UNDEFINED;
+    input_params.prefs = CUBEB_STREAM_PREF_NONE;
+    input_params.format = CUBEB_SAMPLE_S16LE;
+    input_params.rate = params.sample_rate;
 
     u32 latency_frames = 512; // Firefox default
     if (cubeb_get_min_latency(impl->ctx, &input_params, &latency_frames) != CUBEB_OK) {
-        LOG_WARNING(Audio, "Error getting minimum input latency, falling back to default latency.");
+        LOG_ERROR(Audio, "Could not get minimum latency");
     }
 
     if (cubeb_stream_init(impl->ctx, &impl->stream, "Citra Microphone", input_device, &input_params,
                           nullptr, nullptr, latency_frames, Impl::DataCallback, Impl::StateCallback,
                           impl.get()) != CUBEB_OK) {
-        LOG_CRITICAL(Audio, "Error creating cubeb input stream.");
+        LOG_CRITICAL(Audio, "Error creating cubeb input stream");
+        is_sampling = false;
         return;
     }
 
     if (cubeb_stream_start(impl->stream) != CUBEB_OK) {
-        LOG_CRITICAL(Audio, "Error starting cubeb input stream.");
-        cubeb_stream_destroy(impl->stream);
-        impl->stream = nullptr;
+        LOG_CRITICAL(Audio, "Error starting cubeb input stream");
+        is_sampling = false;
         return;
     }
-
-    is_sampling = true;
 }
 
 void CubebInput::StopSampling() {
+    // TODO(xperia64): Destroy the stream for now to avoid a leak because StartSampling
+    // reinitializes the stream every time
     if (impl->stream) {
         cubeb_stream_stop(impl->stream);
         cubeb_stream_destroy(impl->stream);
@@ -118,14 +121,8 @@ void CubebInput::StopSampling() {
 }
 
 void CubebInput::AdjustSampleRate(u32 sample_rate) {
-    if (!is_sampling) {
-        return;
-    }
-
-    auto new_parameters = parameters;
-    new_parameters.sample_rate = sample_rate;
-    StopSampling();
-    StartSampling(new_parameters);
+    // TODO This should restart the stream with the new sample rate
+    LOG_ERROR(Audio, "AdjustSampleRate unimplemented!");
 }
 
 Samples CubebInput::Read() {
@@ -139,7 +136,7 @@ Samples CubebInput::Read() {
 
 long CubebInput::Impl::DataCallback(cubeb_stream* stream, void* user_data, const void* input_buffer,
                                     void* output_buffer, long num_frames) {
-    auto impl = static_cast<Impl*>(user_data);
+    Impl* impl = static_cast<Impl*>(user_data);
     if (!impl) {
         return 0;
     }
@@ -180,7 +177,9 @@ std::vector<std::string> ListCubebInputDevices() {
     }
 
     cubeb_device_collection collection;
-    if (cubeb_enumerate_devices(ctx, CUBEB_DEVICE_TYPE_INPUT, &collection) == CUBEB_OK) {
+    if (cubeb_enumerate_devices(ctx, CUBEB_DEVICE_TYPE_INPUT, &collection) != CUBEB_OK) {
+        LOG_WARNING(Audio_Sink, "Audio input device enumeration not supported");
+    } else {
         for (std::size_t i = 0; i < collection.count; i++) {
             const cubeb_device_info& device = collection.device[i];
             if (device.state == CUBEB_DEVICE_STATE_ENABLED && device.friendly_name) {
@@ -188,8 +187,6 @@ std::vector<std::string> ListCubebInputDevices() {
             }
         }
         cubeb_device_collection_destroy(ctx, &collection);
-    } else {
-        LOG_WARNING(Audio_Sink, "Audio input device enumeration not supported.");
     }
 
     cubeb_destroy(ctx);

src/audio_core/cubeb_sink.cpp

@@ -13,6 +13,8 @@
 namespace AudioCore {
 
 struct CubebSink::Impl {
+    unsigned int sample_rate = 0;
+
     cubeb* ctx = nullptr;
     cubeb_stream* stream = nullptr;
 
@@ -29,29 +31,28 @@ CubebSink::CubebSink(std::string_view target_device_name) : impl(std::make_uniqu
         LOG_CRITICAL(Audio_Sink, "cubeb_init failed");
         return;
     }
+    cubeb_set_log_callback(CUBEB_LOG_NORMAL, &Impl::LogCallback);
 
-    if (cubeb_set_log_callback(CUBEB_LOG_NORMAL, &Impl::LogCallback) != CUBEB_OK) {
-        LOG_CRITICAL(Audio_Sink, "cubeb_set_log_callback failed");
-        return;
-    }
+    impl->sample_rate = native_sample_rate;
 
-    cubeb_stream_params params = {
-        .format = CUBEB_SAMPLE_S16LE,
-        .rate = native_sample_rate,
-        .channels = 2,
-        .layout = CUBEB_LAYOUT_STEREO,
-    };
+    cubeb_stream_params params;
+    params.rate = impl->sample_rate;
+    params.channels = 2;
+    params.layout = CUBEB_LAYOUT_STEREO;
+    params.format = CUBEB_SAMPLE_S16NE;
+    params.prefs = CUBEB_STREAM_PREF_PERSIST;
 
-    u32 minimum_latency = 100 * native_sample_rate / 1000; // Firefox default
+    u32 minimum_latency = 100 * impl->sample_rate / 1000; // Firefox default
     if (cubeb_get_min_latency(impl->ctx, &params, &minimum_latency) != CUBEB_OK) {
-        LOG_WARNING(Audio_Sink,
-                    "Error getting minimum output latency, falling back to default latency.");
+        LOG_CRITICAL(Audio_Sink, "Error getting minimum latency");
     }
 
     cubeb_devid output_device = nullptr;
     if (target_device_name != auto_device_name && !target_device_name.empty()) {
         cubeb_device_collection collection;
-        if (cubeb_enumerate_devices(impl->ctx, CUBEB_DEVICE_TYPE_OUTPUT, &collection) == CUBEB_OK) {
+        if (cubeb_enumerate_devices(impl->ctx, CUBEB_DEVICE_TYPE_OUTPUT, &collection) != CUBEB_OK) {
+            LOG_WARNING(Audio_Sink, "Audio output device enumeration not supported");
+        } else {
             const auto collection_end{collection.device + collection.count};
             const auto device{
                 std::find_if(collection.device, collection_end, [&](const cubeb_device_info& info) {
@@ -62,13 +63,10 @@ CubebSink::CubebSink(std::string_view target_device_name) : impl(std::make_uniqu
                 output_device = device->devid;
             }
             cubeb_device_collection_destroy(impl->ctx, &collection);
-        } else {
-            LOG_WARNING(Audio_Sink,
-                        "Audio output device enumeration not supported, using default device.");
         }
     }
 
-    auto stream_err = cubeb_stream_init(impl->ctx, &impl->stream, "CitraAudio", nullptr, nullptr,
+    int stream_err = cubeb_stream_init(impl->ctx, &impl->stream, "CitraAudio", nullptr, nullptr,
                                        output_device, &params, std::max(512u, minimum_latency),
                                        &Impl::DataCallback, &Impl::StateCallback, impl.get());
     if (stream_err != CUBEB_OK) {
@@ -94,20 +92,23 @@ CubebSink::CubebSink(std::string_view target_device_name) : impl(std::make_uniqu
 }
 
 CubebSink::~CubebSink() {
-    if (impl->stream) {
-        if (cubeb_stream_stop(impl->stream) != CUBEB_OK) {
-            LOG_ERROR(Audio_Sink, "Error stopping cubeb stream.");
-        }
-        cubeb_stream_destroy(impl->stream);
+    if (!impl->ctx) {
+        return;
     }
 
-    if (impl->ctx) {
-        cubeb_destroy(impl->ctx);
+    if (cubeb_stream_stop(impl->stream) != CUBEB_OK) {
+        LOG_CRITICAL(Audio_Sink, "Error stopping cubeb stream");
     }
+
+    cubeb_stream_destroy(impl->stream);
+    cubeb_destroy(impl->ctx);
 }
 
 unsigned int CubebSink::GetNativeSampleRate() const {
+    if (!impl->ctx)
         return native_sample_rate;
+
+    return impl->sample_rate;
 }
 
 void CubebSink::SetCallback(std::function<void(s16*, std::size_t)> cb) {
@@ -120,12 +121,13 @@ long CubebSink::Impl::DataCallback(cubeb_stream* stream, void* user_data, const
     auto* buffer = static_cast<s16*>(output_buffer);
 
     if (!impl || !impl->cb) {
-        LOG_DEBUG(Audio_Sink, "Missing internal data and/or audio callback, emitting zeroes.");
+        LOG_DEBUG(Audio_Sink, "Emitting zeros");
         std::memset(output_buffer, 0, num_frames * 2 * sizeof(s16));
-    } else {
-        impl->cb(buffer, num_frames);
+        return num_frames;
     }
 
+    impl->cb(buffer, num_frames);
+
     return num_frames;
 }
 
@@ -147,7 +149,7 @@ void CubebSink::Impl::StateCallback(cubeb_stream* stream, void* user_data, cubeb
 }
 
 void CubebSink::Impl::LogCallback(char const* format, ...) {
-    std::array<char, 512> buffer{};
+    std::array<char, 512> buffer;
     std::va_list args;
     va_start(args, format);
 #ifdef _MSC_VER
@@ -164,13 +166,15 @@ std::vector<std::string> ListCubebSinkDevices() {
     std::vector<std::string> device_list;
     cubeb* ctx;
 
-    if (cubeb_init(&ctx, "Citra Output Device Enumerator", nullptr) != CUBEB_OK) {
+    if (cubeb_init(&ctx, "CitraEnumerator", nullptr) != CUBEB_OK) {
         LOG_CRITICAL(Audio_Sink, "cubeb_init failed");
         return {};
     }
 
     cubeb_device_collection collection;
-    if (cubeb_enumerate_devices(ctx, CUBEB_DEVICE_TYPE_OUTPUT, &collection) == CUBEB_OK) {
+    if (cubeb_enumerate_devices(ctx, CUBEB_DEVICE_TYPE_OUTPUT, &collection) != CUBEB_OK) {
+        LOG_WARNING(Audio_Sink, "Audio output device enumeration not supported");
+    } else {
         for (std::size_t i = 0; i < collection.count; i++) {
             const cubeb_device_info& device = collection.device[i];
             if (device.state == CUBEB_DEVICE_STATE_ENABLED && device.friendly_name) {
@@ -178,8 +182,6 @@ std::vector<std::string> ListCubebSinkDevices() {
             }
         }
         cubeb_device_collection_destroy(ctx, &collection);
-    } else {
-        LOG_WARNING(Audio_Sink, "Audio output device enumeration not supported.");
     }
 
     cubeb_destroy(ctx);

src/audio_core/hle/adts.h

@@ -5,24 +5,20 @@
 
 #include "common/common_types.h"
 
-namespace AudioCore {
-
 struct ADTSData {
-    u8 header_length = 0;
-    bool mpeg2 = false;
-    u8 profile = 0;
-    u8 channels = 0;
-    u8 channel_idx = 0;
-    u8 framecount = 0;
-    u8 samplerate_idx = 0;
-    u32 length = 0;
-    u32 samplerate = 0;
+    u8 header_length;
+    bool MPEG2;
+    u8 profile;
+    u8 channels;
+    u8 channel_idx;
+    u8 framecount;
+    u8 samplerate_idx;
+    u32 length;
+    u32 samplerate;
 };
 
-ADTSData ParseADTS(const u8* buffer);
+ADTSData ParseADTS(const char* buffer);
 
 // last two bytes of MF AAC decoder user data
 // see https://docs.microsoft.com/en-us/windows/desktop/medfound/aac-decoder#example-media-types
 u16 MFGetAACTag(const ADTSData& input);
-
-} // namespace AudioCore

src/audio_core/hle/adts_reader.cpp

@@ -3,59 +3,44 @@
 // Refer to the license.txt file included.
 #include <array>
 #include "adts.h"
-#include "common/bit_field.h"
 
-namespace AudioCore {
 constexpr std::array<u32, 16> freq_table = {96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050,
                                             16000, 12000, 11025, 8000,  7350,  0,     0,     0};
 constexpr std::array<u8, 8> channel_table = {0, 1, 2, 3, 4, 5, 6, 8};
 
-struct ADTSHeader {
-    union {
-        std::array<u8, 7> raw{};
-        BitFieldBE<52, 12, u64> sync_word;
-        BitFieldBE<51, 1, u64> mpeg2;
-        BitFieldBE<49, 2, u64> layer;
-        BitFieldBE<48, 1, u64> protection_absent;
-        BitFieldBE<46, 2, u64> profile;
-        BitFieldBE<42, 4, u64> samplerate_idx;
-        BitFieldBE<41, 1, u64> private_bit;
-        BitFieldBE<38, 3, u64> channel_idx;
-        BitFieldBE<37, 1, u64> originality;
-        BitFieldBE<36, 1, u64> home;
-        BitFieldBE<35, 1, u64> copyright_id;
-        BitFieldBE<34, 1, u64> copyright_id_start;
-        BitFieldBE<21, 13, u64> frame_length;
-        BitFieldBE<10, 11, u64> buffer_fullness;
-        BitFieldBE<8, 2, u64> frame_count;
-    };
-};
-
-ADTSData ParseADTS(const u8* buffer) {
-    ADTSHeader header;
-    memcpy(header.raw.data(), buffer, sizeof(header.raw));
+ADTSData ParseADTS(const char* buffer) {
+    u32 tmp = 0;
+    ADTSData out;
 
     // sync word 0xfff
-    if (header.sync_word != 0xfff) {
-        return {};
+    tmp = (buffer[0] << 8) | (buffer[1] & 0xf0);
+    if ((tmp & 0xffff) != 0xfff0) {
+        out.length = 0;
+        return out;
     }
-
-    ADTSData out{};
     // bit 16 = no CRC
-    out.header_length = header.protection_absent ? 7 : 9;
-    out.mpeg2 = static_cast<bool>(header.mpeg2);
+    out.header_length = (buffer[1] & 0x1) ? 7 : 9;
+    out.MPEG2 = (buffer[1] >> 3) & 0x1;
     // bit 17 to 18
-    out.profile = static_cast<u8>(header.profile) + 1;
+    out.profile = (buffer[2] >> 6) + 1;
     // bit 19 to 22
-    out.samplerate_idx = static_cast<u8>(header.samplerate_idx);
-    out.samplerate = header.samplerate_idx > 15 ? 0 : freq_table[header.samplerate_idx];
+    tmp = (buffer[2] >> 2) & 0xf;
+    out.samplerate_idx = tmp;
+    out.samplerate = (tmp > 15) ? 0 : freq_table[tmp];
     // bit 24 to 26
-    out.channel_idx = static_cast<u8>(header.channel_idx);
-    out.channels = (header.channel_idx > 7) ? 0 : channel_table[header.channel_idx];
+    tmp = ((buffer[2] & 0x1) << 2) | ((buffer[3] >> 6) & 0x3);
+    out.channel_idx = tmp;
+    out.channels = (tmp > 7) ? 0 : channel_table[tmp];
+
     // bit 55 to 56
-    out.framecount = static_cast<u8>(header.frame_count + 1);
+    out.framecount = (buffer[6] & 0x3) + 1;
+
     // bit 31 to 43
-    out.length = static_cast<u32>(header.frame_length);
+    tmp = (buffer[3] & 0x3) << 11;
+    tmp |= (buffer[4] << 3) & 0x7f8;
+    tmp |= (buffer[5] >> 5) & 0x7;
+
+    out.length = tmp;
 
     return out;
 }
@@ -76,4 +61,3 @@ u16 MFGetAACTag(const ADTSData& input) {
 
     return tag;
 }
-} // namespace AudioCore

src/audio_core/hle/audiotoolbox_decoder.cpp

@@ -24,7 +24,7 @@ private:
     std::optional<BinaryMessage> Decode(const BinaryMessage& request);
 
     void Clear();
-    bool InitializeDecoder(AudioCore::ADTSData& adts_header);
+    bool InitializeDecoder(ADTSData& adts_header);
 
     static OSStatus DataFunc(AudioConverterRef in_audio_converter, u32* io_number_data_packets,
                              AudioBufferList* io_data,
@@ -33,7 +33,7 @@ private:
 
     Memory::MemorySystem& memory;
 
-    AudioCore::ADTSData adts_config;
+    ADTSData adts_config;
     AudioStreamBasicDescription output_format = {};
     AudioConverterRef converter = nullptr;
 
@@ -85,11 +85,7 @@ std::optional<BinaryMessage> AudioToolboxDecoder::Impl::ProcessRequest(
     case DecoderCommand::EncodeDecode: {
         return Decode(request);
     }
-    case DecoderCommand::Shutdown:
-    case DecoderCommand::SaveState:
-    case DecoderCommand::LoadState: {
-        LOG_WARNING(Audio_DSP, "Got unimplemented binary request: {}",
-                    static_cast<u16>(request.header.cmd));
+    case DecoderCommand::Unknown: {
         BinaryMessage response = request;
         response.header.result = ResultStatus::Success;
         return response;
@@ -101,7 +97,7 @@ std::optional<BinaryMessage> AudioToolboxDecoder::Impl::ProcessRequest(
     }
 }
 
-bool AudioToolboxDecoder::Impl::InitializeDecoder(AudioCore::ADTSData& adts_header) {
+bool AudioToolboxDecoder::Impl::InitializeDecoder(ADTSData& adts_header) {
     if (converter) {
         if (adts_config.channels == adts_header.channels &&
             adts_config.samplerate == adts_header.samplerate) {
@@ -183,9 +179,8 @@ std::optional<BinaryMessage> AudioToolboxDecoder::Impl::Decode(const BinaryMessa
         return {};
     }
 
-    const auto data =
-        memory.GetFCRAMPointer(request.decode_aac_request.src_addr - Memory::FCRAM_PADDR);
-    auto adts_header = AudioCore::ParseADTS(data);
+    auto data = memory.GetFCRAMPointer(request.decode_aac_request.src_addr - Memory::FCRAM_PADDR);
+    auto adts_header = ParseADTS(reinterpret_cast<const char*>(data));
     curr_data = data + adts_header.header_length;
     curr_data_len = request.decode_aac_request.size - adts_header.header_length;
 

src/audio_core/hle/decoder.cpp

@@ -42,9 +42,7 @@ std::optional<BinaryMessage> NullDecoder::ProcessRequest(const BinaryMessage& re
     BinaryMessage response{};
     switch (request.header.cmd) {
     case DecoderCommand::Init:
-    case DecoderCommand::Shutdown:
-    case DecoderCommand::SaveState:
-    case DecoderCommand::LoadState:
+    case DecoderCommand::Unknown:
         response = request;
         response.header.result = ResultStatus::Success;
         return response;

src/audio_core/hle/decoder.h

@@ -14,16 +14,9 @@
 namespace AudioCore::HLE {
 
 enum class DecoderCommand : u16 {
-    /// Initializes the decoder.
     Init = 0,
-    /// Decodes/encodes a data frame.
     EncodeDecode = 1,
-    /// Shuts down the decoder.
-    Shutdown = 2,
-    /// Loads the saved decoder state. Used for DSP wake.
-    LoadState = 3,
-    /// Saves the decoder state. Used for DSP sleep.
-    SaveState = 4,
+    Unknown = 2, // Probably UnInit
 };
 
 enum class DecoderCodec : u16 {

src/audio_core/hle/fdk_decoder.cpp

@@ -111,11 +111,7 @@ std::optional<BinaryMessage> FDKDecoder::Impl::ProcessRequest(const BinaryMessag
     case DecoderCommand::EncodeDecode: {
         return Decode(request);
     }
-    case DecoderCommand::Shutdown:
-    case DecoderCommand::SaveState:
-    case DecoderCommand::LoadState: {
-        LOG_WARNING(Audio_DSP, "Got unimplemented binary request: {}",
-                    static_cast<u16>(request.header.cmd));
+    case DecoderCommand::Unknown: {
         BinaryMessage response = request;
         response.header.result = ResultStatus::Success;
         return response;

src/audio_core/hle/ffmpeg_decoder.cpp

@@ -80,11 +80,7 @@ std::optional<BinaryMessage> FFMPEGDecoder::Impl::ProcessRequest(const BinaryMes
     case DecoderCommand::EncodeDecode: {
         return Decode(request);
     }
-    case DecoderCommand::Shutdown:
-    case DecoderCommand::SaveState:
-    case DecoderCommand::LoadState: {
-        LOG_WARNING(Audio_DSP, "Got unimplemented binary request: {}",
-                    static_cast<u16>(request.header.cmd));
+    case DecoderCommand::Unknown: {
         BinaryMessage response = request;
         response.header.result = ResultStatus::Success;
         return response;

src/audio_core/hle/hle.cpp

@@ -8,7 +8,6 @@
 #include <boost/serialization/vector.hpp>
 #include <boost/serialization/weak_ptr.hpp>
 #include "audio_core/audio_types.h"
-#include "common/archives.h"
 #ifdef HAVE_MF
 #include "audio_core/hle/wmf_decoder.h"
 #elif HAVE_AUDIOTOOLBOX
@@ -320,10 +319,6 @@ void DspHle::Impl::PipeWrite(DspPipe pipe_number, std::span<const u8> buffer) {
             pipe_data[static_cast<u32>(pipe_number)].resize(sizeof(value));
             std::memcpy(pipe_data[static_cast<u32>(pipe_number)].data(), &value, sizeof(value));
         }
-        auto dsp = dsp_dsp.lock();
-        if (dsp) {
-            dsp->SignalInterrupt(InterruptType::Pipe, DspPipe::Binary);
-        }
         break;
     }
     default:
@@ -466,6 +461,8 @@ void DspHle::Impl::AudioTickCallback(s64 cycles_late) {
         // TODO(merry): Signal all the other interrupts as appropriate.
         if (auto service = dsp_dsp.lock()) {
             service->SignalInterrupt(InterruptType::Pipe, DspPipe::Audio);
+            // HACK(merry): Added to prevent regressions. Will remove soon.
+            service->SignalInterrupt(InterruptType::Pipe, DspPipe::Binary);
         }
     }
 

src/audio_core/hle/mediandk_decoder.cpp

@@ -27,7 +27,7 @@ public:
     ~Impl();
     std::optional<BinaryMessage> ProcessRequest(const BinaryMessage& request);
 
-    bool SetMediaType(const AudioCore::ADTSData& adts_data);
+    bool SetMediaType(const ADTSData& adts_data);
 
 private:
     std::optional<BinaryMessage> Initalize(const BinaryMessage& request);
@@ -36,8 +36,8 @@ private:
     Memory::MemorySystem& memory;
     std::unique_ptr<AMediaCodec, AMediaCodecRelease> decoder;
     // default: 2 channles, 48000 samplerate
-    AudioCore::ADTSData mADTSData{
-        /*header_length*/ 7,  /*mpeg2*/ false,   /*profile*/ 2,
+    ADTSData mADTSData{
+        /*header_length*/ 7,  /*MPEG2*/ false,   /*profile*/ 2,
         /*channels*/ 2,       /*channel_idx*/ 2, /*framecount*/ 0,
         /*samplerate_idx*/ 3, /*length*/ 0,      /*samplerate*/ 48000};
 };
@@ -54,7 +54,7 @@ std::optional<BinaryMessage> MediaNDKDecoder::Impl::Initalize(const BinaryMessag
     return response;
 }
 
-bool MediaNDKDecoder::Impl::SetMediaType(const AudioCore::ADTSData& adts_data) {
+bool MediaNDKDecoder::Impl::SetMediaType(const ADTSData& adts_data) {
     const char* mime = "audio/mp4a-latm";
     if (decoder && mADTSData.profile == adts_data.profile &&
         mADTSData.channel_idx == adts_data.channel_idx &&
@@ -110,11 +110,7 @@ std::optional<BinaryMessage> MediaNDKDecoder::Impl::ProcessRequest(const BinaryM
     case DecoderCommand::EncodeDecode: {
         return Decode(request);
     }
-    case DecoderCommand::Shutdown:
-    case DecoderCommand::SaveState:
-    case DecoderCommand::LoadState: {
-        LOG_WARNING(Audio_DSP, "Got unimplemented binary request: {}",
-                    static_cast<u16>(request.header.cmd));
+    case DecoderCommand::Unknown: {
         BinaryMessage response = request;
         response.header.result = ResultStatus::Success;
         return response;
@@ -141,9 +137,8 @@ std::optional<BinaryMessage> MediaNDKDecoder::Impl::Decode(const BinaryMessage&
         return response;
     }
 
-    const u8* data =
-        memory.GetFCRAMPointer(request.decode_aac_request.src_addr - Memory::FCRAM_PADDR);
-    ADTSData adts_data = AudioCore::ParseADTS(data);
+    u8* data = memory.GetFCRAMPointer(request.decode_aac_request.src_addr - Memory::FCRAM_PADDR);
+    ADTSData adts_data = ParseADTS(reinterpret_cast<const char*>(data));
     SetMediaType(adts_data);
     response.decode_aac_response.sample_rate = GetSampleRateEnum(adts_data.samplerate);
     response.decode_aac_response.num_channels = adts_data.channels;

src/audio_core/hle/source.h

@@ -66,7 +66,7 @@ public:
 
 private:
     const std::size_t source_id;
-    const Memory::MemorySystem* memory_system{};
+    Memory::MemorySystem* memory_system;
     StereoFrame16 current_frame;
 
     using Format = SourceConfiguration::Configuration::Format;

src/audio_core/hle/wmf_decoder.cpp

@@ -23,8 +23,7 @@ private:
 
     std::optional<BinaryMessage> Decode(const BinaryMessage& request);
 
-    MFOutputState DecodingLoop(AudioCore::ADTSData adts_header,
-                               std::array<std::vector<u8>, 2>& out_streams);
+    MFOutputState DecodingLoop(ADTSData adts_header, std::array<std::vector<u8>, 2>& out_streams);
 
     bool transform_initialized = false;
     bool format_selected = false;
@@ -116,11 +115,7 @@ std::optional<BinaryMessage> WMFDecoder::Impl::ProcessRequest(const BinaryMessag
     case DecoderCommand::EncodeDecode: {
         return Decode(request);
     }
-    case DecoderCommand::Shutdown:
-    case DecoderCommand::SaveState:
-    case DecoderCommand::LoadState: {
-        LOG_WARNING(Audio_DSP, "Got unimplemented binary request: {}",
-                    static_cast<u16>(request.header.cmd));
+    case DecoderCommand::Unknown: {
         BinaryMessage response = request;
         response.header.result = ResultStatus::Success;
         return response;
@@ -140,7 +135,7 @@ std::optional<BinaryMessage> WMFDecoder::Impl::Initalize(const BinaryMessage& re
     return response;
 }
 
-MFOutputState WMFDecoder::Impl::DecodingLoop(AudioCore::ADTSData adts_header,
+MFOutputState WMFDecoder::Impl::DecodingLoop(ADTSData adts_header,
                                              std::array<std::vector<u8>, 2>& out_streams) {
     std::optional<std::vector<f32>> output_buffer;
 
@@ -211,14 +206,14 @@ std::optional<BinaryMessage> WMFDecoder::Impl::Decode(const BinaryMessage& reque
                   request.decode_aac_request.src_addr);
         return std::nullopt;
     }
-    const u8* data =
-        memory.GetFCRAMPointer(request.decode_aac_request.src_addr - Memory::FCRAM_PADDR);
+    u8* data = memory.GetFCRAMPointer(request.decode_aac_request.src_addr - Memory::FCRAM_PADDR);
 
     std::array<std::vector<u8>, 2> out_streams;
     unique_mfptr<IMFSample> sample;
     MFInputState input_status = MFInputState::OK;
     MFOutputState output_status = MFOutputState::OK;
-    std::optional<ADTSMeta> adts_meta = DetectMediaType(data, request.decode_aac_request.size);
+    std::optional<ADTSMeta> adts_meta =
+        DetectMediaType((char*)data, request.decode_aac_request.size);
 
     if (!adts_meta) {
         LOG_ERROR(Audio_DSP, "Unable to deduce decoding parameters from ADTS stream");

src/audio_core/hle/wmf_decoder_utils.cpp

@@ -110,9 +110,8 @@ unique_mfptr<IMFSample> CreateSample(const void* data, DWORD len, DWORD alignmen
     return sample;
 }
 
-bool SelectInputMediaType(IMFTransform* transform, int in_stream_id,
-                          const AudioCore::ADTSData& adts, const UINT8* user_data,
-                          UINT32 user_data_len, GUID audio_format) {
+bool SelectInputMediaType(IMFTransform* transform, int in_stream_id, const ADTSData& adts,
+                          const UINT8* user_data, UINT32 user_data_len, GUID audio_format) {
     HRESULT hr = S_OK;
     unique_mfptr<IMFMediaType> t;
 
@@ -191,12 +190,12 @@ bool SelectOutputMediaType(IMFTransform* transform, int out_stream_id, GUID audi
     return false;
 }
 
-std::optional<ADTSMeta> DetectMediaType(const u8* buffer, std::size_t len) {
+std::optional<ADTSMeta> DetectMediaType(char* buffer, std::size_t len) {
     if (len < 7) {
         return std::nullopt;
     }
 
-    AudioCore::ADTSData tmp;
+    ADTSData tmp;
     ADTSMeta result;
     // see https://docs.microsoft.com/en-us/windows/desktop/api/mmreg/ns-mmreg-heaacwaveinfo_tag
     // for the meaning of the byte array below
@@ -208,7 +207,7 @@ std::optional<ADTSMeta> DetectMediaType(const u8* buffer, std::size_t len) {
     UINT8 aac_tmp[] = {0x01, 0x00, 0xfe, 00, 00, 00, 00, 00, 00, 00, 00, 00, 0x00, 0x00};
     uint16_t tag = 0;
 
-    tmp = AudioCore::ParseADTS(buffer);
+    tmp = ParseADTS(buffer);
     if (tmp.length == 0) {
         return std::nullopt;
     }
@@ -216,7 +215,7 @@ std::optional<ADTSMeta> DetectMediaType(const u8* buffer, std::size_t len) {
     tag = MFGetAACTag(tmp);
     aac_tmp[12] |= (tag & 0xff00) >> 8;
     aac_tmp[13] |= (tag & 0x00ff);
-    std::memcpy(&(result.ADTSHeader), &tmp, sizeof(AudioCore::ADTSData));
+    std::memcpy(&(result.ADTSHeader), &tmp, sizeof(ADTSData));
     std::memcpy(&(result.AACTag), aac_tmp, 14);
     return result;
 }

src/audio_core/hle/wmf_decoder_utils.h

@@ -99,7 +99,7 @@ void ReportError(std::string msg, HRESULT hr);
 
 // data type for transferring ADTS metadata between functions
 struct ADTSMeta {
-    AudioCore::ADTSData ADTSHeader;
+    ADTSData ADTSHeader;
     u8 AACTag[14];
 };
 
@@ -110,10 +110,10 @@ bool InitMFDLL();
 unique_mfptr<IMFTransform> MFDecoderInit(GUID audio_format = MFAudioFormat_AAC);
 unique_mfptr<IMFSample> CreateSample(const void* data, DWORD len, DWORD alignment = 1,
                                      LONGLONG duration = 0);
-bool SelectInputMediaType(IMFTransform* transform, int in_stream_id,
-                          const AudioCore::ADTSData& adts, const UINT8* user_data,
-                          UINT32 user_data_len, GUID audio_format = MFAudioFormat_AAC);
-std::optional<ADTSMeta> DetectMediaType(const u8* buffer, std::size_t len);
+bool SelectInputMediaType(IMFTransform* transform, int in_stream_id, const ADTSData& adts,
+                          const UINT8* user_data, UINT32 user_data_len,
+                          GUID audio_format = MFAudioFormat_AAC);
+std::optional<ADTSMeta> DetectMediaType(char* buffer, std::size_t len);
 bool SelectOutputMediaType(IMFTransform* transform, int out_stream_id,
                            GUID audio_format = MFAudioFormat_PCM);
 void MFFlush(IMFTransform* transform);

src/citra/CMakeLists.txt

@@ -12,8 +12,6 @@ add_executable(citra
     emu_window/emu_window_sdl2_gl.h
     emu_window/emu_window_sdl2_sw.cpp
     emu_window/emu_window_sdl2_sw.h
-    emu_window/emu_window_sdl2_vk.cpp
-    emu_window/emu_window_sdl2_vk.h
     precompiled_headers.h
     resource.h
 )

src/citra/citra.cpp

@@ -15,11 +15,11 @@
 #include "citra/emu_window/emu_window_sdl2.h"
 #include "citra/emu_window/emu_window_sdl2_gl.h"
 #include "citra/emu_window/emu_window_sdl2_sw.h"
-#include "citra/emu_window/emu_window_sdl2_vk.h"
 #include "common/common_paths.h"
 #include "common/detached_tasks.h"
 #include "common/file_util.h"
 #include "common/logging/backend.h"
+#include "common/logging/filter.h"
 #include "common/logging/log.h"
 #include "common/scm_rev.h"
 #include "common/scope_exit.h"
@@ -28,15 +28,18 @@
 #include "core/core.h"
 #include "core/dumping/backend.h"
 #include "core/dumping/ffmpeg_backend.h"
+#include "core/file_sys/cia_container.h"
 #include "core/frontend/applets/default_applets.h"
 #include "core/frontend/framebuffer_layout.h"
+#include "core/gdbstub/gdbstub.h"
 #include "core/hle/service/am/am.h"
 #include "core/hle/service/cfg/cfg.h"
+#include "core/loader/loader.h"
 #include "core/movie.h"
-#include "core/telemetry_session.h"
 #include "input_common/main.h"
 #include "network/network.h"
 #include "video_core/renderer_base.h"
+#include "video_core/video_core.h"
 
 #undef _UNICODE
 #include <getopt.h>
@@ -328,7 +331,7 @@ int main(int argc, char** argv) {
     }
 
     auto& system = Core::System::GetInstance();
-    auto& movie = system.Movie();
+    auto& movie = Core::Movie::GetInstance();
 
     if (!movie_record.empty()) {
         movie.PrepareForRecording();
@@ -343,7 +346,7 @@ int main(int argc, char** argv) {
     system.ApplySettings();
 
     // Register frontend applets
-    Frontend::RegisterDefaultApplets(system);
+    Frontend::RegisterDefaultApplets();
 
     EmuWindow_SDL2::InitializeSDL2();
 
@@ -351,14 +354,12 @@ int main(int argc, char** argv) {
                                        bool is_secondary) -> std::unique_ptr<EmuWindow_SDL2> {
         switch (Settings::values.graphics_api.GetValue()) {
         case Settings::GraphicsAPI::OpenGL:
-            return std::make_unique<EmuWindow_SDL2_GL>(system, fullscreen, is_secondary);
-        case Settings::GraphicsAPI::Vulkan:
-            return std::make_unique<EmuWindow_SDL2_VK>(system, fullscreen, is_secondary);
+            return std::make_unique<EmuWindow_SDL2_GL>(fullscreen, is_secondary);
         case Settings::GraphicsAPI::Software:
             return std::make_unique<EmuWindow_SDL2_SW>(system, fullscreen, is_secondary);
         }
         LOG_ERROR(Frontend, "Invalid Graphics API, using OpenGL");
-        return std::make_unique<EmuWindow_SDL2_GL>(system, fullscreen, is_secondary);
+        return std::make_unique<EmuWindow_SDL2_GL>(fullscreen, is_secondary);
     };
 
     const auto emu_window{create_emu_window(fullscreen, false)};

src/citra/config.cpp

@@ -133,10 +133,6 @@ void Config::ReadValues() {
 
     // Renderer
     ReadSetting("Renderer", Settings::values.graphics_api);
-    ReadSetting("Renderer", Settings::values.physical_device);
-    ReadSetting("Renderer", Settings::values.spirv_shader_gen);
-    ReadSetting("Renderer", Settings::values.async_shader_compilation);
-    ReadSetting("Renderer", Settings::values.async_presentation);
     ReadSetting("Renderer", Settings::values.use_gles);
     ReadSetting("Renderer", Settings::values.use_hw_shader);
     ReadSetting("Renderer", Settings::values.shaders_accurate_mul);

src/citra/default_ini.h

@@ -99,7 +99,7 @@ cpu_clock_percentage =
 
 [Renderer]
 # Whether to render using OpenGL or Software
-# 0: Software, 1: OpenGL (default), 2: Vulkan
+# 0: Software, 1: OpenGL (default)
 graphics_api =
 
 # Whether to render using GLES or OpenGL

src/citra/emu_window/emu_window_sdl2.cpp

@@ -109,8 +109,7 @@ void EmuWindow_SDL2::Fullscreen() {
     SDL_MaximizeWindow(render_window);
 }
 
-EmuWindow_SDL2::EmuWindow_SDL2(Core::System& system_, bool is_secondary)
-    : EmuWindow(is_secondary), system(system_) {}
+EmuWindow_SDL2::EmuWindow_SDL2(bool is_secondary) : EmuWindow(is_secondary) {}
 
 EmuWindow_SDL2::~EmuWindow_SDL2() {
     SDL_Quit();
@@ -128,54 +127,16 @@ void EmuWindow_SDL2::InitializeSDL2() {
     SDL_SetMainReady();
 }
 
-u32 EmuWindow_SDL2::GetEventWindowId(const SDL_Event& event) const {
-    switch (event.type) {
-    case SDL_WINDOWEVENT:
-        return event.window.windowID;
-    case SDL_KEYDOWN:
-    case SDL_KEYUP:
-        return event.key.windowID;
-    case SDL_MOUSEMOTION:
-        return event.motion.windowID;
-    case SDL_MOUSEBUTTONDOWN:
-    case SDL_MOUSEBUTTONUP:
-        return event.button.windowID;
-    case SDL_MOUSEWHEEL:
-        return event.wheel.windowID;
-    case SDL_FINGERDOWN:
-    case SDL_FINGERMOTION:
-    case SDL_FINGERUP:
-        return event.tfinger.windowID;
-    case SDL_TEXTEDITING:
-        return event.edit.windowID;
-    case SDL_TEXTEDITING_EXT:
-        return event.editExt.windowID;
-    case SDL_TEXTINPUT:
-        return event.text.windowID;
-    case SDL_DROPBEGIN:
-    case SDL_DROPFILE:
-    case SDL_DROPTEXT:
-    case SDL_DROPCOMPLETE:
-        return event.drop.windowID;
-    case SDL_USEREVENT:
-        return event.user.windowID;
-    default:
-        // Event is not for any particular window, so we can just pretend it's for this one.
-        return render_window_id;
-    }
-}
-
 void EmuWindow_SDL2::PollEvents() {
     SDL_Event event;
     std::vector<SDL_Event> other_window_events;
 
     // SDL_PollEvent returns 0 when there are no more events in the event queue
     while (SDL_PollEvent(&event)) {
-        if (GetEventWindowId(event) != render_window_id) {
+        if (event.window.windowID != render_window_id) {
             other_window_events.push_back(event);
             continue;
         }
-
         switch (event.type) {
         case SDL_WINDOWEVENT:
             switch (event.window.event) {
@@ -241,7 +202,7 @@ void EmuWindow_SDL2::OnMinimalClientAreaChangeRequest(std::pair<u32, u32> minima
 void EmuWindow_SDL2::UpdateFramerateCounter() {
     const u32 current_time = SDL_GetTicks();
     if (current_time > last_time + 2000) {
-        const auto results = system.GetAndResetPerfStats();
+        const auto results = Core::System::GetInstance().GetAndResetPerfStats();
         const auto title =
             fmt::format("Citra {} | {}-{} | FPS: {:.0f} ({:.0f}%)", Common::g_build_fullname,
                         Common::g_scm_branch, Common::g_scm_desc, results.game_fps,

src/citra/emu_window/emu_window_sdl2.h

@@ -8,16 +8,11 @@
 #include "common/common_types.h"
 #include "core/frontend/emu_window.h"
 
-union SDL_Event;
 struct SDL_Window;
 
-namespace Core {
-class System;
-}
-
 class EmuWindow_SDL2 : public Frontend::EmuWindow {
 public:
-    explicit EmuWindow_SDL2(Core::System& system_, bool is_secondary);
+    explicit EmuWindow_SDL2(bool is_secondary);
     ~EmuWindow_SDL2();
 
     /// Initializes SDL2
@@ -36,9 +31,6 @@ public:
     void RequestClose();
 
 protected:
-    /// Gets the ID of the window an event originated from.
-    u32 GetEventWindowId(const SDL_Event& event) const;
-
     /// Called by PollEvents when a key is pressed or released.
     void OnKeyEvent(int key, u8 state);
 
@@ -86,6 +78,4 @@ protected:
 
     /// Keeps track of how often to update the title bar during gameplay
     u32 last_time = 0;
-
-    Core::System& system;
 };

src/citra/emu_window/emu_window_sdl2_gl.cpp

@@ -42,8 +42,8 @@ private:
     SDL_GLContext context;
 };
 
-EmuWindow_SDL2_GL::EmuWindow_SDL2_GL(Core::System& system_, bool fullscreen, bool is_secondary)
-    : EmuWindow_SDL2{system_, is_secondary} {
+EmuWindow_SDL2_GL::EmuWindow_SDL2_GL(bool fullscreen, bool is_secondary)
+    : EmuWindow_SDL2{is_secondary} {
     // Initialize the window
     if (Settings::values.use_gles) {
         SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);

src/citra/emu_window/emu_window_sdl2_gl.h

@@ -9,13 +9,9 @@
 
 struct SDL_Window;
 
-namespace Core {
-class System;
-}
-
 class EmuWindow_SDL2_GL : public EmuWindow_SDL2 {
 public:
-    explicit EmuWindow_SDL2_GL(Core::System& system_, bool fullscreen, bool is_secondary);
+    explicit EmuWindow_SDL2_GL(bool fullscreen, bool is_secondary);
     ~EmuWindow_SDL2_GL();
 
     void Present() override;

src/citra/emu_window/emu_window_sdl2_sw.cpp

@@ -18,7 +18,7 @@
 class DummyContext : public Frontend::GraphicsContext {};
 
 EmuWindow_SDL2_SW::EmuWindow_SDL2_SW(Core::System& system_, bool fullscreen, bool is_secondary)
-    : EmuWindow_SDL2{system_, is_secondary}, system{system_} {
+    : EmuWindow_SDL2{is_secondary}, system{system_} {
     std::string window_title = fmt::format("Citra {} | {}-{}", Common::g_build_fullname,
                                            Common::g_scm_branch, Common::g_scm_desc);
     render_window =

src/citra/emu_window/emu_window_sdl2_vk.cpp

@@ -1,90 +0,0 @@
-// Copyright 2023 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#include <cstdlib>
-#include <memory>
-#include <string>
-#include <SDL.h>
-#include <SDL_syswm.h>
-#include <fmt/format.h>
-#include "citra/emu_window/emu_window_sdl2_vk.h"
-#include "common/logging/log.h"
-#include "common/scm_rev.h"
-#include "core/frontend/emu_window.h"
-
-class DummyContext : public Frontend::GraphicsContext {};
-
-EmuWindow_SDL2_VK::EmuWindow_SDL2_VK(Core::System& system, bool fullscreen, bool is_secondary)
-    : EmuWindow_SDL2{system, is_secondary} {
-    const std::string window_title = fmt::format("Citra {} | {}-{}", Common::g_build_fullname,
-                                                 Common::g_scm_branch, Common::g_scm_desc);
-    render_window =
-        SDL_CreateWindow(window_title.c_str(),
-                         SDL_WINDOWPOS_UNDEFINED, // x position
-                         SDL_WINDOWPOS_UNDEFINED, // y position
-                         Core::kScreenTopWidth, Core::kScreenTopHeight + Core::kScreenBottomHeight,
-                         SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI);
-    SDL_SysWMinfo wm;
-    SDL_VERSION(&wm.version);
-    if (SDL_GetWindowWMInfo(render_window, &wm) == SDL_FALSE) {
-        LOG_CRITICAL(Frontend, "Failed to get information from the window manager");
-        std::exit(EXIT_FAILURE);
-    }
-
-    if (fullscreen) {
-        Fullscreen();
-        SDL_ShowCursor(false);
-    }
-
-    switch (wm.subsystem) {
-#ifdef SDL_VIDEO_DRIVER_WINDOWS
-    case SDL_SYSWM_TYPE::SDL_SYSWM_WINDOWS:
-        window_info.type = Frontend::WindowSystemType::Windows;
-        window_info.render_surface = reinterpret_cast<void*>(wm.info.win.window);
-        break;
-#endif
-#ifdef SDL_VIDEO_DRIVER_X11
-    case SDL_SYSWM_TYPE::SDL_SYSWM_X11:
-        window_info.type = Frontend::WindowSystemType::X11;
-        window_info.display_connection = wm.info.x11.display;
-        window_info.render_surface = reinterpret_cast<void*>(wm.info.x11.window);
-        break;
-#endif
-#ifdef SDL_VIDEO_DRIVER_WAYLAND
-    case SDL_SYSWM_TYPE::SDL_SYSWM_WAYLAND:
-        window_info.type = Frontend::WindowSystemType::Wayland;
-        window_info.display_connection = wm.info.wl.display;
-        window_info.render_surface = wm.info.wl.surface;
-        break;
-#endif
-#ifdef SDL_VIDEO_DRIVER_COCOA
-    case SDL_SYSWM_TYPE::SDL_SYSWM_COCOA:
-        window_info.type = Frontend::WindowSystemType::MacOS;
-        window_info.render_surface = SDL_Metal_GetLayer(SDL_Metal_CreateView(render_window));
-        break;
-#endif
-#ifdef SDL_VIDEO_DRIVER_ANDROID
-    case SDL_SYSWM_TYPE::SDL_SYSWM_ANDROID:
-        window_info.type = Frontend::WindowSystemType::Android;
-        window_info.render_surface = reinterpret_cast<void*>(wm.info.android.window);
-        break;
-#endif
-    default:
-        LOG_CRITICAL(Frontend, "Window manager subsystem {} not implemented", wm.subsystem);
-        std::exit(EXIT_FAILURE);
-        break;
-    }
-
-    render_window_id = SDL_GetWindowID(render_window);
-
-    OnResize();
-    OnMinimalClientAreaChangeRequest(GetActiveConfig().min_client_area_size);
-    SDL_PumpEvents();
-}
-
-EmuWindow_SDL2_VK::~EmuWindow_SDL2_VK() = default;
-
-std::unique_ptr<Frontend::GraphicsContext> EmuWindow_SDL2_VK::CreateSharedContext() const {
-    return std::make_unique<DummyContext>();
-}

src/citra/emu_window/emu_window_sdl2_vk.h

@@ -1,24 +0,0 @@
-// Copyright 2023 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include <memory>
-#include "citra/emu_window/emu_window_sdl2.h"
-
-namespace Frontend {
-class GraphicsContext;
-}
-
-namespace Core {
-class System;
-}
-
-class EmuWindow_SDL2_VK final : public EmuWindow_SDL2 {
-public:
-    explicit EmuWindow_SDL2_VK(Core::System& system_, bool fullscreen, bool is_secondary);
-    ~EmuWindow_SDL2_VK() override;
-
-    std::unique_ptr<Frontend::GraphicsContext> CreateSharedContext() const override;
-};

src/citra_qt/CMakeLists.txt

@@ -185,8 +185,6 @@ add_executable(citra-qt
     util/spinbox.h
     util/util.cpp
     util/util.h
-    util/vk_device_info.cpp
-    util/vk_device_info.h
 )
 
 file(GLOB COMPAT_LIST
@@ -344,7 +342,7 @@ if (USE_DISCORD_PRESENCE)
 endif()
 
 if (ENABLE_WEB_SERVICE)
-    target_link_libraries(citra-qt PRIVATE web_service)
+    target_compile_definitions(citra-qt PRIVATE -DENABLE_WEB_SERVICE)
 endif()
 
 if(UNIX AND NOT APPLE)

src/citra_qt/applets/mii_selector.cpp

@@ -67,5 +67,6 @@ void QtMiiSelector::OpenDialog() {
              dialog.return_code, index);
 
     const auto mii_data = dialog.miis.at(index);
-    Finalize(dialog.return_code, dialog.return_code == 0 ? std::move(mii_data) : Mii::MiiData{});
+    Finalize(dialog.return_code,
+             dialog.return_code == 0 ? std::move(mii_data) : HLE::Applets::MiiData{});
 }

src/citra_qt/applets/mii_selector.h

@@ -24,7 +24,7 @@ private:
     QVBoxLayout* layout;
     QtMiiSelector* mii_selector;
     u32 return_code = 0;
-    std::vector<Mii::MiiData> miis;
+    std::vector<HLE::Applets::MiiData> miis;
 
     friend class QtMiiSelector;
 };

src/citra_qt/bootmanager.cpp

@@ -44,8 +44,7 @@
 
 static Frontend::WindowSystemType GetWindowSystemType();
 
-EmuThread::EmuThread(Core::System& system_, Frontend::GraphicsContext& core_context)
-    : system{system_}, core_context(core_context) {}
+EmuThread::EmuThread(Frontend::GraphicsContext& core_context) : core_context(core_context) {}
 
 EmuThread::~EmuThread() = default;
 
@@ -63,6 +62,7 @@ static GMainWindow* GetMainWindow() {
 void EmuThread::run() {
     MicroProfileOnThreadCreate("EmuThread");
     const auto scope = core_context.Acquire();
+    Core::System& system = Core::System::GetInstance();
 
     if (Settings::values.preload_textures) {
         emit LoadProgress(VideoCore::LoadCallbackStage::Preload, 0, 0);
@@ -107,7 +107,7 @@ void EmuThread::run() {
             }
             if (result != Core::System::ResultStatus::Success) {
                 this->SetRunning(false);
-                emit ErrorThrown(result, system.GetStatusDetails());
+                emit ErrorThrown(result, Core::System::GetInstance().GetStatusDetails());
             }
 
             was_active = running || exec_step;
@@ -229,17 +229,27 @@ class RenderWidget : public QWidget {
 public:
     RenderWidget(GRenderWindow* parent) : QWidget(parent) {
         setMouseTracking(true);
-        update();
     }
 
     virtual ~RenderWidget() = default;
+
+    virtual void Present() {}
+
+    void paintEvent(QPaintEvent* event) override {
+        Present();
+        update();
+    }
+
+    std::pair<unsigned, unsigned> GetSize() const {
+        return std::make_pair(width(), height());
+    }
 };
 
 #ifdef HAS_OPENGL
 class OpenGLRenderWidget : public RenderWidget {
 public:
-    explicit OpenGLRenderWidget(GRenderWindow* parent, Core::System& system_, bool is_secondary)
-        : RenderWidget(parent), system(system_), is_secondary(is_secondary) {
+    explicit OpenGLRenderWidget(GRenderWindow* parent, bool is_secondary)
+        : RenderWidget(parent), is_secondary(is_secondary) {
         setAttribute(Qt::WA_NativeWindow);
         setAttribute(Qt::WA_PaintOnScreen);
         if (GetWindowSystemType() == Frontend::WindowSystemType::Wayland) {
@@ -252,11 +262,11 @@ public:
         context = std::move(context_);
     }
 
-    void Present() {
+    void Present() override {
         if (!isVisible()) {
             return;
         }
-        if (!system.IsPoweredOn()) {
+        if (!Core::System::GetInstance().IsPoweredOn()) {
             return;
         }
         context->MakeCurrent();
@@ -268,47 +278,25 @@ public:
         glFinish();
     }
 
-    void paintEvent(QPaintEvent* event) override {
-        Present();
-        update();
-    }
-
     QPaintEngine* paintEngine() const override {
         return nullptr;
     }
 
 private:
     std::unique_ptr<Frontend::GraphicsContext> context{};
-    Core::System& system;
     bool is_secondary;
 };
 #endif
 
-class VulkanRenderWidget : public RenderWidget {
-public:
-    explicit VulkanRenderWidget(GRenderWindow* parent) : RenderWidget(parent) {
-        setAttribute(Qt::WA_NativeWindow);
-        setAttribute(Qt::WA_PaintOnScreen);
-        if (GetWindowSystemType() == Frontend::WindowSystemType::Wayland) {
-            setAttribute(Qt::WA_DontCreateNativeAncestors);
-        }
-        windowHandle()->setSurfaceType(QWindow::VulkanSurface);
-    }
-
-    QPaintEngine* paintEngine() const override {
-        return nullptr;
-    }
-};
-
 struct SoftwareRenderWidget : public RenderWidget {
     explicit SoftwareRenderWidget(GRenderWindow* parent, Core::System& system_)
         : RenderWidget(parent), system(system_) {}
 
-    void Present() {
+    void Present() override {
         if (!isVisible()) {
             return;
         }
-        if (!system.IsPoweredOn()) {
+        if (!Core::System::GetInstance().IsPoweredOn()) {
             return;
         }
 
@@ -334,11 +322,6 @@ struct SoftwareRenderWidget : public RenderWidget {
         painter.end();
     }
 
-    void paintEvent(QPaintEvent* event) override {
-        Present();
-        update();
-    }
-
     QImage LoadFramebuffer(VideoCore::ScreenId screen_id) {
         const auto& renderer = static_cast<SwRenderer::RendererSoftware&>(system.Renderer());
         const auto& info = renderer.Screen(screen_id);
@@ -403,6 +386,10 @@ GRenderWindow::GRenderWindow(QWidget* parent_, EmuThread* emu_thread_, Core::Sys
                              bool is_secondary_)
     : QWidget(parent_), EmuWindow(is_secondary_), emu_thread(emu_thread_), system{system_} {
 
+    setWindowTitle(QStringLiteral("Citra %1 | %2-%3")
+                       .arg(QString::fromUtf8(Common::g_build_name),
+                            QString::fromUtf8(Common::g_scm_branch),
+                            QString::fromUtf8(Common::g_scm_desc)));
     setAttribute(Qt::WA_AcceptTouchEvents);
     auto layout = new QHBoxLayout(this);
     layout->setContentsMargins(0, 0, 0, 0);
@@ -617,9 +604,6 @@ bool GRenderWindow::InitRenderTarget() {
             return false;
         }
         break;
-    case Settings::GraphicsAPI::Vulkan:
-        InitializeVulkan();
-        break;
     }
 
     // Update the Window System information with the new render target
@@ -682,7 +666,7 @@ bool GRenderWindow::InitializeOpenGL() {
 
     // TODO: One of these flags might be interesting: WA_OpaquePaintEvent, WA_NoBackground,
     // WA_DontShowOnScreen, WA_DeleteOnClose
-    auto child = new OpenGLRenderWidget(this, system, is_secondary);
+    auto child = new OpenGLRenderWidget(this, is_secondary);
     child_widget = child;
     child_widget->windowHandle()->create();
 
@@ -705,13 +689,6 @@ bool GRenderWindow::InitializeOpenGL() {
 #endif
 }
 
-void GRenderWindow::InitializeVulkan() {
-    auto child = new VulkanRenderWidget(this);
-    child_widget = child;
-    child_widget->windowHandle()->create();
-    main_context = std::make_unique<DummyContext>();
-}
-
 void GRenderWindow::InitializeSoftware() {
     child_widget = new SoftwareRenderWidget(this, system);
     main_context = std::make_unique<DummyContext>();

src/citra_qt/bootmanager.h

@@ -18,10 +18,6 @@ class QTouchEvent;
 
 class GRenderWindow;
 
-namespace Core {
-class System;
-}
-
 namespace VideoCore {
 enum class LoadCallbackStage;
 }
@@ -30,7 +26,7 @@ class EmuThread final : public QThread {
     Q_OBJECT
 
 public:
-    explicit EmuThread(Core::System& system_, Frontend::GraphicsContext& context);
+    explicit EmuThread(Frontend::GraphicsContext& context);
     ~EmuThread() override;
 
     /**
@@ -84,7 +80,6 @@ private:
     std::mutex running_mutex;
     std::condition_variable running_cv;
 
-    Core::System& system;
     Frontend::GraphicsContext& core_context;
 
 signals:
@@ -187,7 +182,6 @@ private:
     void OnMinimalClientAreaChangeRequest(std::pair<u32, u32> minimal_size) override;
 
     bool InitializeOpenGL();
-    void InitializeVulkan();
     void InitializeSoftware();
     bool LoadOpenGL();
 

src/citra_qt/compatdb.cpp

@@ -9,12 +9,11 @@
 #include "citra_qt/compatdb.h"
 #include "common/telemetry.h"
 #include "core/core.h"
-#include "core/telemetry_session.h"
 #include "ui_compatdb.h"
 
-CompatDB::CompatDB(Core::TelemetrySession& telemetry_session_, QWidget* parent)
+CompatDB::CompatDB(QWidget* parent)
     : QWizard(parent, Qt::WindowTitleHint | Qt::WindowCloseButtonHint | Qt::WindowSystemMenuHint),
-      ui{std::make_unique<Ui::CompatDB>()}, telemetry_session{telemetry_session_} {
+      ui{std::make_unique<Ui::CompatDB>()} {
     ui->setupUi(this);
     connect(ui->radioButton_Perfect, &QRadioButton::clicked, this, &CompatDB::EnableNext);
     connect(ui->radioButton_Great, &QRadioButton::clicked, this, &CompatDB::EnableNext);
@@ -52,15 +51,16 @@ void CompatDB::Submit() {
     case CompatDBPage::Final:
         back();
         LOG_DEBUG(Frontend, "Compatibility Rating: {}", compatibility->checkedId());
-        telemetry_session.AddField(Common::Telemetry::FieldType::UserFeedback, "Compatibility",
+        Core::System::GetInstance().TelemetrySession().AddField(
+            Common::Telemetry::FieldType::UserFeedback, "Compatibility",
             compatibility->checkedId());
 
         button(NextButton)->setEnabled(false);
         button(NextButton)->setText(tr("Submitting"));
         button(CancelButton)->setVisible(false);
 
-        testcase_watcher.setFuture(
-            QtConcurrent::run([this] { return telemetry_session.SubmitTestcase(); }));
+        testcase_watcher.setFuture(QtConcurrent::run(
+            [] { return Core::System::GetInstance().TelemetrySession().SubmitTestcase(); }));
         break;
     default:
         LOG_ERROR(Frontend, "Unexpected page: {}", currentId());

src/citra_qt/compatdb.h

@@ -8,10 +8,6 @@
 #include <QFutureWatcher>
 #include <QWizard>
 
-namespace Core {
-class TelemetrySession;
-}
-
 namespace Ui {
 class CompatDB;
 }
@@ -20,7 +16,7 @@ class CompatDB : public QWizard {
     Q_OBJECT
 
 public:
-    explicit CompatDB(Core::TelemetrySession& telemetry_session_, QWidget* parent = nullptr);
+    explicit CompatDB(QWidget* parent = nullptr);
     ~CompatDB();
 
 private:
@@ -31,6 +27,4 @@ private:
     void Submit();
     void OnTestcaseSubmitted();
     void EnableNext();
-
-    Core::TelemetrySession& telemetry_session;
 };

src/citra_qt/configuration/config.cpp

@@ -29,7 +29,7 @@ Config::~Config() {
 const std::array<int, Settings::NativeButton::NumButtons> Config::default_buttons = {
     Qt::Key_A, Qt::Key_S, Qt::Key_Z, Qt::Key_X, Qt::Key_T, Qt::Key_G,
     Qt::Key_F, Qt::Key_H, Qt::Key_Q, Qt::Key_W, Qt::Key_M, Qt::Key_N,
-    Qt::Key_O, Qt::Key_P, Qt::Key_1, Qt::Key_2, Qt::Key_B, Qt::Key_V,
+    Qt::Key_O, Qt::Key_P, Qt::Key_1, Qt::Key_2, Qt::Key_B,
 };
 
 const std::array<std::array<int, 5>, Settings::NativeAnalog::NumAnalogs> Config::default_analogs{{
@@ -483,7 +483,6 @@ void Config::ReadDebuggingValues() {
     ReadBasicSetting(Settings::values.use_gdbstub);
     ReadBasicSetting(Settings::values.gdbstub_port);
     ReadBasicSetting(Settings::values.renderer_debug);
-    ReadBasicSetting(Settings::values.dump_command_buffers);
 
     qt_config->beginGroup(QStringLiteral("LLE"));
     for (const auto& service_module : Service::service_module_map) {
@@ -628,10 +627,6 @@ void Config::ReadRendererValues() {
     qt_config->beginGroup(QStringLiteral("Renderer"));
 
     ReadGlobalSetting(Settings::values.graphics_api);
-    ReadGlobalSetting(Settings::values.physical_device);
-    ReadGlobalSetting(Settings::values.spirv_shader_gen);
-    ReadGlobalSetting(Settings::values.async_shader_compilation);
-    ReadGlobalSetting(Settings::values.async_presentation);
     ReadGlobalSetting(Settings::values.use_hw_shader);
     ReadGlobalSetting(Settings::values.shaders_accurate_mul);
     ReadGlobalSetting(Settings::values.use_disk_shader_cache);
@@ -777,11 +772,6 @@ void Config::ReadUIGameListValues() {
     ReadBasicSetting(UISettings::values.game_list_hide_no_icon);
     ReadBasicSetting(UISettings::values.game_list_single_line_mode);
 
-    ReadBasicSetting(UISettings::values.show_compat_column);
-    ReadBasicSetting(UISettings::values.show_region_column);
-    ReadBasicSetting(UISettings::values.show_type_column);
-    ReadBasicSetting(UISettings::values.show_size_column);
-
     qt_config->endGroup();
 }
 
@@ -1112,10 +1102,6 @@ void Config::SaveRendererValues() {
     qt_config->beginGroup(QStringLiteral("Renderer"));
 
     WriteGlobalSetting(Settings::values.graphics_api);
-    WriteGlobalSetting(Settings::values.physical_device);
-    WriteGlobalSetting(Settings::values.spirv_shader_gen);
-    WriteGlobalSetting(Settings::values.async_shader_compilation);
-    WriteGlobalSetting(Settings::values.async_presentation);
     WriteGlobalSetting(Settings::values.use_hw_shader);
     WriteGlobalSetting(Settings::values.shaders_accurate_mul);
     WriteGlobalSetting(Settings::values.use_disk_shader_cache);
@@ -1244,11 +1230,6 @@ void Config::SaveUIGameListValues() {
     WriteBasicSetting(UISettings::values.game_list_hide_no_icon);
     WriteBasicSetting(UISettings::values.game_list_single_line_mode);
 
-    WriteBasicSetting(UISettings::values.show_compat_column);
-    WriteBasicSetting(UISettings::values.show_region_column);
-    WriteBasicSetting(UISettings::values.show_type_column);
-    WriteBasicSetting(UISettings::values.show_size_column);
-
     qt_config->endGroup();
 }
 

src/citra_qt/configuration/configure.ui

@@ -21,8 +21,68 @@
      <item>
       <widget class="QTabWidget" name="tabWidget">
        <property name="currentIndex">
-        <number>-1</number>
+        <number>0</number>
        </property>
+       <widget class="ConfigureGeneral" name="generalTab">
+        <attribute name="title">
+         <string>General</string>
+        </attribute>
+       </widget>
+       <widget class="ConfigureSystem" name="systemTab">
+        <attribute name="title">
+         <string>System</string>
+        </attribute>
+       </widget>
+       <widget class="ConfigureInput" name="inputTab">
+        <attribute name="title">
+         <string>Input</string>
+        </attribute>
+       </widget>
+       <widget class="ConfigureHotkeys" name="hotkeysTab">
+        <attribute name="title">
+         <string>Hotkeys</string>
+        </attribute>
+       </widget>
+       <widget class="ConfigureGraphics" name="graphicsTab">
+        <attribute name="title">
+         <string>Graphics</string>
+        </attribute>
+       </widget>
+       <widget class="ConfigureEnhancements" name="enhancementsTab">
+         <attribute name="title">
+           <string>Enhancements</string>
+         </attribute>
+       </widget>
+       <widget class="ConfigureAudio" name="audioTab">
+        <attribute name="title">
+         <string>Audio</string>
+        </attribute>
+       </widget>
+       <widget class="ConfigureCamera" name="cameraTab">
+        <attribute name="title">
+         <string>Camera</string>
+        </attribute>
+       </widget>
+       <widget class="ConfigureDebug" name="debugTab">
+        <attribute name="title">
+         <string>Debug</string>
+        </attribute>
+       </widget>
+       <widget class="ConfigureStorage" name="storageTab">
+        <attribute name="title">
+         <string>Storage</string>
+        </attribute>
+       </widget>
+       <widget class="ConfigureWeb" name="webTab">
+        <attribute name="title">
+         <string>Web</string>
+        </attribute>
+       </widget>
+       <widget class="ConfigureUi" name="uiTab">
+        <attribute name="title">
+         <string>UI</string>
+        </attribute>
+       </widget>
       </widget>
      </item>
     </layout>

src/citra_qt/configuration/configure_audio.cpp

@@ -10,13 +10,14 @@
 #include "citra_qt/configuration/configuration_shared.h"
 #include "citra_qt/configuration/configure_audio.h"
 #include "common/settings.h"
+#include "core/core.h"
 #include "ui_configure_audio.h"
 
 #if defined(__APPLE__)
 #include "common/apple_authorization.h"
 #endif
 
-ConfigureAudio::ConfigureAudio(bool is_powered_on, QWidget* parent)
+ConfigureAudio::ConfigureAudio(QWidget* parent)
     : QWidget(parent), ui(std::make_unique<Ui::ConfigureAudio>()) {
     ui->setupUi(this);
 
@@ -26,7 +27,8 @@ ConfigureAudio::ConfigureAudio(bool is_powered_on, QWidget* parent)
             AudioCore::GetSinkName(static_cast<AudioCore::SinkType>(type)).data()));
     }
 
-    ui->emulation_combo_box->setEnabled(!is_powered_on);
+    const bool is_running = Core::System::GetInstance().IsPoweredOn();
+    ui->emulation_combo_box->setEnabled(!is_running);
 
     connect(ui->volume_slider, &QSlider::valueChanged, this,
             &ConfigureAudio::SetVolumeIndicatorText);

src/citra_qt/configuration/configure_audio.h

@@ -19,7 +19,7 @@ class ConfigureAudio : public QWidget {
     Q_OBJECT
 
 public:
-    explicit ConfigureAudio(bool is_powered_on, QWidget* parent = nullptr);
+    explicit ConfigureAudio(QWidget* parent = nullptr);
     ~ConfigureAudio() override;
 
     void ApplyConfiguration();

src/citra_qt/configuration/configure_camera.cpp

@@ -47,7 +47,8 @@ ConfigureCamera::~ConfigureCamera() {
 }
 
 void ConfigureCamera::ConnectEvents() {
-    connect(ui->image_source, qOverload<int>(&QComboBox::currentIndexChanged), this,
+    connect(ui->image_source,
+            static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this,
             [this](int index) {
                 StopPreviewing();
                 UpdateImageSourceUI();
@@ -57,7 +58,8 @@ void ConfigureCamera::ConnectEvents() {
                 }
 #endif
             });
-    connect(ui->camera_selection, qOverload<int>(&QComboBox::currentIndexChanged), this, [this] {
+    connect(ui->camera_selection,
+            static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, [this] {
                 StopPreviewing();
                 if (GetCameraSelection() != current_selected) {
                     RecordConfig();
@@ -71,13 +73,15 @@ void ConfigureCamera::ConnectEvents() {
                 UpdateCameraMode();
                 SetConfiguration();
             });
-    connect(ui->camera_mode, qOverload<int>(&QComboBox::currentIndexChanged), this, [this] {
+    connect(ui->camera_mode, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+            this, [this] {
                 StopPreviewing();
                 ui->camera_position_label->setVisible(ui->camera_mode->currentIndex() == 1);
                 ui->camera_position->setVisible(ui->camera_mode->currentIndex() == 1);
                 current_selected = GetCameraSelection();
             });
-    connect(ui->camera_position, qOverload<int>(&QComboBox::currentIndexChanged), this, [this] {
+    connect(ui->camera_position,
+            static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, [this] {
                 StopPreviewing();
                 if (GetCameraSelection() != current_selected) {
                     RecordConfig();

src/citra_qt/configuration/configure_cheats.cpp

@@ -11,8 +11,10 @@
 #include "core/cheats/gateway_cheat.h"
 #include "ui_configure_cheats.h"
 
-ConfigureCheats::ConfigureCheats(Core::System& system, u64 title_id_, QWidget* parent)
-    : QWidget(parent), ui(std::make_unique<Ui::ConfigureCheats>()), title_id{title_id_} {
+ConfigureCheats::ConfigureCheats(Cheats::CheatEngine& cheat_engine_, u64 title_id_, QWidget* parent)
+    : QWidget(parent),
+      ui(std::make_unique<Ui::ConfigureCheats>()), cheat_engine{cheat_engine_}, title_id{
+                                                                                    title_id_} {
     // Setup gui control settings
     ui->setupUi(this);
     ui->tableCheats->setColumnWidth(0, 30);
@@ -34,15 +36,14 @@ ConfigureCheats::ConfigureCheats(Core::System& system, u64 title_id_, QWidget* p
             [this] { SaveCheat(ui->tableCheats->currentRow()); });
     connect(ui->buttonDelete, &QPushButton::clicked, this, &ConfigureCheats::OnDeleteCheat);
 
-    cheat_engine = std::make_unique<Cheats::CheatEngine>(title_id, system);
-
+    cheat_engine.LoadCheatFile(title_id);
     LoadCheats();
 }
 
 ConfigureCheats::~ConfigureCheats() = default;
 
 void ConfigureCheats::LoadCheats() {
-    cheats = cheat_engine->GetCheats();
+    cheats = cheat_engine.GetCheats();
     const int cheats_count = static_cast<int>(cheats.size());
 
     ui->tableCheats->setRowCount(cheats_count);
@@ -106,12 +107,12 @@ bool ConfigureCheats::SaveCheat(int row) {
                                                         ui->textNotes->toPlainText().toStdString());
 
     if (newly_created) {
-        cheat_engine->AddCheat(cheat);
+        cheat_engine.AddCheat(std::move(cheat));
         newly_created = false;
     } else {
-        cheat_engine->UpdateCheat(row, cheat);
+        cheat_engine.UpdateCheat(row, std::move(cheat));
     }
-    cheat_engine->SaveCheatFile();
+    cheat_engine.SaveCheatFile(title_id);
 
     int previous_row = ui->tableCheats->currentRow();
     int previous_col = ui->tableCheats->currentColumn();
@@ -161,7 +162,7 @@ void ConfigureCheats::OnCheckChanged(int state) {
     const QCheckBox* checkbox = qobject_cast<QCheckBox*>(sender());
     int row = static_cast<int>(checkbox->property("row").toInt());
     cheats[row]->SetEnabled(state);
-    cheat_engine->SaveCheatFile();
+    cheat_engine.SaveCheatFile(title_id);
 }
 
 void ConfigureCheats::OnTextEdited() {
@@ -173,8 +174,8 @@ void ConfigureCheats::OnDeleteCheat() {
     if (newly_created) {
         newly_created = false;
     } else {
-        cheat_engine->RemoveCheat(ui->tableCheats->currentRow());
-        cheat_engine->SaveCheatFile();
+        cheat_engine.RemoveCheat(ui->tableCheats->currentRow());
+        cheat_engine.SaveCheatFile(title_id);
     }
 
     LoadCheats();

src/citra_qt/configuration/configure_cheats.h

@@ -5,6 +5,7 @@
 #pragma once
 
 #include <memory>
+#include <span>
 #include <QWidget>
 #include "common/common_types.h"
 
@@ -13,10 +14,6 @@ class CheatBase;
 class CheatEngine;
 } // namespace Cheats
 
-namespace Core {
-class System;
-}
-
 namespace Ui {
 class ConfigureCheats;
 } // namespace Ui
@@ -25,7 +22,8 @@ class ConfigureCheats : public QWidget {
     Q_OBJECT
 
 public:
-    explicit ConfigureCheats(Core::System& system, u64 title_id, QWidget* parent = nullptr);
+    explicit ConfigureCheats(Cheats::CheatEngine& cheat_engine, u64 title_id_,
+                             QWidget* parent = nullptr);
     ~ConfigureCheats();
     bool ApplyConfiguration();
 
@@ -58,9 +56,9 @@ private slots:
 
 private:
     std::unique_ptr<Ui::ConfigureCheats> ui;
-    std::vector<std::shared_ptr<Cheats::CheatBase>> cheats;
+    Cheats::CheatEngine& cheat_engine;
+    std::span<const std::shared_ptr<Cheats::CheatBase>> cheats;
     bool edited = false, newly_created = false;
     int last_row = -1, last_col = -1;
     u64 title_id;
-    std::unique_ptr<Cheats::CheatEngine> cheat_engine;
 };

src/citra_qt/configuration/configure_debug.cpp

@@ -3,7 +3,6 @@
 // Refer to the license.txt file included.
 
 #include <QDesktopServices>
-#include <QMessageBox>
 #include <QUrl>
 #include "citra_qt/configuration/configuration_shared.h"
 #include "citra_qt/configuration/configure_debug.h"
@@ -12,8 +11,8 @@
 #include "common/file_util.h"
 #include "common/logging/backend.h"
 #include "common/settings.h"
+#include "core/core.h"
 #include "ui_configure_debug.h"
-#include "video_core/renderer_vulkan/vk_instance.h"
 
 // The QSlider doesn't have an easy way to set a custom step amount,
 // so we can just convert from the sliders range (0 - 79) to the expected
@@ -26,8 +25,8 @@ static constexpr int SettingsToSlider(int value) {
     return (value - 5) / 5;
 }
 
-ConfigureDebug::ConfigureDebug(bool is_powered_on_, QWidget* parent)
-    : QWidget(parent), ui(std::make_unique<Ui::ConfigureDebug>()), is_powered_on{is_powered_on_} {
+ConfigureDebug::ConfigureDebug(QWidget* parent)
+    : QWidget(parent), ui(std::make_unique<Ui::ConfigureDebug>()) {
     ui->setupUi(this);
     SetConfiguration();
 
@@ -36,39 +35,9 @@ ConfigureDebug::ConfigureDebug(bool is_powered_on_, QWidget* parent)
         QDesktopServices::openUrl(QUrl::fromLocalFile(path));
     });
 
-    connect(ui->toggle_renderer_debug, &QCheckBox::clicked, this, [this](bool checked) {
-        if (checked && Settings::values.graphics_api.GetValue() == Settings::GraphicsAPI::Vulkan) {
-            try {
-                Vulkan::Instance debug_inst{true};
-            } catch (vk::LayerNotPresentError&) {
-                ui->toggle_renderer_debug->toggle();
-                QMessageBox::warning(this, tr("Validation layer not available"),
-                                     tr("Unable to enable debug renderer because the layer "
-                                        "<strong>VK_LAYER_KHRONOS_validation</strong> is missing. "
-                                        "Please install the Vulkan SDK or the appropriate package "
-                                        "of your distribution"));
-            }
-        }
-    });
-
-    connect(ui->toggle_dump_command_buffers, &QCheckBox::clicked, this, [this](bool checked) {
-        if (checked && Settings::values.graphics_api.GetValue() == Settings::GraphicsAPI::Vulkan) {
-            try {
-                Vulkan::Instance debug_inst{false, true};
-            } catch (vk::LayerNotPresentError&) {
-                ui->toggle_dump_command_buffers->toggle();
-                QMessageBox::warning(this, tr("Command buffer dumping not available"),
-                                     tr("Unable to enable command buffer dumping because the layer "
-                                        "<strong>VK_LAYER_LUNARG_api_dump</strong> is missing. "
-                                        "Please install the Vulkan SDK or the appropriate package "
-                                        "of your distribution"));
-            }
-        }
-    });
-
+    const bool is_powered_on = Core::System::GetInstance().IsPoweredOn();
     ui->toggle_cpu_jit->setEnabled(!is_powered_on);
     ui->toggle_renderer_debug->setEnabled(!is_powered_on);
-    ui->toggle_dump_command_buffers->setEnabled(!is_powered_on);
 
     // Set a minimum width for the label to prevent the slider from changing size.
     // This scales across DPIs. (This value should be enough for "xxx%")
@@ -90,12 +59,11 @@ void ConfigureDebug::SetConfiguration() {
     ui->toggle_gdbstub->setChecked(Settings::values.use_gdbstub.GetValue());
     ui->gdbport_spinbox->setEnabled(Settings::values.use_gdbstub.GetValue());
     ui->gdbport_spinbox->setValue(Settings::values.gdbstub_port.GetValue());
-    ui->toggle_console->setEnabled(!is_powered_on);
+    ui->toggle_console->setEnabled(!Core::System::GetInstance().IsPoweredOn());
     ui->toggle_console->setChecked(UISettings::values.show_console.GetValue());
     ui->log_filter_edit->setText(QString::fromStdString(Settings::values.log_filter.GetValue()));
     ui->toggle_cpu_jit->setChecked(Settings::values.use_cpu_jit.GetValue());
     ui->toggle_renderer_debug->setChecked(Settings::values.renderer_debug.GetValue());
-    ui->toggle_dump_command_buffers->setChecked(Settings::values.dump_command_buffers.GetValue());
 
     if (!Settings::IsConfiguringGlobal()) {
         if (Settings::values.cpu_clock_percentage.UsingGlobal()) {
@@ -126,7 +94,6 @@ void ConfigureDebug::ApplyConfiguration() {
     Common::Log::SetGlobalFilter(filter);
     Settings::values.use_cpu_jit = ui->toggle_cpu_jit->isChecked();
     Settings::values.renderer_debug = ui->toggle_renderer_debug->isChecked();
-    Settings::values.dump_command_buffers = ui->toggle_dump_command_buffers->isChecked();
 
     ConfigurationShared::ApplyPerGameSetting(
         &Settings::values.cpu_clock_percentage, ui->clock_speed_combo,

src/citra_qt/configuration/configure_debug.h

@@ -15,7 +15,7 @@ class ConfigureDebug : public QWidget {
     Q_OBJECT
 
 public:
-    explicit ConfigureDebug(bool is_powered_on, QWidget* parent = nullptr);
+    explicit ConfigureDebug(QWidget* parent = nullptr);
     ~ConfigureDebug() override;
 
     void ApplyConfiguration();
@@ -25,5 +25,4 @@ public:
 
 private:
     std::unique_ptr<Ui::ConfigureDebug> ui;
-    bool is_powered_on;
 };

src/citra_qt/configuration/configure_debug.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>523</width>
-    <height>458</height>
+    <height>447</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -112,6 +112,16 @@
       <string>CPU</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
+      <item row="2" column="0">
+       <widget class="QCheckBox" name="toggle_cpu_jit">
+        <property name="toolTip">
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enables the use of the ARM JIT compiler for emulating the 3DS CPUs. Don't disable unless for debugging purposes&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        </property>
+        <property name="text">
+         <string>Enable CPU JIT</string>
+        </property>
+       </widget>
+      </item>
       <item row="1" column="0">
        <widget class="QWidget" name="clock_speed_widget" native="true">
         <layout class="QHBoxLayout" name="clock_speed_layout">
@@ -192,16 +202,6 @@
         </layout>
        </widget>
       </item>
-      <item row="2" column="0">
-       <widget class="QCheckBox" name="toggle_cpu_jit">
-        <property name="toolTip">
-         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enables the use of the ARM JIT compiler for emulating the 3DS CPUs. Don't disable unless for debugging purposes&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-        </property>
-        <property name="text">
-         <string>Enable CPU JIT</string>
-        </property>
-       </widget>
-      </item>
       <item row="3" column="0">
        <widget class="QCheckBox" name="toggle_renderer_debug">
         <property name="text">
@@ -209,13 +209,6 @@
         </property>
        </widget>
       </item>
-      <item row="4" column="0">
-       <widget class="QCheckBox" name="toggle_dump_command_buffers">
-        <property name="text">
-         <string>Dump command buffers</string>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>

src/citra_qt/configuration/configure_dialog.cpp

@@ -4,62 +4,26 @@
 
 #include <map>
 #include <QListWidgetItem>
-#include "citra_qt/configuration/configure_audio.h"
-#include "citra_qt/configuration/configure_camera.h"
-#include "citra_qt/configuration/configure_debug.h"
+#include "citra_qt/configuration/config.h"
 #include "citra_qt/configuration/configure_dialog.h"
-#include "citra_qt/configuration/configure_enhancements.h"
-#include "citra_qt/configuration/configure_general.h"
-#include "citra_qt/configuration/configure_graphics.h"
-#include "citra_qt/configuration/configure_hotkeys.h"
-#include "citra_qt/configuration/configure_input.h"
-#include "citra_qt/configuration/configure_storage.h"
-#include "citra_qt/configuration/configure_system.h"
-#include "citra_qt/configuration/configure_ui.h"
-#include "citra_qt/configuration/configure_web.h"
 #include "citra_qt/hotkeys.h"
 #include "common/settings.h"
 #include "core/core.h"
 #include "ui_configure.h"
 
 ConfigureDialog::ConfigureDialog(QWidget* parent, HotkeyRegistry& registry_, Core::System& system_,
-                                 std::span<const QString> physical_devices, bool enable_web_config)
+                                 bool enable_web_config)
     : QDialog(parent), ui{std::make_unique<Ui::ConfigureDialog>()}, registry{registry_},
-      system{system_}, is_powered_on{system.IsPoweredOn()},
-      general_tab{std::make_unique<ConfigureGeneral>(this)},
-      system_tab{std::make_unique<ConfigureSystem>(system, this)},
-      input_tab{std::make_unique<ConfigureInput>(this)},
-      hotkeys_tab{std::make_unique<ConfigureHotkeys>(this)},
-      graphics_tab{std::make_unique<ConfigureGraphics>(physical_devices, is_powered_on, this)},
-      enhancements_tab{std::make_unique<ConfigureEnhancements>(this)},
-      audio_tab{std::make_unique<ConfigureAudio>(is_powered_on, this)},
-      camera_tab{std::make_unique<ConfigureCamera>(this)},
-      debug_tab{std::make_unique<ConfigureDebug>(is_powered_on, this)},
-      storage_tab{std::make_unique<ConfigureStorage>(is_powered_on, this)},
-      web_tab{std::make_unique<ConfigureWeb>(this)}, ui_tab{std::make_unique<ConfigureUi>(this)} {
+      system{system_} {
     Settings::SetConfiguringGlobal(true);
 
     ui->setupUi(this);
-
-    ui->tabWidget->addTab(general_tab.get(), tr("General"));
-    ui->tabWidget->addTab(system_tab.get(), tr("System"));
-    ui->tabWidget->addTab(input_tab.get(), tr("Input"));
-    ui->tabWidget->addTab(hotkeys_tab.get(), tr("Hotkeys"));
-    ui->tabWidget->addTab(graphics_tab.get(), tr("Graphics"));
-    ui->tabWidget->addTab(enhancements_tab.get(), tr("Enhancements"));
-    ui->tabWidget->addTab(audio_tab.get(), tr("Audio"));
-    ui->tabWidget->addTab(camera_tab.get(), tr("Camera"));
-    ui->tabWidget->addTab(debug_tab.get(), tr("Debug"));
-    ui->tabWidget->addTab(storage_tab.get(), tr("Storage"));
-    ui->tabWidget->addTab(web_tab.get(), tr("Web"));
-    ui->tabWidget->addTab(ui_tab.get(), tr("UI"));
-
-    hotkeys_tab->Populate(registry);
-    web_tab->SetWebServiceConfigEnabled(enable_web_config);
+    ui->hotkeysTab->Populate(registry);
+    ui->webTab->SetWebServiceConfigEnabled(enable_web_config);
 
     PopulateSelectionList();
 
-    connect(ui_tab.get(), &ConfigureUi::LanguageChanged, this, &ConfigureDialog::OnLanguageChanged);
+    connect(ui->uiTab, &ConfigureUi::LanguageChanged, this, &ConfigureDialog::OnLanguageChanged);
     connect(ui->selectorList, &QListWidget::itemSelectionChanged, this,
             &ConfigureDialog::UpdateVisibleTabs);
 
@@ -67,46 +31,46 @@ ConfigureDialog::ConfigureDialog(QWidget* parent, HotkeyRegistry& registry_, Cor
     ui->selectorList->setCurrentRow(0);
 
     // Set up used key list synchronisation
-    connect(input_tab.get(), &ConfigureInput::InputKeysChanged, hotkeys_tab.get(),
+    connect(ui->inputTab, &ConfigureInput::InputKeysChanged, ui->hotkeysTab,
             &ConfigureHotkeys::OnInputKeysChanged);
-    connect(hotkeys_tab.get(), &ConfigureHotkeys::HotkeysChanged, input_tab.get(),
+    connect(ui->hotkeysTab, &ConfigureHotkeys::HotkeysChanged, ui->inputTab,
             &ConfigureInput::OnHotkeysChanged);
 
     // Synchronise lists upon initialisation
-    input_tab->EmitInputKeysChanged();
-    hotkeys_tab->EmitHotkeysChanged();
+    ui->inputTab->EmitInputKeysChanged();
+    ui->hotkeysTab->EmitHotkeysChanged();
 }
 
 ConfigureDialog::~ConfigureDialog() = default;
 
 void ConfigureDialog::SetConfiguration() {
-    general_tab->SetConfiguration();
-    system_tab->SetConfiguration();
-    input_tab->LoadConfiguration();
-    graphics_tab->SetConfiguration();
-    enhancements_tab->SetConfiguration();
-    audio_tab->SetConfiguration();
-    camera_tab->SetConfiguration();
-    debug_tab->SetConfiguration();
-    web_tab->SetConfiguration();
-    ui_tab->SetConfiguration();
-    storage_tab->SetConfiguration();
+    ui->generalTab->SetConfiguration();
+    ui->systemTab->SetConfiguration();
+    ui->inputTab->LoadConfiguration();
+    ui->graphicsTab->SetConfiguration();
+    ui->enhancementsTab->SetConfiguration();
+    ui->audioTab->SetConfiguration();
+    ui->cameraTab->SetConfiguration();
+    ui->debugTab->SetConfiguration();
+    ui->webTab->SetConfiguration();
+    ui->uiTab->SetConfiguration();
+    ui->storageTab->SetConfiguration();
 }
 
 void ConfigureDialog::ApplyConfiguration() {
-    general_tab->ApplyConfiguration();
-    system_tab->ApplyConfiguration();
-    input_tab->ApplyConfiguration();
-    input_tab->ApplyProfile();
-    hotkeys_tab->ApplyConfiguration(registry);
-    graphics_tab->ApplyConfiguration();
-    enhancements_tab->ApplyConfiguration();
-    audio_tab->ApplyConfiguration();
-    camera_tab->ApplyConfiguration();
-    debug_tab->ApplyConfiguration();
-    web_tab->ApplyConfiguration();
-    ui_tab->ApplyConfiguration();
-    storage_tab->ApplyConfiguration();
+    ui->generalTab->ApplyConfiguration();
+    ui->systemTab->ApplyConfiguration();
+    ui->inputTab->ApplyConfiguration();
+    ui->inputTab->ApplyProfile();
+    ui->hotkeysTab->ApplyConfiguration(registry);
+    ui->graphicsTab->ApplyConfiguration();
+    ui->enhancementsTab->ApplyConfiguration();
+    ui->audioTab->ApplyConfiguration();
+    ui->cameraTab->ApplyConfiguration();
+    ui->debugTab->ApplyConfiguration();
+    ui->webTab->ApplyConfiguration();
+    ui->uiTab->ApplyConfiguration();
+    ui->storageTab->ApplyConfiguration();
     system.ApplySettings();
     Settings::LogSettings();
 }
@@ -117,11 +81,11 @@ void ConfigureDialog::PopulateSelectionList() {
     ui->selectorList->clear();
 
     const std::array<std::pair<QString, QList<QWidget*>>, 5> items{
-        {{tr("General"), {general_tab.get(), web_tab.get(), debug_tab.get(), ui_tab.get()}},
-         {tr("System"), {system_tab.get(), camera_tab.get(), storage_tab.get()}},
-         {tr("Graphics"), {enhancements_tab.get(), graphics_tab.get()}},
-         {tr("Audio"), {audio_tab.get()}},
-         {tr("Controls"), {input_tab.get(), hotkeys_tab.get()}}}};
+        {{tr("General"), {ui->generalTab, ui->webTab, ui->debugTab, ui->uiTab}},
+         {tr("System"), {ui->systemTab, ui->cameraTab, ui->storageTab}},
+         {tr("Graphics"), {ui->enhancementsTab, ui->graphicsTab}},
+         {tr("Audio"), {ui->audioTab}},
+         {tr("Controls"), {ui->inputTab, ui->hotkeysTab}}}};
 
     for (const auto& entry : items) {
         auto* const item = new QListWidgetItem(entry.first);
@@ -148,18 +112,18 @@ void ConfigureDialog::RetranslateUI() {
     ui->selectorList->setCurrentRow(old_row);
     ui->tabWidget->setCurrentIndex(old_index);
 
-    general_tab->RetranslateUI();
-    system_tab->RetranslateUI();
-    input_tab->RetranslateUI();
-    hotkeys_tab->RetranslateUI();
-    graphics_tab->RetranslateUI();
-    enhancements_tab->RetranslateUI();
-    audio_tab->RetranslateUI();
-    camera_tab->RetranslateUI();
-    debug_tab->RetranslateUI();
-    web_tab->RetranslateUI();
-    ui_tab->RetranslateUI();
-    storage_tab->RetranslateUI();
+    ui->generalTab->RetranslateUI();
+    ui->systemTab->RetranslateUI();
+    ui->inputTab->RetranslateUI();
+    ui->hotkeysTab->RetranslateUI();
+    ui->graphicsTab->RetranslateUI();
+    ui->enhancementsTab->RetranslateUI();
+    ui->audioTab->RetranslateUI();
+    ui->cameraTab->RetranslateUI();
+    ui->debugTab->RetranslateUI();
+    ui->webTab->RetranslateUI();
+    ui->uiTab->RetranslateUI();
+    ui->storageTab->RetranslateUI();
 }
 
 void ConfigureDialog::UpdateVisibleTabs() {
@@ -167,18 +131,18 @@ void ConfigureDialog::UpdateVisibleTabs() {
     if (items.isEmpty())
         return;
 
-    const std::map<QWidget*, QString> widgets = {{general_tab.get(), tr("General")},
-                                                 {system_tab.get(), tr("System")},
-                                                 {input_tab.get(), tr("Input")},
-                                                 {hotkeys_tab.get(), tr("Hotkeys")},
-                                                 {enhancements_tab.get(), tr("Enhancements")},
-                                                 {graphics_tab.get(), tr("Advanced")},
-                                                 {audio_tab.get(), tr("Audio")},
-                                                 {camera_tab.get(), tr("Camera")},
-                                                 {debug_tab.get(), tr("Debug")},
-                                                 {storage_tab.get(), tr("Storage")},
-                                                 {web_tab.get(), tr("Web")},
-                                                 {ui_tab.get(), tr("UI")}};
+    const std::map<QWidget*, QString> widgets = {{ui->generalTab, tr("General")},
+                                                 {ui->systemTab, tr("System")},
+                                                 {ui->inputTab, tr("Input")},
+                                                 {ui->hotkeysTab, tr("Hotkeys")},
+                                                 {ui->enhancementsTab, tr("Enhancements")},
+                                                 {ui->graphicsTab, tr("Advanced")},
+                                                 {ui->audioTab, tr("Audio")},
+                                                 {ui->cameraTab, tr("Camera")},
+                                                 {ui->debugTab, tr("Debug")},
+                                                 {ui->storageTab, tr("Storage")},
+                                                 {ui->webTab, tr("Web")},
+                                                 {ui->uiTab, tr("UI")}};
 
     ui->tabWidget->clear();
 

src/citra_qt/configuration/configure_dialog.h

@@ -5,9 +5,7 @@
 #pragma once
 
 #include <memory>
-#include <span>
 #include <QDialog>
-#include <QString>
 
 class HotkeyRegistry;
 
@@ -19,25 +17,11 @@ namespace Core {
 class System;
 }
 
-class ConfigureGeneral;
-class ConfigureSystem;
-class ConfigureInput;
-class ConfigureHotkeys;
-class ConfigureGraphics;
-class ConfigureEnhancements;
-class ConfigureAudio;
-class ConfigureCamera;
-class ConfigureDebug;
-class ConfigureStorage;
-class ConfigureWeb;
-class ConfigureUi;
-
 class ConfigureDialog : public QDialog {
     Q_OBJECT
 
 public:
     explicit ConfigureDialog(QWidget* parent, HotkeyRegistry& registry, Core::System& system,
-                             std::span<const QString> physical_devices,
                              bool enable_web_config = true);
     ~ConfigureDialog() override;
 
@@ -58,18 +42,4 @@ private:
     std::unique_ptr<Ui::ConfigureDialog> ui;
     HotkeyRegistry& registry;
     Core::System& system;
-    bool is_powered_on;
-
-    std::unique_ptr<ConfigureGeneral> general_tab;
-    std::unique_ptr<ConfigureSystem> system_tab;
-    std::unique_ptr<ConfigureInput> input_tab;
-    std::unique_ptr<ConfigureHotkeys> hotkeys_tab;
-    std::unique_ptr<ConfigureGraphics> graphics_tab;
-    std::unique_ptr<ConfigureEnhancements> enhancements_tab;
-    std::unique_ptr<ConfigureAudio> audio_tab;
-    std::unique_ptr<ConfigureCamera> camera_tab;
-    std::unique_ptr<ConfigureDebug> debug_tab;
-    std::unique_ptr<ConfigureStorage> storage_tab;
-    std::unique_ptr<ConfigureWeb> web_tab;
-    std::unique_ptr<ConfigureUi> ui_tab;
 };

src/citra_qt/configuration/configure_enhancements.cpp

@@ -22,7 +22,8 @@ ConfigureEnhancements::ConfigureEnhancements(QWidget* parent)
     const bool res_scale_enabled = graphics_api != Settings::GraphicsAPI::Software;
     ui->resolution_factor_combobox->setEnabled(res_scale_enabled);
 
-    connect(ui->render_3d_combobox, qOverload<int>(&QComboBox::currentIndexChanged), this,
+    connect(ui->render_3d_combobox,
+            static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this,
             [this](int currentIndex) {
                 updateShaders(static_cast<Settings::StereoRenderOption>(currentIndex));
             });

src/citra_qt/configuration/configure_graphics.cpp

@@ -6,35 +6,17 @@
 #include "citra_qt/configuration/configuration_shared.h"
 #include "citra_qt/configuration/configure_graphics.h"
 #include "common/settings.h"
+#include "core/core.h"
 #include "ui_configure_graphics.h"
-#include "video_core/renderer_vulkan/vk_instance.h"
 
-ConfigureGraphics::ConfigureGraphics(std::span<const QString> physical_devices, bool is_powered_on,
-                                     QWidget* parent)
+ConfigureGraphics::ConfigureGraphics(QWidget* parent)
     : QWidget(parent), ui(std::make_unique<Ui::ConfigureGraphics>()) {
     ui->setupUi(this);
 
-    SetupPerGameUI();
-
-    for (const QString& name : physical_devices) {
-        ui->physical_device_combo->addItem(name);
-    }
-
-    ui->toggle_vsync_new->setEnabled(!is_powered_on);
-    ui->graphics_api_combo->setEnabled(!is_powered_on);
-    ui->physical_device_combo->setEnabled(!is_powered_on);
-    ui->toggle_async_shaders->setEnabled(!is_powered_on);
-    ui->toggle_async_present->setEnabled(!is_powered_on);
+    ui->toggle_vsync_new->setEnabled(!Core::System::GetInstance().IsPoweredOn());
     // Set the index to -1 to ensure the below lambda is called with setCurrentIndex
     ui->graphics_api_combo->setCurrentIndex(-1);
 
-    if (physical_devices.empty()) {
-        const u32 index = static_cast<u32>(Settings::GraphicsAPI::Vulkan);
-        ui->graphics_api_combo->removeItem(index);
-        ui->physical_device_combo->setVisible(false);
-        ui->spirv_shader_gen->setVisible(false);
-    }
-
     connect(ui->graphics_api_combo, qOverload<int>(&QComboBox::currentIndexChanged), this,
             [this](int index) {
                 const auto graphics_api =
@@ -47,15 +29,12 @@ ConfigureGraphics::ConfigureGraphics(std::span<const QString> physical_devices,
             });
 
     connect(ui->toggle_hw_shader, &QCheckBox::toggled, this, [this] {
-        const bool enabled = ui->toggle_hw_shader->isEnabled();
         const bool checked = ui->toggle_hw_shader->isChecked();
-        ui->hw_shader_group->setEnabled(checked && enabled);
-        ui->toggle_disk_shader_cache->setEnabled(checked && enabled);
+        ui->hw_shader_group->setEnabled(checked);
+        ui->toggle_disk_shader_cache->setEnabled(checked);
     });
 
-    connect(ui->graphics_api_combo, qOverload<int>(&QComboBox::currentIndexChanged), this,
-            &ConfigureGraphics::SetPhysicalDeviceComboVisibility);
-
+    SetupPerGameUI();
     SetConfiguration();
 }
 
@@ -67,24 +46,15 @@ void ConfigureGraphics::SetConfiguration() {
                                           !Settings::values.graphics_api.UsingGlobal());
         ConfigurationShared::SetPerGameSetting(ui->graphics_api_combo,
                                                &Settings::values.graphics_api);
-        ConfigurationShared::SetHighlight(ui->physical_device_group,
-                                          !Settings::values.physical_device.UsingGlobal());
-        ConfigurationShared::SetPerGameSetting(ui->physical_device_combo,
-                                               &Settings::values.physical_device);
     } else {
         ui->graphics_api_combo->setCurrentIndex(
             static_cast<int>(Settings::values.graphics_api.GetValue()));
-        ui->physical_device_combo->setCurrentIndex(
-            static_cast<int>(Settings::values.physical_device.GetValue()));
     }
 
     ui->toggle_hw_shader->setChecked(Settings::values.use_hw_shader.GetValue());
     ui->toggle_accurate_mul->setChecked(Settings::values.shaders_accurate_mul.GetValue());
     ui->toggle_disk_shader_cache->setChecked(Settings::values.use_disk_shader_cache.GetValue());
     ui->toggle_vsync_new->setChecked(Settings::values.use_vsync_new.GetValue());
-    ui->spirv_shader_gen->setChecked(Settings::values.spirv_shader_gen.GetValue());
-    ui->toggle_async_shaders->setChecked(Settings::values.async_shader_compilation.GetValue());
-    ui->toggle_async_present->setChecked(Settings::values.async_presentation.GetValue());
 
     if (Settings::IsConfiguringGlobal()) {
         ui->toggle_shader_jit->setChecked(Settings::values.use_shader_jit.GetValue());
@@ -94,14 +64,6 @@ void ConfigureGraphics::SetConfiguration() {
 void ConfigureGraphics::ApplyConfiguration() {
     ConfigurationShared::ApplyPerGameSetting(&Settings::values.graphics_api,
                                              ui->graphics_api_combo);
-    ConfigurationShared::ApplyPerGameSetting(&Settings::values.physical_device,
-                                             ui->physical_device_combo);
-    ConfigurationShared::ApplyPerGameSetting(&Settings::values.async_shader_compilation,
-                                             ui->toggle_async_shaders, async_shader_compilation);
-    ConfigurationShared::ApplyPerGameSetting(&Settings::values.async_presentation,
-                                             ui->toggle_async_present, async_presentation);
-    ConfigurationShared::ApplyPerGameSetting(&Settings::values.spirv_shader_gen,
-                                             ui->spirv_shader_gen, spirv_shader_gen);
     ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_hw_shader, ui->toggle_hw_shader,
                                              use_hw_shader);
     ConfigurationShared::ApplyPerGameSetting(&Settings::values.shaders_accurate_mul,
@@ -130,11 +92,6 @@ void ConfigureGraphics::SetupPerGameUI() {
             Settings::values.use_disk_shader_cache.UsingGlobal());
         ui->toggle_vsync_new->setEnabled(ui->toggle_vsync_new->isEnabled() &&
                                          Settings::values.use_vsync_new.UsingGlobal());
-        ui->toggle_async_shaders->setEnabled(
-            Settings::values.async_shader_compilation.UsingGlobal());
-        ui->toggle_async_present->setEnabled(Settings::values.async_presentation.UsingGlobal());
-        ui->graphics_api_combo->setEnabled(Settings::values.graphics_api.UsingGlobal());
-        ui->physical_device_combo->setEnabled(Settings::values.physical_device.UsingGlobal());
         return;
     }
 
@@ -144,10 +101,6 @@ void ConfigureGraphics::SetupPerGameUI() {
         ui->graphics_api_combo, ui->graphics_api_group,
         static_cast<u32>(Settings::values.graphics_api.GetValue(true)));
 
-    ConfigurationShared::SetColoredComboBox(
-        ui->physical_device_combo, ui->physical_device_group,
-        static_cast<u32>(Settings::values.physical_device.GetValue(true)));
-
     ConfigurationShared::SetColoredTristate(ui->toggle_hw_shader, Settings::values.use_hw_shader,
                                             use_hw_shader);
     ConfigurationShared::SetColoredTristate(
@@ -157,34 +110,4 @@ void ConfigureGraphics::SetupPerGameUI() {
                                             use_disk_shader_cache);
     ConfigurationShared::SetColoredTristate(ui->toggle_vsync_new, Settings::values.use_vsync_new,
                                             use_vsync_new);
-    ConfigurationShared::SetColoredTristate(ui->toggle_async_shaders,
-                                            Settings::values.async_shader_compilation,
-                                            async_shader_compilation);
-    ConfigurationShared::SetColoredTristate(
-        ui->toggle_async_present, Settings::values.async_presentation, async_presentation);
-    ConfigurationShared::SetColoredTristate(ui->spirv_shader_gen, Settings::values.spirv_shader_gen,
-                                            spirv_shader_gen);
-}
-
-void ConfigureGraphics::SetPhysicalDeviceComboVisibility(int index) {
-    bool is_visible{};
-
-    // When configuring per-game the physical device combo should be
-    // shown either when the global api is used and that is Vulkan or
-    // Vulkan is set as the per-game api.
-    if (!Settings::IsConfiguringGlobal()) {
-        const auto global_graphics_api = Settings::values.graphics_api.GetValue(true);
-        const bool using_global = index == 0;
-        if (!using_global) {
-            index -= ConfigurationShared::USE_GLOBAL_OFFSET;
-        }
-        const auto graphics_api = static_cast<Settings::GraphicsAPI>(index);
-        is_visible = (using_global && global_graphics_api == Settings::GraphicsAPI::Vulkan) ||
-                     graphics_api == Settings::GraphicsAPI::Vulkan;
-    } else {
-        const auto graphics_api = static_cast<Settings::GraphicsAPI>(index);
-        is_visible = graphics_api == Settings::GraphicsAPI::Vulkan;
-    }
-    ui->physical_device_group->setVisible(is_visible);
-    ui->spirv_shader_gen->setVisible(is_visible);
 }

src/citra_qt/configuration/configure_graphics.h

@@ -5,8 +5,6 @@
 #pragma once
 
 #include <memory>
-#include <span>
-#include <QString>
 #include <QWidget>
 
 namespace Ui {
@@ -21,8 +19,7 @@ class ConfigureGraphics : public QWidget {
     Q_OBJECT
 
 public:
-    explicit ConfigureGraphics(std::span<const QString> physical_devices, bool is_powered_on,
-                               QWidget* parent = nullptr);
+    explicit ConfigureGraphics(QWidget* parent = nullptr);
     ~ConfigureGraphics() override;
 
     void ApplyConfiguration();
@@ -33,15 +30,11 @@ public:
 
 private:
     void SetupPerGameUI();
-    void SetPhysicalDeviceComboVisibility(int index);
 
     ConfigurationShared::CheckState use_hw_shader;
     ConfigurationShared::CheckState shaders_accurate_mul;
     ConfigurationShared::CheckState use_disk_shader_cache;
     ConfigurationShared::CheckState use_vsync_new;
-    ConfigurationShared::CheckState async_shader_compilation;
-    ConfigurationShared::CheckState async_presentation;
-    ConfigurationShared::CheckState spirv_shader_gen;
     std::unique_ptr<Ui::ConfigureGraphics> ui;
     QColor bg_color;
 };

src/citra_qt/configuration/configure_graphics.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>400</width>
-    <height>509</height>
+    <height>443</height>
    </rect>
   </property>
   <property name="minimumSize">
@@ -19,9 +19,6 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <property name="accessibleName">
-   <string>Graphics</string>
-  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QGroupBox" name="apiBox">
@@ -63,51 +60,11 @@
              <string>OpenGL</string>
             </property>
            </item>
-           <item>
-            <property name="text">
-             <string>Vulkan</string>
-            </property>
-           </item>
           </widget>
          </item>
         </layout>
        </widget>
       </item>
-      <item>
-       <widget class="QWidget" name="physical_device_group" native="true">
-        <layout class="QHBoxLayout" name="physical_device_group_2">
-         <property name="leftMargin">
-          <number>0</number>
-         </property>
-         <property name="topMargin">
-          <number>0</number>
-         </property>
-         <property name="rightMargin">
-          <number>0</number>
-         </property>
-         <property name="bottomMargin">
-          <number>0</number>
-         </property>
-         <item>
-          <widget class="QLabel" name="physical_device_label">
-           <property name="text">
-            <string>Physical Device</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QComboBox" name="physical_device_combo"/>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="spirv_shader_gen">
-        <property name="text">
-         <string>SPIR-V Shader Generation</string>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>
@@ -135,7 +92,7 @@
          <item>
           <widget class="QCheckBox" name="toggle_hw_shader">
            <property name="toolTip">
-            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use the selected graphics API to accelerate shader emulation.&lt;/p&gt;&lt;p&gt;Requires a relatively powerful GPU for better performance.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use OpenGL to accelerate shader emulation.&lt;/p&gt;&lt;p&gt;Requires a relatively powerful GPU for better performance.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
            </property>
            <property name="text">
             <string>Enable Hardware Shader</string>
@@ -183,26 +140,6 @@
         </property>
        </widget>
       </item>
-      <item>
-       <widget class="QCheckBox" name="toggle_async_shaders">
-        <property name="toolTip">
-         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Compile shaders using background threads to avoid shader compilation stutter. Expect temporary graphical glitches&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-        </property>
-        <property name="text">
-         <string>Enable Async Shader Compilation</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="toggle_async_present">
-        <property name="toolTip">
-         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Perform presentation on separate threads. Improves performance when using Vulkan in most games.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-        </property>
-        <property name="text">
-         <string>Enable Async Presentation</string>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>

src/citra_qt/configuration/configure_hotkeys.cpp

@@ -9,6 +9,7 @@
 #include "citra_qt/configuration/configure_hotkeys.h"
 #include "citra_qt/hotkeys.h"
 #include "citra_qt/util/sequence_dialog/sequence_dialog.h"
+#include "common/settings.h"
 #include "ui_configure_hotkeys.h"
 
 constexpr int name_column = 0;
@@ -188,9 +189,9 @@ void ConfigureHotkeys::PopupContextMenu(const QPoint& menu_location) {
     QAction* clear = context_menu.addAction(tr("Clear"));
 
     const auto hotkey_index = index.sibling(index.row(), hotkey_column);
-    connect(restore_default, &QAction::triggered, this,
+    connect(restore_default, &QAction::triggered,
             [this, hotkey_index] { RestoreHotkey(hotkey_index); });
-    connect(clear, &QAction::triggered, this,
+    connect(clear, &QAction::triggered,
             [this, hotkey_index] { model->setData(hotkey_index, QString{}); });
 
     context_menu.exec(ui->hotkey_list->viewport()->mapToGlobal(menu_location));

src/citra_qt/configuration/configure_input.cpp

@@ -162,7 +162,7 @@ ConfigureInput::ConfigureInput(QWidget* parent)
         ui->buttonDpadUp, ui->buttonDpadDown, ui->buttonDpadLeft, ui->buttonDpadRight,
         ui->buttonL,      ui->buttonR,        ui->buttonStart,    ui->buttonSelect,
         ui->buttonDebug,  ui->buttonGpio14,   ui->buttonZL,       ui->buttonZR,
-        ui->buttonHome,   ui->buttonPower,
+        ui->buttonHome,
     };
 
     analog_map_buttons = {{

src/citra_qt/configuration/configure_input.ui

@@ -13,7 +13,7 @@
   <property name="windowTitle">
    <string>ConfigureInput</string>
   </property>
-  <layout class="QVBoxLayout" name="rootLayout">
+  <layout class="QVBoxLayout" name="verticalLayout_5">
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_3">
      <item>
@@ -62,13 +62,6 @@
      </item>
     </layout>
    </item>
-   <item>
-    <widget class="QScrollArea" name="scrollArea">
-     <property name="widgetResizable">
-      <bool>true</bool>
-     </property>
-     <widget class="QWidget" name="scrollAreaContents">
-      <layout class="QVBoxLayout" name="verticalLayout_5">
    <item>
     <layout class="QGridLayout" name="gridLayout_7">
      <item row="0" column="0">
@@ -312,24 +305,6 @@
          </layout>
         </item>
         <item row="1" column="1">
-             <layout class="QVBoxLayout" name="verticalLayout_34">
-              <item>
-               <widget class="QLabel" name="label_37">
-                <property name="text">
-                 <string>Power:</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QPushButton" name="buttonPower">
-                <property name="text">
-                 <string/>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </item>
-            <item row="2" column="0">
          <layout class="QVBoxLayout" name="verticalLayout_28">
           <item>
            <widget class="QLabel" name="label_36">
@@ -365,7 +340,7 @@
           </item>
          </layout>
         </item>
-            <item row="3" column="0">
+        <item row="2" column="0">
          <layout class="QVBoxLayout" name="verticalLayout_32">
           <item>
            <widget class="QLabel" name="label_40">
@@ -719,10 +694,6 @@
      </item>
     </layout>
    </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
    <item>
     <layout class="QVBoxLayout" name="verticalLayout_6">
      <item>

src/citra_qt/configuration/configure_per_game.cpp

@@ -24,21 +24,19 @@
 #include "ui_configure_per_game.h"
 
 ConfigurePerGame::ConfigurePerGame(QWidget* parent, u64 title_id_, const QString& file_name,
-                                   std::span<const QString> physical_devices, Core::System& system_)
+                                   Core::System& system_)
     : QDialog(parent), ui(std::make_unique<Ui::ConfigurePerGame>()),
       filename{file_name.toStdString()}, title_id{title_id_}, system{system_} {
-    const auto config_file_name = title_id == 0 ? std::string(FileUtil::GetFilename(filename))
-                                                : fmt::format("{:016X}", title_id);
+    const auto config_file_name = title_id == 0 ? filename : fmt::format("{:016X}", title_id);
     game_config = std::make_unique<Config>(config_file_name, Config::ConfigType::PerGameConfig);
 
-    const bool is_powered_on = system.IsPoweredOn();
-    audio_tab = std::make_unique<ConfigureAudio>(is_powered_on, this);
+    audio_tab = std::make_unique<ConfigureAudio>(this);
     general_tab = std::make_unique<ConfigureGeneral>(this);
     enhancements_tab = std::make_unique<ConfigureEnhancements>(this);
-    graphics_tab = std::make_unique<ConfigureGraphics>(physical_devices, is_powered_on, this);
-    system_tab = std::make_unique<ConfigureSystem>(system, this);
-    debug_tab = std::make_unique<ConfigureDebug>(is_powered_on, this);
-    cheat_tab = std::make_unique<ConfigureCheats>(system, title_id, this);
+    graphics_tab = std::make_unique<ConfigureGraphics>(this);
+    system_tab = std::make_unique<ConfigureSystem>(this);
+    debug_tab = std::make_unique<ConfigureDebug>(this);
+    cheat_tab = std::make_unique<ConfigureCheats>(system.CheatEngine(), title_id, this);
 
     ui->setupUi(this);
 

src/citra_qt/configuration/configure_per_game.h

@@ -4,11 +4,9 @@
 #pragma once
 
 #include <memory>
-#include <span>
 #include <string>
 #include <QDialog>
 #include <QList>
-#include <QString>
 #include "citra_qt/configuration/config.h"
 
 namespace Core {
@@ -37,8 +35,9 @@ class ConfigurePerGame : public QDialog {
     Q_OBJECT
 
 public:
+    // Cannot use std::filesystem::path due to https://bugreports.qt.io/browse/QTBUG-73263
     explicit ConfigurePerGame(QWidget* parent, u64 title_id_, const QString& file_name,
-                              std::span<const QString> physical_devices, Core::System& system_);
+                              Core::System& system_);
     ~ConfigurePerGame() override;
 
     /// Loads all button configurations to settings file

src/citra_qt/configuration/configure_storage.cpp

@@ -6,12 +6,12 @@
 #include <QFileDialog>
 #include <QUrl>
 #include "citra_qt/configuration/configure_storage.h"
-#include "common/file_util.h"
 #include "common/settings.h"
+#include "core/core.h"
 #include "ui_configure_storage.h"
 
-ConfigureStorage::ConfigureStorage(bool is_powered_on_, QWidget* parent)
-    : QWidget(parent), ui(std::make_unique<Ui::ConfigureStorage>()), is_powered_on{is_powered_on_} {
+ConfigureStorage::ConfigureStorage(QWidget* parent)
+    : QWidget(parent), ui(std::make_unique<Ui::ConfigureStorage>()) {
     ui->setupUi(this);
     SetConfiguration();
 
@@ -74,7 +74,7 @@ void ConfigureStorage::SetConfiguration() {
     ui->toggle_virtual_sd->setChecked(Settings::values.use_virtual_sd.GetValue());
     ui->toggle_custom_storage->setChecked(Settings::values.use_custom_storage.GetValue());
 
-    ui->storage_group->setEnabled(!is_powered_on);
+    ui->storage_group->setEnabled(!Core::System::GetInstance().IsPoweredOn());
 }
 
 void ConfigureStorage::ApplyConfiguration() {

src/citra_qt/configuration/configure_storage.h

@@ -15,7 +15,7 @@ class ConfigureStorage : public QWidget {
     Q_OBJECT
 
 public:
-    explicit ConfigureStorage(bool is_powered_on, QWidget* parent = nullptr);
+    explicit ConfigureStorage(QWidget* parent = nullptr);
     ~ConfigureStorage() override;
 
     void ApplyConfiguration();
@@ -23,5 +23,4 @@ public:
     void SetConfiguration();
 
     std::unique_ptr<Ui::ConfigureStorage> ui;
-    bool is_powered_on;
 };