Remove Ignore Global Monitor from CPU Accuracy Auto

2026-08-18 06:10:35 +00:00 · 2026-04-19 00:56:59 +02:00
123 changed files with 7955 additions and 7408 deletions
@@ -3,8 +3,6 @@ name: Check Strings
 on:
  push:
    branches: [ master ]
-  pull_request:
-    branches: [ master ]

 jobs:
  check-strings:
@@ -12,7 +10,7 @@ jobs:
    steps:
      - uses: actions/checkout@v4
        with:
-          fetch-depth: 1
+          fetch-depth: 0

      - name: Find Unused Strings
        run: ./tools/unused-strings.sh
@@ -0,0 +1,14 @@
+diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
+index eb4e69e..3155805 100644
+--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
+@@ -72,7 +72,8 @@ if (SPIRV_TOOLS_USE_MIMALLOC)
+   pop_variable(MI_BUILD_TESTS)
+ endif()
+ 
+-if (DEFINED SPIRV-Headers_SOURCE_DIR)
+# NetBSD doesn't have SPIRV-Headers readily available on system
+if (DEFINED SPIRV-Headers_SOURCE_DIR AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL "NetBSD")
+   # This allows flexible position of the SPIRV-Headers repo.
+   set(SPIRV_HEADER_DIR ${SPIRV-Headers_SOURCE_DIR})
+ else()
@@ -0,0 +1,287 @@
+From 67bf3d1381b1faf59e87001d6156ba4e21cada14 Mon Sep 17 00:00:00 2001
+From: crueter <crueter@eden-emu.dev>
+Date: Mon, 29 Dec 2025 21:22:36 -0500
+Subject: [PATCH] [cmake] refactor: shared/static handling
+
+This significantly redoes the way shared and static libraries are
+handled. Now, it's controlled by two options: `SPIRV_TOOLS_BUILD_STATIC`
+and `SPIRV_TOOLS_BUILD_SHARED`.
+
+The default configuration (no `BUILD_SHARED_LIBS` set, options left at
+default) is to build shared ONLY if this is the master project, or
+static ONLY if this is a subproject (e.g. FetchContent, CPM.cmake). Also
+I should note that static-only (i.e. no shared) is now a supported
+target, this is done because projects including it as a submodule e.g.
+on Android or Windows may prefer this.
+
+Now the shared/static handling:
+- static ON, shared OFF: Only generates `.a` libraries.
+- static ON, shared ON: Generates `.a` libraries, but also
+  `libSPIRV-Tools.so`
+- static OFF, shared ON: Only generates `.so` libraries.
+
+Notable TODOs:
+- SPIRV-Tools-shared.pc seems redundant--how should we handle which one
+  to use in the case of distributions that distribute both types (MSYS2
+  for instance)?
+  * *Note: pkgconfig sucks at this and usually just leaves it up to the
+    user, so the optimal solution may indeed be doing absolutely
+    nothing.* CMake is unaffected :)
+- use namespaces in the CMake config files pleaaaaase
+
+This is going to change things a good bit for package maintainers, but
+cest la vie. It's for the greater good, I promise.
+
+Signed-off-by: crueter <crueter@eden-emu.dev>
+---
+ CMakeLists.txt        | 108 +++++++++++++++++++++++++-----------------
+ source/CMakeLists.txt |  62 ++++++++++++------------
+ 2 files changed, 94 insertions(+), 76 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4d843b4d2f..07201f690f 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -14,6 +14,15 @@
+ 
+ cmake_minimum_required(VERSION 3.22.1)
+ 
+# master project detection--useful for FetchContent/submodule inclusion
+set(master_project OFF)
+set(subproject ON)
+
+if (NOT DEFINED PROJECT_NAME)
+  set(master_project ON)
+  set(subproject OFF)
+endif()
+
+ project(spirv-tools)
+ 
+ # Avoid a bug in CMake 3.22.1. By default it will set -std=c++11 for
+@@ -135,46 +144,49 @@ if (DEFINED SPIRV_TOOLS_EXTRA_DEFINITIONS)
+   add_definitions(${SPIRV_TOOLS_EXTRA_DEFINITIONS})
+ endif()
+ 
+-# Library build setting definitions:
+-#
+-# * SPIRV_TOOLS_BUILD_STATIC - ON or OFF - Defaults to ON.
+-#   If enabled the following targets will be created:
+-#     ${SPIRV_TOOLS}-static - STATIC library.
+-#                             Has full public symbol visibility.
+-#     ${SPIRV_TOOLS}-shared - SHARED library.
+-#                             Has default-hidden symbol visibility.
+-#     ${SPIRV_TOOLS}        - will alias to one of above, based on BUILD_SHARED_LIBS.
+-#   If disabled the following targets will be created:
+-#     ${SPIRV_TOOLS}        - either STATIC or SHARED based on SPIRV_TOOLS_LIBRARY_TYPE.
+-#                             Has full public symbol visibility.
+-#     ${SPIRV_TOOLS}-shared - SHARED library.
+-#                             Has default-hidden symbol visibility.
+-#
+-# * SPIRV_TOOLS_LIBRARY_TYPE - SHARED or STATIC.
+-#   Specifies the library type used for building SPIRV-Tools libraries.
+-#   Defaults to SHARED when BUILD_SHARED_LIBS=1, otherwise STATIC.
+-#
+-# * SPIRV_TOOLS_FULL_VISIBILITY - "${SPIRV_TOOLS}-static" or "${SPIRV_TOOLS}"
+-#   Evaluates to the SPIRV_TOOLS target library name that has no hidden symbols.
+-#   This is used by internal targets for accessing symbols that are non-public.
+-#   Note this target provides no API stability guarantees.
+-#
+-# Ideally, all of these will go away - see https://github.com/KhronosGroup/SPIRV-Tools/issues/3909.
+-option(ENABLE_EXCEPTIONS_ON_MSVC "Build SPIRV-TOOLS with c++ exceptions enabled in MSVC" ON)
+-option(SPIRV_TOOLS_BUILD_STATIC "Build ${SPIRV_TOOLS}-static target. ${SPIRV_TOOLS} will alias to ${SPIRV_TOOLS}-static or ${SPIRV_TOOLS}-shared based on BUILD_SHARED_LIBS" ON)
+-if(SPIRV_TOOLS_BUILD_STATIC)
+-  set(SPIRV_TOOLS_FULL_VISIBILITY ${SPIRV_TOOLS}-static)
+# If BUILD_SHARED_LIBS is undefined, set it based on whether we are
+# the master project or a subproject
+if (NOT DEFINED BUILD_SHARED_LIBS)
+  set(BUILD_SHARED_LIBS ${master_project})
+endif()
+
+if (BUILD_SHARED_LIBS)
+  set(static_default OFF)
+else()
+  set(static_default ON)
+endif()
+
+option(SPIRV_TOOLS_BUILD_SHARED "Build ${SPIRV_TOOLS} as a shared library"
+       ${BUILD_SHARED_LIBS})
+option(SPIRV_TOOLS_BUILD_STATIC "Build ${SPIRV_TOOLS} as a static library"
+       ${static_default})
+
+# Avoid conflict between the dll import library and
+# the static library (thanks microsoft)
+if(CMAKE_STATIC_LIBRARY_PREFIX STREQUAL "" AND
+   CMAKE_STATIC_LIBRARY_SUFFIX STREQUAL ".lib")
+    set(SPIRV_TOOLS_STATIC_LIBNAME "${SPIRV_TOOLS}-static")
+else()
+    set(SPIRV_TOOLS_STATIC_LIBNAME "${SPIRV_TOOLS}")
+endif()
+
+if (SPIRV_TOOLS_BUILD_STATIC)
+  # If building a static library at all, always build other libraries as static,
+  # and link to the static SPIRV-Tools library.
+   set(SPIRV_TOOLS_LIBRARY_TYPE "STATIC")
+-else(SPIRV_TOOLS_BUILD_STATIC)
+-  set(SPIRV_TOOLS_FULL_VISIBILITY ${SPIRV_TOOLS})
+-  if (NOT DEFINED SPIRV_TOOLS_LIBRARY_TYPE)
+-      if(BUILD_SHARED_LIBS)
+-        set(SPIRV_TOOLS_LIBRARY_TYPE "SHARED")
+-      else()
+-        set(SPIRV_TOOLS_LIBRARY_TYPE "STATIC")
+-      endif()
+-  endif()
+-endif(SPIRV_TOOLS_BUILD_STATIC)
+  set(SPIRV_TOOLS_FULL_VISIBILITY ${SPIRV_TOOLS}-static)
+elseif (SPIRV_TOOLS_BUILD_SHARED)
+  # If only building a shared library, link other libraries to the
+  # shared library. Also, other libraries should be shared
+  set(SPIRV_TOOLS_LIBRARY_TYPE "SHARED")
+  set(SPIRV_TOOLS_FULL_VISIBILITY ${SPIRV_TOOLS}-shared)
+else()
+  message(FATAL_ERROR "You must set one of "
+    "SPIRV_TOOLS_BUILD_STATIC or SPIRV_TOOLS_BUILD_SHARED!")
+endif()
+
+option(ENABLE_EXCEPTIONS_ON_MSVC
+    "Build SPIRV-TOOLS with C++ exceptions enabled in MSVC" ON)
+ 
+ function(spvtools_default_compile_options TARGET)
+   target_compile_options(${TARGET} PRIVATE ${SPIRV_WARNINGS})
+@@ -372,7 +384,7 @@ if (NOT "${SPIRV_SKIP_TESTS}")
+ endif()
+ 
+ set(SPIRV_LIBRARIES "-lSPIRV-Tools-opt -lSPIRV-Tools -lSPIRV-Tools-link")
+-set(SPIRV_SHARED_LIBRARIES "-lSPIRV-Tools-shared")
+set(SPIRV_SHARED_LIBRARIES "-lSPIRV-Tools")
+ 
+ # Build pkg-config file
+ # Use a first-class target so it's regenerated when relevant files are updated.
+@@ -388,7 +400,12 @@ add_custom_command(
+                       -DSPIRV_LIBRARIES=${SPIRV_LIBRARIES}
+                       -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/write_pkg_config.cmake
+         DEPENDS "CHANGES" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/SPIRV-Tools.pc.in" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/write_pkg_config.cmake")
+-add_custom_command(
+
+set(pc_files ${CMAKE_CURRENT_BINARY_DIR}/SPIRV-Tools.pc)
+
+# TODO(crueter): remove?
+if (SPIRV_TOOLS_BUILD_SHARED)
+  add_custom_command(
+         OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/SPIRV-Tools-shared.pc
+         COMMAND ${CMAKE_COMMAND}
+                       -DCHANGES_FILE=${CMAKE_CURRENT_SOURCE_DIR}/CHANGES
+@@ -400,9 +417,12 @@ add_custom_command(
+                       -DSPIRV_SHARED_LIBRARIES=${SPIRV_SHARED_LIBRARIES}
+                       -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/write_pkg_config.cmake
+         DEPENDS "CHANGES" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/SPIRV-Tools-shared.pc.in" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/write_pkg_config.cmake")
+-add_custom_target(spirv-tools-pkg-config 
+-        ALL 
+-        DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/SPIRV-Tools-shared.pc ${CMAKE_CURRENT_BINARY_DIR}/SPIRV-Tools.pc)
+  set(pc_files ${pc_files} ${CMAKE_CURRENT_BINARY_DIR}/SPIRV-Tools-shared.pc)
+endif()
+
+add_custom_target(spirv-tools-pkg-config
+        ALL
+        DEPENDS ${pc_files})
+ 
+ # Install pkg-config file
+ if (ENABLE_SPIRV_TOOLS_INSTALL)
+diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
+index bfa1e661bc..fd3712c70c 100644
+--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
+@@ -337,49 +337,44 @@ function(spirv_tools_default_target_options target)
+   )
+   set_property(TARGET ${target} PROPERTY FOLDER "SPIRV-Tools libraries")
+   spvtools_check_symbol_exports(${target})
+-  add_dependencies(${target} spirv-tools-build-version core_tables extinst_tables)
+  add_dependencies(${target}
+    spirv-tools-build-version core_tables extinst_tables)
+ endfunction()
+ 
+-# Always build ${SPIRV_TOOLS}-shared. This is expected distro packages, and
+-# unlike the other SPIRV_TOOLS target, defaults to hidden symbol visibility.
+-add_library(${SPIRV_TOOLS}-shared SHARED ${SPIRV_SOURCES})
+-if (SPIRV_TOOLS_USE_MIMALLOC)
+-  target_link_libraries(${SPIRV_TOOLS}-shared PRIVATE mimalloc-static)
+if (SPIRV_TOOLS_BUILD_SHARED)
+  add_library(${SPIRV_TOOLS}-shared SHARED ${SPIRV_SOURCES})
+  if (SPIRV_TOOLS_USE_MIMALLOC)
+    target_link_libraries(${SPIRV_TOOLS}-shared PRIVATE mimalloc-static)
+  endif()
+
+  set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES
+    OUTPUT_NAME "${SPIRV_TOOLS}")
+  spirv_tools_default_target_options(${SPIRV_TOOLS}-shared)
+
+  target_compile_definitions(${SPIRV_TOOLS}-shared
+    PRIVATE SPIRV_TOOLS_IMPLEMENTATION
+    PUBLIC SPIRV_TOOLS_SHAREDLIB)
+
+  list(APPEND SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS}-shared)
+ endif()
+-spirv_tools_default_target_options(${SPIRV_TOOLS}-shared)
+-set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES CXX_VISIBILITY_PRESET hidden)
+-target_compile_definitions(${SPIRV_TOOLS}-shared
+-  PRIVATE SPIRV_TOOLS_IMPLEMENTATION
+-  PUBLIC SPIRV_TOOLS_SHAREDLIB
+-)
+ 
+ if(SPIRV_TOOLS_BUILD_STATIC)
+   add_library(${SPIRV_TOOLS}-static STATIC ${SPIRV_SOURCES})
+   if (SPIRV_TOOLS_USE_MIMALLOC AND SPIRV_TOOLS_USE_MIMALLOC_IN_STATIC_BUILD)
+     target_link_libraries(${SPIRV_TOOLS}-shared PRIVATE mimalloc-static)
+   endif()
+
+   spirv_tools_default_target_options(${SPIRV_TOOLS}-static)
+-  # The static target does not have the '-static' suffix.
+-  set_target_properties(${SPIRV_TOOLS}-static PROPERTIES OUTPUT_NAME "${SPIRV_TOOLS}")
+-
+-  # Create the "${SPIRV_TOOLS}" target as an alias to either "${SPIRV_TOOLS}-static"
+-  # or "${SPIRV_TOOLS}-shared" depending on the value of BUILD_SHARED_LIBS.
+-  if(BUILD_SHARED_LIBS)
+-    add_library(${SPIRV_TOOLS} ALIAS ${SPIRV_TOOLS}-shared)
+-  else()
+-    add_library(${SPIRV_TOOLS} ALIAS ${SPIRV_TOOLS}-static)
+-  endif()
+  set_target_properties(${SPIRV_TOOLS}-static PROPERTIES
+    OUTPUT_NAME "${SPIRV_TOOLS_STATIC_LIBNAME}")
+ 
+-  set(SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS}-static ${SPIRV_TOOLS}-shared)
+-else()
+-  add_library(${SPIRV_TOOLS} ${SPIRV_TOOLS_LIBRARY_TYPE} ${SPIRV_SOURCES})
+-  if (SPIRV_TOOLS_USE_MIMALLOC)
+-    target_link_libraries(${SPIRV_TOOLS} PRIVATE mimalloc-static)
+-  endif()
+-  spirv_tools_default_target_options(${SPIRV_TOOLS})
+-  set(SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS} ${SPIRV_TOOLS}-shared)
+  list(APPEND SPIRV_TOOLS_TARGETS ${SPIRV_TOOLS}-static)
+ endif()
+ 
+# Create the "SPIRV-Tools" target as an alias to either "SPIRV-Tools-static"
+# or "SPIRV-Tools-shared" depending on the value of SPIRV_TOOLS_BUILD_SHARED.
+add_library(${SPIRV_TOOLS} ALIAS ${SPIRV_TOOLS_FULL_VISIBILITY})
+
+ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
+   find_library(LIBRT rt)
+   if(LIBRT)
+@@ -390,14 +385,17 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
+ endif()
+ 
+ if(ENABLE_SPIRV_TOOLS_INSTALL)
+-  if (SPIRV_TOOLS_USE_MIMALLOC AND (NOT SPIRV_TOOLS_BUILD_STATIC OR SPIRV_TOOLS_USE_MIMALLOC_IN_STATIC_BUILD))
+  if (SPIRV_TOOLS_USE_MIMALLOC AND
+    (NOT SPIRV_TOOLS_BUILD_STATIC OR SPIRV_TOOLS_USE_MIMALLOC_IN_STATIC_BUILD))
+     list(APPEND SPIRV_TOOLS_TARGETS mimalloc-static)
+   endif()
+   install(TARGETS ${SPIRV_TOOLS_TARGETS} EXPORT ${SPIRV_TOOLS}Targets)
+   export(EXPORT ${SPIRV_TOOLS}Targets FILE ${SPIRV_TOOLS}Target.cmake)
+ 
+   spvtools_config_package_dir(${SPIRV_TOOLS} PACKAGE_DIR)
+-  install(EXPORT ${SPIRV_TOOLS}Targets FILE ${SPIRV_TOOLS}Target.cmake DESTINATION ${PACKAGE_DIR})
+  install(EXPORT ${SPIRV_TOOLS}Targets
+    FILE ${SPIRV_TOOLS}Target.cmake
+    DESTINATION ${PACKAGE_DIR})
+ 
+   # Special config file for root library compared to other libs.
+   file(WRITE ${CMAKE_BINARY_DIR}/${SPIRV_TOOLS}Config.cmake
@@ -130,6 +130,7 @@ if (YUZU_STATIC_BUILD)

        # these libs do not properly provide static libs/let you do it with cmake
        set(fmt_FORCE_BUNDLED ON)
+        set(SPIRV-Tools_FORCE_BUNDLED ON)
        set(SPIRV-Headers_FORCE_BUNDLED ON)
        set(zstd_FORCE_BUNDLED ON)
    endif()
@@ -522,6 +523,7 @@ if (NOT YUZU_STATIC_ROOM)
    find_package(VulkanMemoryAllocator)
    find_package(VulkanUtilityLibraries)
    find_package(SimpleIni)
+    find_package(SPIRV-Tools)
    find_package(sirit)
    find_package(gamemode)
    find_package(frozen)
@@ -0,0 +1,26 @@
+# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+# SPDX-FileCopyrightText: 2022 yuzu Emulator Project
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+include(FindPackageHandleStandardArgs)
+
+find_package(PkgConfig QUIET)
+pkg_search_module(SPIRV-Tools QUIET IMPORTED_TARGET SPIRV-Tools)
+find_package_handle_standard_args(SPIRV-Tools
+    REQUIRED_VARS SPIRV-Tools_LINK_LIBRARIES
+    VERSION_VAR SPIRV-Tools_VERSION
+)
+
+if (PLATFORM_MSYS)
+    FixMsysPath(PkgConfig::SPIRV-Tools)
+endif()
+
+if (SPIRV-Tools_FOUND AND NOT TARGET SPIRV-Tools::SPIRV-Tools)
+    if (TARGET SPIRV-Tools)
+        add_library(SPIRV-Tools::SPIRV-Tools ALIAS SPIRV-Tools)
+    else()
+        add_library(SPIRV-Tools::SPIRV-Tools ALIAS PkgConfig::SPIRV-Tools)
+    endif()
+endif()
@@ -35,17 +35,17 @@ set(GIT_DESC ${BUILD_VERSION})
 # Generate cpp with Git revision from template
 # Also if this is a CI build, add the build name (ie: Nightly, Canary) to the scm_rev file as well

-# Auto-updater metadata! Must somewhat mirror GitHub/Forgejo API endpoint
-
-set(BUILD_AUTO_UPDATE_API_PATH "/latest/release.json")
+# Auto-updater metadata! Must somewhat mirror GitHub API endpoint
 if (NIGHTLY_BUILD)
    set(BUILD_AUTO_UPDATE_WEBSITE "https://git.eden-emu.dev")
-    set(BUILD_AUTO_UPDATE_API "nightly.eden-emu.dev")
+    set(BUILD_AUTO_UPDATE_API "git.eden-emu.dev")
+    set(BUILD_AUTO_UPDATE_API_PATH "/api/v1/repos/")
    set(BUILD_AUTO_UPDATE_REPO "eden-ci/nightly")
    set(REPO_NAME "Eden Nightly")
 else()
    set(BUILD_AUTO_UPDATE_WEBSITE "https://git.eden-emu.dev")
-    set(BUILD_AUTO_UPDATE_API "stable.eden-emu.dev")
+    set(BUILD_AUTO_UPDATE_API "git.eden-emu.dev")
+    set(BUILD_AUTO_UPDATE_API_PATH "/api/v1/repos/")
    set(BUILD_AUTO_UPDATE_REPO "eden-emu/eden")
    set(REPO_NAME "Eden")
 endif()
@@ -192,6 +192,14 @@ else()
    endif()
 endif()

+# SPIRV Tools
+AddJsonPackage(spirv-tools)
+
+if (SPIRV-Tools_ADDED)
+    add_library(SPIRV-Tools::SPIRV-Tools ALIAS SPIRV-Tools-static)
+    target_link_libraries(SPIRV-Tools-static PRIVATE SPIRV-Tools-opt SPIRV-Tools-link)
+endif()
+
 # Catch2
 if (YUZU_TESTS OR DYNARMIC_TESTS)
    AddJsonPackage(catch2)
@@ -102,6 +102,20 @@
        "git_version": "1.3.18",
        "find_args": "MODULE"
    },
+    "spirv-tools": {
+        "package": "SPIRV-Tools",
+        "repo": "KhronosGroup/SPIRV-Tools",
+        "sha": "0a7e28689a",
+        "hash": "eadfcceb82f4b414528d99962335e4f806101168474028f3cf7691ac40c37f323decf2a42c525e2d5bfa6f14ff132d6c5cf9b87c151490efad01f5e13ade1520",
+        "git_version": "2025.4",
+        "options": [
+            "SPIRV_SKIP_EXECUTABLES ON"
+        ],
+        "patches": [
+            "0001-netbsd-fix.patch",
+            "0002-allow-static-only.patch"
+        ]
+    },
    "spirv-headers": {
        "package": "SPIRV-Headers",
        "repo": "KhronosGroup/SPIRV-Headers",
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 # SPDX-License-Identifier: GPL-3.0-or-later

 # SPDX-FileCopyrightText: 2021 yuzu Emulator Project
@@ -254,7 +254,7 @@ else()
        OUTPUT
            ${FFmpeg_BUILD_LIBRARIES}
        COMMAND
-            gmake ${FFmpeg_MAKE_ARGS}
+            make ${FFmpeg_MAKE_ARGS}
        WORKING_DIRECTORY
            ${FFmpeg_BUILD_DIR}
    )
@@ -15,7 +15,6 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
-import android.content.pm.PackageManager
 import android.content.res.Configuration
 import android.graphics.Rect
 import android.graphics.drawable.Icon
@@ -101,7 +100,6 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener, InputManager
    private var romSwapGeneration = 0
    private var hasEmulationSession = processHasEmulationSession
    private val romSwapStopTimeoutRunnable = Runnable { onRomSwapStopTimeout() }
-    private val pictureInPictureFailureActions: MutableSet<String> = mutableSetOf()

    private fun onRomSwapStopTimeout() {
        if (!isWaitingForRomSwapStop) {
@@ -268,18 +266,12 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener, InputManager
    }

    override fun onUserLeaveHint() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S ||
-            !isPictureInPictureSupported() ||
-            !BooleanSetting.PICTURE_IN_PICTURE.getBoolean() ||
-            isInPictureInPictureMode
-        ) {
-            return
-        }
-
-        val pictureInPictureParamsBuilder = PictureInPictureParams.Builder()
-            .getPictureInPictureActionsBuilder().getPictureInPictureAspectBuilder()
-        runPictureInPictureAction("enter picture-in-picture mode") {
-            enterPictureInPictureMode(pictureInPictureParamsBuilder.build())
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
+            if (BooleanSetting.PICTURE_IN_PICTURE.getBoolean() && !isInPictureInPictureMode) {
+                val pictureInPictureParamsBuilder = PictureInPictureParams.Builder()
+                    .getPictureInPictureActionsBuilder().getPictureInPictureAspectBuilder()
+                enterPictureInPictureMode(pictureInPictureParamsBuilder.build())
+            }
        }
    }

@@ -659,29 +651,7 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener, InputManager
        return this.apply { setActions(pictureInPictureActions) }
    }

-    private fun isPictureInPictureSupported() =
-        Build.VERSION.SDK_INT >= Build.VERSION_CODES.O &&
-            packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE)
-
-    private fun runPictureInPictureAction(actionName: String, action: () -> Unit) {
-        try {
-            action()
-        } catch (e: IllegalStateException) {
-            if (pictureInPictureFailureActions.add(actionName)) {
-                Log.warning("[PiP] Failed to $actionName: ${e.message}")
-            }
-        } catch (e: UnsupportedOperationException) {
-            if (pictureInPictureFailureActions.add(actionName)) {
-                Log.warning("[PiP] Failed to $actionName: ${e.message}")
-            }
-        }
-    }
-
    fun buildPictureInPictureParams() {
-        if (!isPictureInPictureSupported()) {
-            return
-        }
-
        val pictureInPictureParamsBuilder = PictureInPictureParams.Builder()
            .getPictureInPictureActionsBuilder().getPictureInPictureAspectBuilder()
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
@@ -691,9 +661,7 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener, InputManager
                BooleanSetting.PICTURE_IN_PICTURE.getBoolean() && isEmulationActive
            )
        }
-        runPictureInPictureAction("set picture-in-picture params") {
-            setPictureInPictureParams(pictureInPictureParamsBuilder.build())
-        }
+        setPictureInPictureParams(pictureInPictureParamsBuilder.build())
    }

    fun displayMultiplayerDialog() {
@@ -1,7 +1,3 @@
-
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@@ -37,10 +33,8 @@ object SoftwareKeyboard {
        val emulationActivity = NativeLibrary.sEmulationActivity.get()

        val overlayView = emulationActivity!!.findViewById<View>(R.id.surface_input_overlay)
-        overlayView.requestFocus()
        val im =
            overlayView.context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
-        im.restartInput(overlayView)
        im.showSoftInput(overlayView, InputMethodManager.SHOW_FORCED)

        // There isn't a good way to know that the IMM is dismissed, so poll every 500ms to submit inline keyboard result.
@@ -17,7 +17,6 @@ enum class BooleanSetting(override val key: String) : AbstractBooleanSetting {
    USE_CUSTOM_CPU_TICKS("use_custom_cpu_ticks"),
    SKIP_CPU_INNER_INVALIDATION("skip_cpu_inner_invalidation"),
    FIX_BLOOM_EFFECTS("fix_bloom_effects"),
-    EMULATE_BGR565("emulate_bgr565"),
    CPUOPT_UNSAFE_HOST_MMU("cpuopt_unsafe_host_mmu"),
    USE_DOCKED_MODE("use_docked_mode"),
    USE_AUTO_STUB("use_auto_stub"),
@@ -24,6 +24,7 @@ enum class IntSetting(override val key: String) : AbstractIntSetting {
    RENDERER_ANTI_ALIASING("anti_aliasing"),
    RENDERER_SCREEN_LAYOUT("screen_layout"),
    RENDERER_ASPECT_RATIO("aspect_ratio"),
+    RENDERER_OPTIMIZE_SPIRV_OUTPUT("optimize_spirv_output"),

    RENDERER_DYNA_STATE("dyna_state"),
    DMA_ACCURACY("dma_accuracy"),
@@ -643,6 +643,15 @@ abstract class SettingsItem(
                    descriptionId = R.string.renderer_async_presentation_description
                )
            )
+            put(
+                SingleChoiceSetting(
+                    IntSetting.RENDERER_OPTIMIZE_SPIRV_OUTPUT,
+                    titleId = R.string.renderer_optimize_spirv_output,
+                    descriptionId = R.string.renderer_optimize_spirv_output_description,
+                    choicesId = R.array.optimizeSpirvOutputEntries,
+                    valuesId = R.array.optimizeSpirvOutputValues
+                )
+            )
            put(
                SingleChoiceSetting(
                    IntSetting.DMA_ACCURACY,
@@ -747,13 +756,6 @@ abstract class SettingsItem(
                    descriptionId = R.string.fix_bloom_effects_description
                )
            )
-            put(
-                SwitchSetting(
-                    BooleanSetting.EMULATE_BGR565,
-                    titleId = R.string.emulate_bgr565,
-                    descriptionId = R.string.emulate_bgr565_description
-                )
-            )
            put(
                SwitchSetting(
                    BooleanSetting.CPUOPT_UNSAFE_HOST_MMU,
@@ -271,6 +271,7 @@ class SettingsFragmentPresenter(
                add(IntSetting.FSR_SHARPENING_SLIDER.key)
            }
            add(IntSetting.RENDERER_ANTI_ALIASING.key)
+            add(IntSetting.RENDERER_OPTIMIZE_SPIRV_OUTPUT.key)

            add(HeaderSetting(R.string.advanced))

@@ -292,7 +293,6 @@ class SettingsFragmentPresenter(
            add(IntSetting.FAST_GPU_TIME.key)
            add(BooleanSetting.SKIP_CPU_INNER_INVALIDATION.key)
            add(BooleanSetting.FIX_BLOOM_EFFECTS.key)
-            add(BooleanSetting.EMULATE_BGR565.key)
            add(BooleanSetting.RENDERER_ASYNCHRONOUS_SHADERS.key)
            add(BooleanSetting.RENDERER_ASYNCHRONOUS_GPU_EMULATION.key)
            add(BooleanSetting.RENDERER_ASYNC_PRESENTATION.key)
@@ -17,23 +17,16 @@ import android.graphics.drawable.VectorDrawable
 import android.os.Build
 import android.os.Handler
 import android.os.Looper
-import android.text.Editable
-import android.text.InputType
 import android.util.AttributeSet
 import android.view.HapticFeedbackConstants
-import android.view.KeyEvent
 import android.view.MotionEvent
 import android.view.View
 import android.view.View.OnTouchListener
 import android.view.WindowInsets
-import android.view.inputmethod.BaseInputConnection
-import android.view.inputmethod.EditorInfo
-import android.view.inputmethod.InputConnection
 import androidx.core.content.ContextCompat
 import androidx.window.layout.WindowMetricsCalculator
 import kotlin.math.max
 import kotlin.math.min
-import org.yuzu.yuzu_emu.NativeLibrary
 import org.yuzu.yuzu_emu.features.input.NativeInput
 import org.yuzu.yuzu_emu.R
 import org.yuzu.yuzu_emu.features.input.model.NativeAnalog
@@ -56,7 +49,6 @@ class InputOverlay(context: Context, attrs: AttributeSet?) :
    private val overlayButtons: MutableSet<InputOverlayDrawableButton> = HashSet()
    private val overlayDpads: MutableSet<InputOverlayDrawableDpad> = HashSet()
    private val overlayJoysticks: MutableSet<InputOverlayDrawableJoystick> = HashSet()
-    private val imeEditable = Editable.Factory.getInstance().newEditable("")

    private var inEditMode = false
    private var gamelessMode = false
@@ -83,63 +75,6 @@ class InputOverlay(context: Context, attrs: AttributeSet?) :
    // External listener for EmulationFragment joypad overlay auto-hide
    var touchEventListener: ((MotionEvent) -> Unit)? = null

-    override fun onCheckIsTextEditor(): Boolean = true
-
-    override fun onCreateInputConnection(outAttrs: EditorInfo): InputConnection {
-        imeEditable.clear()
-        outAttrs.inputType =
-            InputType.TYPE_CLASS_TEXT or
-                InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS or
-                InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD
-        outAttrs.imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI or EditorInfo.IME_ACTION_DONE
-        outAttrs.initialSelStart = 0
-        outAttrs.initialSelEnd = 0
-
-        return object : BaseInputConnection(this, true) {
-            override fun getEditable(): Editable = imeEditable
-
-            override fun commitText(text: CharSequence?, newCursorPosition: Int): Boolean {
-                if (!text.isNullOrEmpty()) {
-                    forwardCommittedText(text)
-                }
-                return super.commitText(text, newCursorPosition)
-            }
-
-            override fun deleteSurroundingText(beforeLength: Int, afterLength: Int): Boolean {
-                repeat(beforeLength.coerceAtLeast(0)) {
-                    NativeLibrary.submitInlineKeyboardInput(KeyEvent.KEYCODE_DEL)
-                }
-                return super.deleteSurroundingText(beforeLength, afterLength)
-            }
-
-            override fun sendKeyEvent(event: KeyEvent): Boolean {
-                if (event.action != KeyEvent.ACTION_DOWN) {
-                    return true
-                }
-
-                when (event.keyCode) {
-                    KeyEvent.KEYCODE_BACK,
-                    KeyEvent.KEYCODE_DEL,
-                    KeyEvent.KEYCODE_ENTER -> {
-                        NativeLibrary.submitInlineKeyboardInput(event.keyCode)
-                    }
-                    else -> {
-                        val textChar = event.unicodeChar
-                        if (textChar != 0) {
-                            NativeLibrary.submitInlineKeyboardText(textChar.toChar().toString())
-                        }
-                    }
-                }
-                return true
-            }
-
-            override fun performEditorAction(actionCode: Int): Boolean {
-                NativeLibrary.submitInlineKeyboardInput(KeyEvent.KEYCODE_ENTER)
-                return true
-            }
-        }
-    }
-
    override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
        super.onLayout(changed, left, top, right, bottom)

@@ -184,25 +119,6 @@ class InputOverlay(context: Context, attrs: AttributeSet?) :
        }
    }

-    private fun forwardCommittedText(text: CharSequence) {
-        val builder = StringBuilder()
-        text.forEach { character ->
-            when (character) {
-                '\n' -> {
-                    if (builder.isNotEmpty()) {
-                        NativeLibrary.submitInlineKeyboardText(builder.toString())
-                        builder.clear()
-                    }
-                    NativeLibrary.submitInlineKeyboardInput(KeyEvent.KEYCODE_ENTER)
-                }
-                else -> builder.append(character)
-            }
-        }
-        if (builder.isNotEmpty()) {
-            NativeLibrary.submitInlineKeyboardText(builder.toString())
-        }
-    }
-
    private fun drawGrid(canvas: Canvas) {
        val gridSize = IntSetting.OVERLAY_GRID_SIZE.getInt()
        val width = canvas.width
@@ -1726,8 +1726,9 @@ JNIEXPORT jstring JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_getUpdateUrl(
        jobject obj,
        jstring version) {
    const char* version_str = env->GetStringUTFChars(version, nullptr);
-    const std::string url = fmt::format("{}/{}",
-        std::string{Common::g_build_auto_update_api},
+    const std::string url = fmt::format("{}/{}/releases/tag/{}",
+        std::string{Common::g_build_auto_update_website},
+        std::string{Common::g_build_auto_update_repo},
        version_str);
    env->ReleaseStringUTFChars(version, version_str);
    return env->NewStringUTF(url.c_str());
@@ -1759,10 +1760,11 @@ JNIEXPORT jstring JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_getUpdateApkUrl(
    }

    const std::string apk_filename = fmt::format("Eden-Android-{}-{}.apk", artifact_str, variant);
-
-    const std::string url = fmt::format("{}/{}/{}",
-        std::string{Common::g_build_auto_update_api},
-        version_str, apk_filename);
+    const std::string url = fmt::format("{}/{}/releases/download/{}/{}",
+        std::string{Common::g_build_auto_update_website},
+        std::string{Common::g_build_auto_update_repo},
+        version_str,
+        apk_filename);

    env->ReleaseStringUTFChars(tag, version_str);
    env->ReleaseStringUTFChars(artifact, artifact_str);
@@ -463,6 +463,8 @@
    <string name="fsr_sharpness">حدة FSR</string>
    <string name="fsr_sharpness_description">يحدد مدى وضوح الصورة عند استخدام التباين الديناميكي لـ FSR</string>
    <string name="renderer_anti_aliasing">طريقة مضاد التعرج</string>
+    <string name="renderer_optimize_spirv_output">تحسين مخرجات SPIRV</string>
+    <string name="renderer_optimize_spirv_output_description">يعمل على تحسين أداء برامج التظليل المجمعة لتحسين كفاءة وحدة معالجة الرسومات، ولكنه قد يؤدي إلى زيادة وقت التحميل وإبطاء السرعة في البداية.</string>


    <string name="advanced">متقدم</string>
@@ -493,7 +495,7 @@
    <string name="enable_buffer_history">تمكين سجل التخزين المؤقت</string>
    <string name="enable_buffer_history_description">يُتيح هذا الخيار الوصول إلى حالات التخزين المؤقت السابقة. وقد يُحسّن جودة العرض وثبات الأداء في بعض الألعاب.</string>
    <string name="use_optimized_vertex_buffers">مخازن الرؤوس المُحسّنة</string>
-    <string name="use_optimized_vertex_buffers_description">يتيح ربط مخزن الرؤوس المُحسّن لتحسين الأداء. يتطلب برامج تشغيل Turnip/QCOM من إصدار Mesa 26.0 أو أحدث. سيؤدي إلى تعطل النظام عند استخدام برامج تشغيل Turnip الأقدم.</string>
+    <string name="use_optimized_vertex_buffers_description">يُتيح ربطًا مُحسَّنًا لمخازن الرؤوس لتحسين الأداء. يتطلب برامج تشغيل Turnip من Mesa 26.0 أو أحدث. قد يتعطل على برامج التشغيل الأقدم.</string>

    <string name="hacks">اختراقات</string>

@@ -502,9 +504,7 @@
    <string name="skip_cpu_inner_invalidation">تخطي إبطال صلاحية وحدة المعالجة المركزية الداخلية</string>
    <string name="skip_cpu_inner_invalidation_description">يتخطى بعض عمليات إبطال ذاكرة التخزين المؤقتة من جانب وحدة المعالجة المركزية أثناء تحديثات الذاكرة، مما يقلل من استخدام وحدة المعالجة المركزية ويحسن أداءها. قد يتسبب ذلك في حدوث أعطال أو تعطل في بعض الألعاب.</string>
    <string name="fix_bloom_effects">إصلاح تأثيرات التوهج</string>
-    <string name="fix_bloom_effects_description">يقلل من ضبابية التوهج في LA/EOW  (Adreno A6XX - A7XX/ Turnip)، ويزيل التوهج في Burnout. تحذير: قد يسبب تشوهات رسومية في ألعاب أخرى.</string>
-    <string name="emulate_bgr565">محاكاة BGR565</string>
-    <string name="emulate_bgr565_description">يُصلح مشاكل انعكاس الألوان في الألعاب أو ظهور تشوهات غريبة أو ظلال غريبة.</string>
+    <string name="fix_bloom_effects_description">يقلل من ضبابية التوهج في LA/EOW (Adreno 700)، ويزيل التوهج في Burnout. تحذير: قد يسبب ظهور خلل رسومي في ألعاب أخرى.</string>
    <string name="renderer_asynchronous_shaders">استخدم تظليل غير متزامن</string>
    <string name="renderer_asynchronous_shaders_description">يقوم بتجميع التظليل بشكل غير متزامن. قد يقلل ذلك من التقطعات ولكنه قد يؤدي أيضًا إلى حدوث أخطاء.</string>
    <string name="gpu_unswizzle_settings">إعدادات إلغاء ترتيب بيانات وحدة معالجة الرسومات</string>
@@ -332,6 +332,7 @@
    <string name="fsr_sharpness">تیژی FSR</string>
    <string name="fsr_sharpness_description">دیاریکردنی تیژی وێنە لە کاتی بەکارهێنانی FSR</string>
    <string name="renderer_anti_aliasing">شێوازی دژە-خاوڕۆیی</string>
+    <string name="renderer_optimize_spirv_output_description">شێیدەرە کۆمپایلکراوەکان باش دەکات بۆ باشترکردنی کارایی GPU.</string>


    <string name="dma_accuracy">وردیی DMA</string>
@@ -442,6 +442,8 @@
    <string name="fsr_sharpness">Ostrost FSR</string>
    <string name="fsr_sharpness_description">Určuje jak ostře bude obraz vypadat při použití dynamického kontrastu FSR.</string>
    <string name="renderer_anti_aliasing">Metoda anti-aliasingu</string>
+    <string name="renderer_optimize_spirv_output">Optimalizovat výstup SPIRV</string>
+    <string name="renderer_optimize_spirv_output_description">Optimalizuje kompilované shadery pro zlepšení efektivity GPU, ale mohou se objevit delší nahrávací časy a zpomalení v úvodu.</string>


    <string name="advanced">Pokročilé</string>
@@ -442,6 +442,8 @@ Wird der Handheld-Modus verwendet, verringert es die Auflösung und erhöht die
    <string name="fsr_sharpness">FSR-Schärfe</string>
    <string name="fsr_sharpness_description">Bestimmt die Schärfe bei FSR-Nutzung.</string>
    <string name="renderer_anti_aliasing">Kantenglättung</string>
+    <string name="renderer_optimize_spirv_output">Optimiere SPIRV-Ausgabe</string>
+    <string name="renderer_optimize_spirv_output_description">Optimiert den kompilierten Shader, um die GPU-Effizienz zu verbessern.</string>


    <string name="advanced">Erweitert</string>
@@ -272,7 +272,7 @@
    <string name="general_information">Información general</string>
    <string name="hardware">Hardware</string>
    <string name="supported_abis">ABIs soportadas</string>
-    <string name="cpu_info">Información de la CPU</string>
+    <string name="cpu_info">Información del procesador</string>
    <string name="gpu_information">Información de la GPU</string>
    <string name="vulkan_driver_version">Versión del controlador de Vulkan</string>
    <string name="error_getting_emulator_info">Error al obtener la información del emulador</string>
@@ -416,8 +416,8 @@
    <string name="turbo_speed_limit_description">Cuando el modo turbo esté activado, la emulación se ejecutará a esta velocidad.</string>
    <string name="slow_speed_limit">Velocidad lenta</string>
    <string name="slow_speed_limit_description">Cuando el modo lento esté activado, la emulación se ejecutará a esta velocidad.</string>
-    <string name="cpu_backend">Motor de la CPU</string>
-    <string name="cpu_accuracy">Precisión de la CPU</string>
+    <string name="cpu_backend">Motor del procesador</string>
+    <string name="cpu_accuracy">Precisión del procesador</string>
    <string name="value_with_units">%1$s%2$s</string>

    <!-- System settings strings -->
@@ -433,7 +433,7 @@
    <string name="set_custom_rtc">Configurar RTC personalizado</string>

    <!-- CPU -->
-    <string name="fast_cpu_time">Overclock de la CPU</string>
+    <string name="fast_cpu_time">Overclock del procesador</string>
    <string name="fast_cpu_time_description">Fuerza a la CPU emulada a ejecutarser a una velocidad de reloj más alta, lo cual reduce ciertos limitadores de fotogramas por segundo. Usa Boost (1700 MHz) para ejecutar a la velocidad de reloj nativa más alta de la Switch, o Fast (2000 MHz) para ejecutar a una velocidad doble de reloj.</string>
    <string name="custom_cpu_ticks">Ticks de CPU personalizados</string>
    <string name="custom_cpu_ticks_description">Establezca un valor personalizado de los ciclos de la CPU. Los valores más altos pueden aumentar el rendimiento, pero también pueden hacer que el juego se congele. Se recomienda un rango de 77–21000.</string>
@@ -457,6 +457,8 @@
    <string name="fsr_sharpness">Nitidez FSR</string>
    <string name="fsr_sharpness_description">Ajusta la intensidad del filtro de enfoque al usar el contraste dinámico de FSR.</string>
    <string name="renderer_anti_aliasing">Método de suavizado de bordes</string>
+    <string name="renderer_optimize_spirv_output">Optimizar la salida de SPIRV</string>
+    <string name="renderer_optimize_spirv_output_description">Optimiza los sombreadores compilados para mejorar la eficiencia de la GPU.</string>


    <string name="advanced">Avanzado</string>
@@ -487,7 +489,7 @@
    <string name="enable_buffer_history">Activar el historial del búfer</string>
    <string name="enable_buffer_history_description">Permite el acceso al estado del búfer anterior. Esta opción puede mejorar la calidad de renderizado y la consistencia en el rendimiento de algunos juegos.</string>
    <string name="use_optimized_vertex_buffers">Búferes de vértices optimizados</string>
-    <string name="use_optimized_vertex_buffers_description">Permite la optimización del enlace del búfer de vértices para un mejor rendimiento. Requiere controladores Mesa 26.0+ Turnip/ controladores QCOM. Causará fallos con controladores Turnip más antiguos.</string>
+    <string name="use_optimized_vertex_buffers_description">Permite la vinculación optimizada del búfer de vértices para un mejor rendimiento. Requiere controladores de Mesa 26.0+ Turnip. Se producirán fallos en controladores más antiguos.</string>

    <string name="hacks">Hacks</string>

@@ -496,9 +498,7 @@
    <string name="skip_cpu_inner_invalidation">Omitir invalidación interna de la CPU</string>
    <string name="skip_cpu_inner_invalidation_description">Omite ciertas invalidaciones de caché de la CPU durante las actualizaciones de memoria, lo que reduce el uso de la CPU y mejora su rendimiento. Esto puede causar fallos o bloqueos en algunos juegos.</string>
    <string name="fix_bloom_effects">Arreglar los efectos de resplandor</string>
-    <string name="fix_bloom_effects_description">Reduce el efecto de resplandor en LA/EOW (Adreno A6XX - A7XX/ Turnip), elimina el resplandor en Burnout. Advertencia: puede causar artefactos gráficos en otros juegos.</string>
-    <string name="emulate_bgr565">Emular BGR565</string>
-    <string name="emulate_bgr565_description">Soluciona problemas con colores invertidos en juegos, artefactos o sombras extrañas.</string>
+    <string name="fix_bloom_effects_description">Reduce el efecto de resplandor en LA/EOW (Adreno 700), elimina el resplandor en Burnout. Advertencia: puede causar artefactos gráficos en otros juegos.</string>
    <string name="renderer_asynchronous_shaders">Usar sombreadores asíncronos</string>
    <string name="renderer_asynchronous_shaders_description">Compila los sombreadores de forma asíncrona. Esto puede reducir los tirones, pero también puede introducir errores gráficos.</string>
    <string name="gpu_unswizzle_settings">Ajustes de desentrelazado de la GPU</string>
@@ -536,7 +536,7 @@
    <string name="warning_resolution">Escalar la resolución a 2x o más puede causar problemas y ralentizar significativamente su dispositivo.</string>

    <!-- Debug settings strings -->
-    <string name="cpu">CPU</string>
+    <string name="cpu">Procesador</string>
    <string name="use_auto_stub">Usar Auto Stub</string>
    <string name="use_auto_stub_description">Rellena automáticamente servicios y funciones ausentes. Puede mejorar la compatibilidad pero puede causar cierres inesperados.</string>

@@ -125,6 +125,8 @@
    <string name="nvdec_emulation_none">هیچ‌کدام</string>

    <!-- Optimize Spir-V output -->
+    <string name="renderer_optimize_spirv_output">بهینه‌سازی خروجی Spir-V</string>
+    <string name="renderer_optimize_spirv_output_description">شیدر کامپایل شده را برای بهبود کارایی GPU بهینه‌سازی می‌کند.</string>
    <string name="never">هرگز</string>
    <string name="on_load">در هنگام بارگذاری</string>
    <string name="always">همیشه</string>
@@ -455,6 +455,7 @@
    <string name="fsr_sharpness">Netteté FSR</string>
    <string name="fsr_sharpness_description">Détermine à quel point l\'image sera affinée lors de l\'utilisation du contraste dynamique FSR.</string>
    <string name="renderer_anti_aliasing">Méthode d\'anticrénelage</string>
+    <string name="renderer_optimize_spirv_output_description">Optimise le shader compilé pour améliorer l\'efficacité du GPU.</string>


    <string name="dma_accuracy">Précision DMA</string>
@@ -362,6 +362,7 @@
    <string name="fsr_sharpness">חדות FSR</string>
    <string name="fsr_sharpness_description">קובע את מידת החדות בעת שימוש ב-FSR.</string>
    <string name="renderer_anti_aliasing">שיטת Anti-aliasing</string>
+    <string name="renderer_optimize_spirv_output_description">משפר את השאדר המהודר כדי להגביר את יעילות ה-GPU.</string>


    <string name="dma_accuracy">דיוק DMA</string>
@@ -351,6 +351,7 @@
    <string name="fsr_sharpness">FSR élesség</string>
    <string name="fsr_sharpness_description">Meghatározza, milyen éles lesz a kép az FSR dinamikus kontraszt használata közben.</string>
    <string name="renderer_anti_aliasing">Élsimítási módszer</string>
+    <string name="renderer_optimize_spirv_output_description">Optimalizálja a lefordított shadert a GPU hatékonyságának javításáért.</string>


    <string name="dma_accuracy">DMA pontosság</string>
@@ -383,6 +383,7 @@
    <string name="fsr_sharpness">Ketajaman FSR</string>
    <string name="fsr_sharpness_description">Menentukan seberapa tajam gambar akan terlihat saat menggunakan kontras dinamis FSR</string>
    <string name="renderer_anti_aliasing">Metode anti-aliasing</string>
+    <string name="renderer_optimize_spirv_output_description">Mengoptimalkan shader yang dikompilasi untuk meningkatkan efisiensi GPU.</string>


    <string name="dma_accuracy">Akurasi DMA</string>
@@ -390,6 +390,7 @@
    <string name="fsr_sharpness">Nitidezza FSR</string>
    <string name="fsr_sharpness_description">Determina quanto sarà nitida l\'immagine utilizzando il contrasto dinamico di FSR</string>
    <string name="renderer_anti_aliasing">Metodo di anti-aliasing</string>
+    <string name="renderer_optimize_spirv_output_description">Ottimizza lo shader compilato per migliorare l\'efficienza della GPU.</string>


    <string name="dma_accuracy">Precisione DMA</string>
@@ -349,6 +349,7 @@
    <string name="renderer_vsync">垂直同期モード</string>
    <string name="renderer_scaling_filter">ウィンドウ適応フィルター</string>
    <string name="renderer_anti_aliasing">アンチエイリアス方式</string>
+    <string name="renderer_optimize_spirv_output_description">コンパイル済みシェーダーを最適化し、GPUの効率を向上させます。</string>


    <string name="dma_accuracy">DMA精度</string>
@@ -349,6 +349,7 @@
    <string name="renderer_vsync">수직동기화 모드</string>
    <string name="renderer_scaling_filter">윈도우 적응 필터</string>
    <string name="renderer_anti_aliasing">안티에일리어싱 방법</string>
+    <string name="renderer_optimize_spirv_output_description">컴파일된 셰이더를 최적화하여 GPU 효율성을 향상시킵니다.</string>


    <string name="dma_accuracy">DMA 정확도</string>
@@ -332,6 +332,7 @@
    <string name="fsr_sharpness">FSR-skarphet</string>
    <string name="fsr_sharpness_description">Bestemmer bildekvalitet med FSR</string>
    <string name="renderer_anti_aliasing">Anti-aliasing-metode</string>
+    <string name="renderer_optimize_spirv_output_description">Optimaliserer den kompilerte shaderen for å forbedre GPU-effektiviteten.</string>


    <string name="dma_accuracy">DMA-nøyaktighet</string>
@@ -442,6 +442,8 @@
    <string name="fsr_sharpness">Ostrość FSR</string>
    <string name="fsr_sharpness_description">Kontroluje ostrość obrazu w FSR.</string>
    <string name="renderer_anti_aliasing">Metoda wygładzania krawędzi</string>
+    <string name="renderer_optimize_spirv_output">Optymalizuj wyjście SPIRV</string>
+    <string name="renderer_optimize_spirv_output_description">Optymalizuje skompilowany shader w celu poprawy wydajności GPU.</string>


    <string name="advanced">Zaawansowane</string>
@@ -433,6 +433,7 @@
    <string name="fsr_sharpness">Nitidez do FSR</string>
    <string name="fsr_sharpness_description">Determina a nitidez da imagem ao utilizar o contraste dinâmico do FSR</string>
    <string name="renderer_anti_aliasing">Método de Anti-aliasing</string>
+    <string name="renderer_optimize_spirv_output_description">Otimiza o shader compilado para melhorar a eficiência da GPU.</string>


    <string name="advanced">Avançado</string>
@@ -355,6 +355,7 @@
    <string name="fsr_sharpness">Nitidez do FSR</string>
    <string name="fsr_sharpness_description">Determina a nitidez da imagem ao usar contraste dinâmico do FSR</string>
    <string name="renderer_anti_aliasing">Método de Anti-Serrilhado</string>
+    <string name="renderer_optimize_spirv_output_description">Otimiza o shader compilado para melhorar a eficiência da GPU.</string>


    <string name="dma_accuracy">Precisão da DMA</string>
@@ -459,6 +459,8 @@
    <string name="fsr_sharpness">Резкость FSR</string>
    <string name="fsr_sharpness_description">Определяет, насколько чётким будет изображение при использовании динамического контраста FSR.</string>
    <string name="renderer_anti_aliasing">Метод сглаживания</string>
+    <string name="renderer_optimize_spirv_output">Оптимизация вывода SPIRV</string>
+    <string name="renderer_optimize_spirv_output_description">Оптимизирует скомпилированный шейдер для повышения эффективности ГПУ.</string>


    <string name="advanced">Расширенные</string>
@@ -489,6 +491,8 @@
    <string name="enable_buffer_history">Включить историю буфера</string>
    <string name="enable_buffer_history_description">Позволяет обращаться к предыдущим состояниям буфера. Эта опция может повысить качество рендеринга и стабильность производительности в некоторых играх.</string>
    <string name="use_optimized_vertex_buffers">Оптимизированные вершинные буферы</string>
+    <string name="use_optimized_vertex_buffers_description">Активирует оптимизированную привязку вершинных буферов для улучшения производительности. Требуются Mesa Turnip драйвера версией не ниже 26.0, на более старых драйверах будут происходить сбои и краши</string>
+
    <string name="hacks">Хаки</string>

    <string name="fast_gpu_time">Быстрое время ГПУ</string>
@@ -496,6 +500,7 @@
    <string name="skip_cpu_inner_invalidation">Пропустить внутреннюю инвалидацию ЦП</string>
    <string name="skip_cpu_inner_invalidation_description">Пропускает некоторые инвалидации кэша на стороне ЦП при обновлениях памяти, уменьшая нагрузку на процессор и повышая производительность. Может вызывать сбои в некоторых играх.</string>
    <string name="fix_bloom_effects">Исправить эффекты размытия</string>
+    <string name="fix_bloom_effects_description">Частично убирает размытие в LA/EOW (Adreno 700), полностью отключает его в Burnout. Внимание: может вызывать графические артефакты в других играх.</string>
    <string name="renderer_asynchronous_shaders">Использовать асинхронные шейдеры</string>
    <string name="renderer_asynchronous_shaders_description">Компилирует шейдеры асинхронно. Это может уменьшить подтормаживания, но также может вызвать графические артефакты.</string>
    <string name="gpu_unswizzle_settings">Настройки распаковки текстур (Unswizzle)</string>
@@ -354,6 +354,7 @@
    <string name="fsr_sharpness">ФСР оштрина</string>
    <string name="fsr_sharpness_description">Одређује колико ће се слика наоштрен трајати док користи \"ФСР\" динамички контраст</string>
    <string name="renderer_anti_aliasing">Метода против алиасирања</string>
+    <string name="renderer_optimize_spirv_output_description">Оптимизира састављена схадер за побољшање ефикасности ГПУ-а.</string>


    <string name="dma_accuracy">DMA тачност</string>
@@ -459,6 +459,8 @@
    <string name="fsr_sharpness">Різкість FSR</string>
    <string name="fsr_sharpness_description">Визначає різкість зображення при використанні FSR.</string>
    <string name="renderer_anti_aliasing">Згладжування</string>
+    <string name="renderer_optimize_spirv_output">Оптимізовувати виведення SPIRV</string>
+    <string name="renderer_optimize_spirv_output_description">Оптимізує скомпільований шейдер для покращення ефективності GPU.</string>


    <string name="advanced">Додаткові</string>
@@ -489,7 +491,7 @@
    <string name="enable_buffer_history">Увімкнути історію буфера</string>
    <string name="enable_buffer_history_description">Вмикає доступ до попередніх станів буфера. Цей параметр може покращити якість візуалізації та стабільну продуктивність у деяких іграх.</string>
    <string name="use_optimized_vertex_buffers">Оптимізовані буфери вершин</string>
-    <string name="use_optimized_vertex_buffers_description">Застосовує оптимізований буфер вершин, щоб покращити продуктивність. Потребує драйверів Mesa 26.0+ Turnip / QCOM. На старіших драйверах Turnip виникатиме збій.</string>
+    <string name="use_optimized_vertex_buffers_description">Застосовує оптимізований буфер вершин, щоб покращити продуктивність. Потребує драйверів Mesa 26.0+ Turnip. На старіших драйверах виникатиме збій.</string>

    <string name="hacks">Обхідні рішення</string>

@@ -498,9 +500,7 @@
    <string name="skip_cpu_inner_invalidation">Пропустити внутрішнє інвалідування CPU</string>
    <string name="skip_cpu_inner_invalidation_description">Пропускає деякі інвалідації кешу на стороні CPU під час оновлення пам\'яті, зменшуючи навантаження на процесор і покращуючи продуктивність. Може спричинити збої в деяких іграх.</string>
    <string name="fix_bloom_effects">Виправити ефекти світіння</string>
-    <string name="fix_bloom_effects_description">Зменшує розмиття світіння в LA/EOW (Adreno A6XX–A7XX / Turnip), прибирає світіння в Burnout. Увага: може спричинити графічні артефакти в інших іграх.</string>
-    <string name="emulate_bgr565">Емулювати BGR565</string>
-    <string name="emulate_bgr565_description">Виправляє проблеми з інвертованими кольорами в іграх або дивними артефактами чи тінями.</string>
+    <string name="fix_bloom_effects_description">Зменшує розмиття світіння в LA/EOW (Adreno 700), прибирає світіння в Burnout. Увага: може спричинити графічні артефакти в інших іграх.</string>
    <string name="renderer_asynchronous_shaders">Асинхронні шейдери</string>
    <string name="renderer_asynchronous_shaders_description">Компілює шейдери асинхронно. Це може зменшити затримки, але також може спричинити графічні баги.</string>
    <string name="gpu_unswizzle_settings">Налаштування розпакування за допомогою ГП</string>
@@ -330,6 +330,7 @@
    <string name="fsr_sharpness">Độ sắc nét FSR</string>
    <string name="fsr_sharpness_description">Độ sắc nét khi dùng FSR</string>
    <string name="renderer_anti_aliasing">Phương pháp khử răng cưa</string>
+    <string name="renderer_optimize_spirv_output_description">Tối ưu hóa shader đã biên dịch để cải thiện hiệu suất GPU.</string>


    <string name="dma_accuracy">Độ chính xác DMA</string>
@@ -453,6 +453,8 @@
    <string name="fsr_sharpness">FSR 锐化度</string>
    <string name="fsr_sharpness_description">指定使用 FSR 时图像的锐化程度</string>
    <string name="renderer_anti_aliasing">抗锯齿方式</string>
+    <string name="renderer_optimize_spirv_output">优化 SPIRV 输出</string>
+    <string name="renderer_optimize_spirv_output_description">优化编译后的着色器以提高GPU效率。</string>


    <string name="advanced">高级</string>
@@ -474,22 +476,21 @@
    <string name="use_disk_shader_cache_description">将生成的着色器缓存于磁盘中并进行读取，以减少卡顿。</string>
    <string name="renderer_force_max_clock">强制最大时钟 (仅限 Adreno)</string>
    <string name="renderer_force_max_clock_description">强制 GPU 以最大时钟运行 (仍被温控限制)。</string>
-    <string name="renderer_asynchronous_gpu_emulation">GPU 异步模拟</string>
-    <string name="renderer_asynchronous_gpu_emulation_description">异步运行 GPU 模拟，以减少 CPU 停顿并提高吞吐量。仅当遇到与时序相关的问题时才应禁用此功能。</string>
-    <string name="renderer_async_presentation">异步呈现</string>
-    <string name="renderer_async_presentation_description">通过将呈现操作移至单独的 CPU 线程来略微提升性能。</string>
    <string name="renderer_reactive_flushing">启用反应性刷新</string>
-    <string name="renderer_reactive_flushing_description">通过牺牲性能来提高某些游戏的渲染精度。</string>
+    <string name="renderer_reactive_flushing_description">牺牲性能，提高某些游戏的渲染精度。</string>
    <string name="enable_buffer_history">启用缓冲区历史</string>
-    <string name="enable_buffer_history_description">启用对先前缓冲区状态的访问。此选项可在某些游戏中提升渲染质量并保持性能的一致性。</string>
+    <string name="enable_buffer_history_description">允许访问之前的缓冲状态。\n这个选项可能会提升某些游戏的渲染质量和性能一致性。</string>
    <string name="use_optimized_vertex_buffers">优化顶点缓冲区</string>
+    <string name="use_optimized_vertex_buffers_description">实现优化顶点缓冲区绑定以提升性能。需要 Mesa 26.0+ Turnip 驱动。老驱动会崩溃。</string>
+
    <string name="hacks">Hacks</string>

    <string name="fast_gpu_time">GPU 超频频率</string>
-    <string name="fast_gpu_time_description">强制大多数游戏以其最高原生分辨率运行。设置为 256 可获得最佳性能，设置为 512 可获得最佳画面保真度。</string>
+    <string name="fast_gpu_time_description">强制大多数游戏以其最高原生分辨率运行。使用 256 以获得最大性能，使用 512 以获得最大图形保真度。</string>
    <string name="skip_cpu_inner_invalidation">跳过CPU内部无效化</string>
    <string name="skip_cpu_inner_invalidation_description">在内存更新期间跳过某些CPU端缓存无效化，减少CPU使用率并提高其性能。可能会导致某些游戏出现故障或崩溃。</string>
-    <string name="fix_bloom_effects">修复 Bloom 效果</string>
+    <string name="fix_bloom_effects">修复泛光效果</string>
+    <string name="fix_bloom_effects_description">减少《塞尔达传说：智慧的再现》(LA/EOW) 在 Adreno 700 系列 GPU 上的模糊感，并移除《横冲直撞》(Burnout) 中的模糊特效。警告：可能会导致其他游戏出现画面花屏或异常。</string>
    <string name="renderer_asynchronous_shaders">使用异步着色器</string>
    <string name="renderer_asynchronous_shaders_description">异步编译着色器。这可能会减少卡顿，但也可能会导致图形错误。</string>
    <string name="gpu_unswizzle_settings">GPU 还原设置</string>
@@ -440,6 +440,7 @@
    <string name="fsr_sharpness">FSR 銳化度</string>
    <string name="fsr_sharpness_description">使用 FSR 時圖片的銳化程度</string>
    <string name="renderer_anti_aliasing">抗鋸齒</string>
+    <string name="renderer_optimize_spirv_output_description">最佳化編譯後的著色器以提高GPU效率。</string>


    <string name="dma_accuracy">DMA 準確度</string>
@@ -469,6 +469,8 @@
    <string name="fsr_sharpness">FSR sharpness</string>
    <string name="fsr_sharpness_description">Determines how sharpened the image will look while using FSR\'s dynamic contrast</string>
    <string name="renderer_anti_aliasing">Anti-aliasing method</string>
+    <string name="renderer_optimize_spirv_output">Optimize SPIRV output</string>
+    <string name="renderer_optimize_spirv_output_description">Optimizes compiled shaders to improve GPU efficiency, but may introduce longer loading times and initial slowdowns.</string>


    <string name="advanced">Advanced</string>
@@ -499,7 +501,7 @@
    <string name="enable_buffer_history">Enable buffer history</string>
    <string name="enable_buffer_history_description">Enables access to previous buffer states. This option may improve rendering quality and performance consistency in some games.</string>
    <string name="use_optimized_vertex_buffers">Optimized Vertex Buffers</string>
-    <string name="use_optimized_vertex_buffers_description">Enables optimized vertex buffer binding for improved performance. Requires Mesa 26.0+ Turnip drivers/ QCOM drivers. Will crash on older Turnip drivers.</string>
+    <string name="use_optimized_vertex_buffers_description">Enables optimized vertex buffer binding for improved performance. Requires Mesa 26.0+ Turnip drivers. Will crash on older drivers.</string>

    <string name="hacks">Hacks</string>

@@ -508,9 +510,7 @@
    <string name="skip_cpu_inner_invalidation">Skip CPU Inner Invalidation</string>
    <string name="skip_cpu_inner_invalidation_description">Skips certain CPU-side cache invalidations during memory updates, reducing CPU usage and improving it\'s performance. This may cause glitches or crashes on some games.</string>
    <string name="fix_bloom_effects">Fix Bloom Effects</string>
-    <string name="fix_bloom_effects_description">Reduces bloom blur in LA/EOW (Adreno A6XX - A7XX/ Turnip), removes bloom in Burnout. Warning: may cause graphical artifacts in other games.</string>
-    <string name="emulate_bgr565">Emulate BGR565</string>
-    <string name="emulate_bgr565_description">Fixes problems with inverted colors in games or strange artifacts or strange shadows.</string>
+    <string name="fix_bloom_effects_description">Reduces bloom blur in LA/EOW (Adreno 700), removes bloom in Burnout. Warning: may cause graphical artifacts in other games.</string>
    <string name="renderer_asynchronous_shaders">Use asynchronous shaders</string>
    <string name="renderer_asynchronous_shaders_description">Compiles shaders asynchronously. This may reduce stutters but may also introduce glitches.</string>
    <string name="gpu_unswizzle_settings">GPU Unswizzle Settings</string>
@@ -243,9 +243,6 @@ void AndroidKeyboard::SubmitInlineKeyboardInput(int key_code) {
                               static_cast<s32>(m_current_text.size()));
        break;
    case KEYCODE_DEL:
-        if (m_current_text.empty()) {
-            return;
-        }
        m_current_text.pop_back();
        submit_inline_callback(Service::AM::Frontend::SwkbdReplyType::ChangedString, m_current_text,
                               static_cast<int>(m_current_text.size()));
@@ -388,6 +388,10 @@ struct Values {
                                                  true,
                                                  true};

+    SwitchableSetting<SpirvOptimizeMode, true> optimize_spirv_output{linkage,
+                                                                     SpirvOptimizeMode::Never,
+                                                                     "optimize_spirv_output",
+                                                                     Category::Renderer};
    SwitchableSetting<bool> use_asynchronous_gpu_emulation{
                                                           linkage, true, "use_asynchronous_gpu_emulation", Category::Renderer};
    // *nix platforms may have issues with the borderless windowed fullscreen mode.
@@ -551,9 +555,6 @@ struct Values {
    SwitchableSetting<bool> fix_bloom_effects{linkage, false, "fix_bloom_effects",
                                                     Category::RendererHacks};

-    SwitchableSetting<bool> emulate_bgr565{linkage, false, "emulate_bgr565",
-                                            Category::RendererHacks};
-
    SwitchableSetting<bool> rescale_hack{linkage, false, "rescale_hack",
                                                     Category::RendererHacks};

@@ -583,7 +584,7 @@ struct Values {

    SwitchableSetting<ExtendedDynamicState> dyna_state{linkage,
 #if defined(ANDROID)
-                                           ExtendedDynamicState::Disabled,
+                                           ExtendedDynamicState::EDS1,
 #elif defined(__APPLE__)
                                           ExtendedDynamicState::Disabled,
 #else
@@ -65,6 +65,17 @@ static inline u64 xgetbv(u32 index) {

 namespace Common {

+CPUCaps::Manufacturer CPUCaps::ParseManufacturer(std::string_view brand_string) {
+    if (brand_string == "GenuineIntel") {
+        return Manufacturer::Intel;
+    } else if (brand_string == "AuthenticAMD") {
+        return Manufacturer::AMD;
+    } else if (brand_string == "HygonGenuine") {
+        return Manufacturer::Hygon;
+    }
+    return Manufacturer::Unknown;
+}
+
 // Detects the various CPU features
 static CPUCaps Detect() {
    CPUCaps caps = {};
@@ -83,6 +94,8 @@ static CPUCaps Detect() {
    std::memcpy(&caps.brand_string[4], &cpu_id[3], sizeof(u32));
    std::memcpy(&caps.brand_string[8], &cpu_id[2], sizeof(u32));

+    caps.manufacturer = CPUCaps::ParseManufacturer(caps.brand_string);
+
    // Set reasonable default cpu string even if brand string not available
    std::strncpy(caps.cpu_string, caps.brand_string, std::size(caps.brand_string));

@@ -121,21 +134,14 @@ static CPUCaps Detect() {
            __cpuidex(cpu_id, 0x00000007, 0x00000000);
            // Can't enable AVX{2,512} unless the XSAVE/XGETBV checks above passed
            if (caps.avx) {
-                // ebx
                caps.avx2 = Common::Bit<5>(cpu_id[1]);
                caps.avx512f = Common::Bit<16>(cpu_id[1]);
                caps.avx512dq = Common::Bit<17>(cpu_id[1]);
                caps.avx512cd = Common::Bit<28>(cpu_id[1]);
                caps.avx512bw = Common::Bit<30>(cpu_id[1]);
                caps.avx512vl = Common::Bit<31>(cpu_id[1]);
-                // ecx
                caps.avx512vbmi = Common::Bit<1>(cpu_id[2]);
-                caps.avx512vbmi2 = Common::Bit<6>(cpu_id[2]);
-                caps.avx512vnni = Common::Bit<11>(cpu_id[2]);
                caps.avx512bitalg = Common::Bit<12>(cpu_id[2]);
-                caps.avx512popcntq = Common::Bit<14>(cpu_id[2]);
-                // edx
-                caps.avx512bf16 = Common::Bit<7>(cpu_id[3]);
            }

            caps.bmi1 = Common::Bit<3>(cpu_id[1]);
@@ -215,15 +221,17 @@ std::optional<int> GetProcessorCount() {
        LOG_ERROR(Frontend, "Failed to query core count.");
        return std::nullopt;
    }
-    std::vector<SYSTEM_LOGICAL_PROCESSOR_INFORMATION> buffer(length / sizeof(SYSTEM_LOGICAL_PROCESSOR_INFORMATION));
+    std::vector<SYSTEM_LOGICAL_PROCESSOR_INFORMATION> buffer(
+        length / sizeof(SYSTEM_LOGICAL_PROCESSOR_INFORMATION));
    // Now query the core count.
    if (!GetLogicalProcessorInformation(buffer.data(), &length)) {
        LOG_ERROR(Frontend, "Failed to query core count.");
        return std::nullopt;
    }
-    return int(std::count_if(buffer.cbegin(), buffer.cend(), [](const auto& proc_info) {
-        return proc_info.Relationship == RelationProcessorCore;
-    }));
+    return static_cast<int>(
+        std::count_if(buffer.cbegin(), buffer.cend(), [](const auto& proc_info) {
+            return proc_info.Relationship == RelationProcessorCore;
+        }));
 #elif defined(__unix__)
    const int thread_count = std::thread::hardware_concurrency();
    std::ifstream smt("/sys/devices/system/cpu/smt/active");
@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
 // SPDX-FileCopyrightText: Copyright 2013 Dolphin Emulator Project / 2015 Citra Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later
@@ -15,6 +12,17 @@ namespace Common {

 /// x86/x64 CPU capabilities that may be detected by this module
 struct CPUCaps {
+
+    enum class Manufacturer : u8 {
+        Unknown = 0,
+        Intel = 1,
+        AMD = 2,
+        Hygon = 3,
+    };
+
+    static Manufacturer ParseManufacturer(std::string_view brand_string);
+
+    Manufacturer manufacturer;
    char brand_string[13];

    char cpu_string[48];
@@ -28,49 +36,45 @@ struct CPUCaps {
    u32 crystal_frequency;
    u64 tsc_frequency; // Derived from the above three values

-#define CPU_CAPS_LIST \
-    CPU_CAPS_ELEM(sse) \
-    CPU_CAPS_ELEM(sse2) \
-    CPU_CAPS_ELEM(sse3) \
-    CPU_CAPS_ELEM(ssse3) \
-    CPU_CAPS_ELEM(sse4_1) \
-    CPU_CAPS_ELEM(sse4_2) \
-    CPU_CAPS_ELEM(avx) \
-    CPU_CAPS_ELEM(avx_vnni) \
-    CPU_CAPS_ELEM(avx2) \
-    CPU_CAPS_ELEM(avx512f) \
-    CPU_CAPS_ELEM(avx512dq) \
-    CPU_CAPS_ELEM(avx512cd) \
-    CPU_CAPS_ELEM(avx512bw) \
-    CPU_CAPS_ELEM(avx512vl) \
-    CPU_CAPS_ELEM(avx512vbmi) \
-    CPU_CAPS_ELEM(avx512vbmi2) \
-    CPU_CAPS_ELEM(avx512vnni) \
-    CPU_CAPS_ELEM(avx512bitalg) \
-    CPU_CAPS_ELEM(avx512popcntq) \
-    CPU_CAPS_ELEM(avx512bf16) \
-    CPU_CAPS_ELEM(aes) \
-    CPU_CAPS_ELEM(bmi1) \
-    CPU_CAPS_ELEM(bmi2) \
-    CPU_CAPS_ELEM(f16c) \
-    CPU_CAPS_ELEM(fma) \
-    CPU_CAPS_ELEM(fma4) \
-    CPU_CAPS_ELEM(gfni) \
-    CPU_CAPS_ELEM(invariant_tsc) \
-    CPU_CAPS_ELEM(lzcnt) \
-    CPU_CAPS_ELEM(monitorx) \
-    CPU_CAPS_ELEM(movbe) \
-    CPU_CAPS_ELEM(pclmulqdq) \
-    CPU_CAPS_ELEM(popcnt) \
-    CPU_CAPS_ELEM(sha) \
-    CPU_CAPS_ELEM(waitpkg)
-#define CPU_CAPS_ELEM(n) bool n : 1;
-    CPU_CAPS_LIST
-#undef CPU_CAPS_ELEM
+    bool sse : 1;
+    bool sse2 : 1;
+    bool sse3 : 1;
+    bool ssse3 : 1;
+    bool sse4_1 : 1;
+    bool sse4_2 : 1;
+
+    bool avx : 1;
+    bool avx_vnni : 1;
+    bool avx2 : 1;
+    bool avx512f : 1;
+    bool avx512dq : 1;
+    bool avx512cd : 1;
+    bool avx512bw : 1;
+    bool avx512vl : 1;
+    bool avx512vbmi : 1;
+    bool avx512bitalg : 1;
+
+    bool aes : 1;
+    bool bmi1 : 1;
+    bool bmi2 : 1;
+    bool f16c : 1;
+    bool fma : 1;
+    bool fma4 : 1;
+    bool gfni : 1;
+    bool invariant_tsc : 1;
+    bool lzcnt : 1;
+    bool monitorx : 1;
+    bool movbe : 1;
+    bool pclmulqdq : 1;
+    bool popcnt : 1;
+    bool sha : 1;
+    bool waitpkg : 1;
 };

-/// Gets the supported capabilities of the host CPU
-/// @return Reference to a CPUCaps struct with the detected host CPU capabilities
+/**
+ * Gets the supported capabilities of the host CPU
+ * @return Reference to a CPUCaps struct with the detected host CPU capabilities
+ */
 const CPUCaps& GetCPUCaps();

 /// Detects CPU core count
@@ -23,14 +23,16 @@ static const auto default_cg_mode = nullptr; //Allow RWE
 namespace Dynarmic {

 void EmitSpinLockLock(Xbyak::CodeGenerator& code, Xbyak::Reg64 ptr, Xbyak::Reg32 tmp, bool waitpkg) {
+    // TODO: this is because we lack regalloc - so better to be safe :(
+    if (waitpkg) {
+        code.push(Xbyak::util::eax);
+        code.push(Xbyak::util::ebx);
+        code.push(Xbyak::util::edx);
+    }
    Xbyak::Label start, loop;
    code.jmp(start, code.T_NEAR);
    code.L(loop);
    if (waitpkg) {
-        // TODO: this is because we lack regalloc - so better to be safe :(
-        code.push(Xbyak::util::rax);
-        code.push(Xbyak::util::rbx);
-        code.push(Xbyak::util::rdx);
        // TODO: This clobbers EAX and EDX did we tell the regalloc?
        // ARM ptr for address-monitoring
        code.umonitor(ptr);
@@ -47,9 +49,6 @@ void EmitSpinLockLock(Xbyak::CodeGenerator& code, Xbyak::Reg64 ptr, Xbyak::Reg32
        code.umwait(Xbyak::util::ebx);
        // CF == 1 if we hit the OS-timeout in IA32_UMWAIT_CONTROL without a write
        // CF == 0 if we exited the wait for any other reason
-        code.pop(Xbyak::util::rdx);
-        code.pop(Xbyak::util::rbx);
-        code.pop(Xbyak::util::rax);
    } else {
        code.pause();
    }
@@ -58,6 +57,11 @@ void EmitSpinLockLock(Xbyak::CodeGenerator& code, Xbyak::Reg64 ptr, Xbyak::Reg32
    /*code.lock();*/ code.xchg(code.dword[ptr], tmp);
    code.test(tmp, tmp);
    code.jnz(loop, code.T_NEAR);
+    if (waitpkg) {
+        code.pop(Xbyak::util::edx);
+        code.pop(Xbyak::util::ebx);
+        code.pop(Xbyak::util::eax);
+    }
 }

 void EmitSpinLockUnlock(Xbyak::CodeGenerator& code, Xbyak::Reg64 ptr, Xbyak::Reg32 tmp) {
@@ -3,7 +3,6 @@

 #include <algorithm>
 #include <filesystem>
-#include <iostream>
 #include <fmt/format.h>
 #include "common/fs/fs.h"
 #include "common/fs/fs_types.h"
@@ -26,10 +25,7 @@ std::vector<std::filesystem::path> GetModFolder(const std::string& root) {
                                                               "romfslite"};

        if (std::ranges::find(valid_names, name) != valid_names.end()) {
-            const auto parent = entry.path().parent_path();
-            if (std::ranges::find(paths, parent) == paths.end()) {
-                paths.emplace_back(parent);
-            }
+            paths.emplace_back(entry.path().parent_path());
        }

        return true;
@@ -80,24 +80,55 @@ std::optional<std::string> UpdateChecker::GetResponse(std::string url, std::stri
    }
 }

-std::optional<UpdateChecker::Update> UpdateChecker::GetLatestRelease() {
+std::optional<UpdateChecker::Update> UpdateChecker::GetLatestRelease(bool include_prereleases) {
 #ifdef YUZU_BUNDLED_OPENSSL
    const auto update_check_url = fmt::format("https://{}", Common::g_build_auto_update_api);
 #else
    const auto update_check_url = std::string{Common::g_build_auto_update_api};
 #endif

-    auto update_check_path = std::string{Common::g_build_auto_update_api_path};
+    auto update_check_path = fmt::format("{}{}", std::string{Common::g_build_auto_update_api_path},
+                                         std::string{Common::g_build_auto_update_repo});
    try {
-        const auto response = UpdateChecker::GetResponse(update_check_url, update_check_path);
+        if (include_prereleases) { // This can return either a prerelease or a stable release,
+            // whichever is more recent.
+            const auto update_check_tags_path = update_check_path + "/tags";
+            const auto update_check_releases_path = update_check_path + "/releases";

-        if (!response)
-            return {};
+            const auto tags_response = UpdateChecker::GetResponse(update_check_url, update_check_tags_path);
+            const auto releases_response = UpdateChecker::GetResponse(update_check_url, update_check_releases_path);

-        const std::string latest_tag = nlohmann::json::parse(response.value()).at("tag_name");
-        const std::string latest_name = nlohmann::json::parse(response.value()).at("name");
+            if (!tags_response || !releases_response)
+                return {};
+
+            const std::string latest_tag
+                = nlohmann::json::parse(tags_response.value()).at(0).at("name");
+            const std::string latest_name =
+                nlohmann::json::parse(releases_response.value()).at(0).at("name");
+
+            const bool latest_tag_has_release = releases_response.value().find(
+                                                    fmt::format("\"{}\"", latest_tag))
+                                                != std::string::npos;
+
+            // If there is a newer tag, but that tag has no associated release, don't prompt the
+            // user to update.
+            if (!latest_tag_has_release)
+                return {};
+
+            return Update{latest_tag, latest_name};
+        } else { // This is a stable release, only check for other stable releases.
+            update_check_path += "/releases/latest";
+            const auto response = UpdateChecker::GetResponse(update_check_url, update_check_path);
+
+            if (!response)
+                return {};
+
+            const std::string latest_tag = nlohmann::json::parse(response.value()).at("tag_name");
+            const std::string latest_name = nlohmann::json::parse(response.value()).at("name");
+
+            return Update{latest_tag, latest_name};
+        }

-        return Update{latest_tag, latest_name};
    } catch (nlohmann::detail::out_of_range&) {
        LOG_ERROR(Frontend,
                  "Parsing JSON response from {}{} failed during update check: "
@@ -116,8 +147,12 @@ std::optional<UpdateChecker::Update> UpdateChecker::GetLatestRelease() {
 }

 std::optional<UpdateChecker::Update> UpdateChecker::GetUpdate() {
+    const bool is_prerelease = ((strstr(Common::g_build_version, "pre-alpha") != NULL) ||
+                                (strstr(Common::g_build_version, "alpha") != NULL) ||
+                                (strstr(Common::g_build_version, "beta") != NULL) ||
+                                (strstr(Common::g_build_version, "rc") != NULL));
    const std::optional<UpdateChecker::Update> latest_release_tag =
-        UpdateChecker::GetLatestRelease();
+        UpdateChecker::GetLatestRelease(is_prerelease);

    if (!latest_release_tag)
        goto empty;
@@ -18,6 +18,6 @@ typedef struct {
 } Update;

 std::optional<std::string> GetResponse(std::string url, std::string path);
-std::optional<Update> GetLatestRelease();
+std::optional<Update> GetLatestRelease(bool include_prereleases);
 std::optional<Update> GetUpdate();
 } // namespace UpdateChecker
@@ -165,6 +165,10 @@ std::unique_ptr<TranslationMap> InitializeTranslations(QObject* parent) {
    INSERT(Settings, use_disk_shader_cache, tr("Use persistent pipeline cache"),
           tr("Allows saving shaders to storage for faster loading on following game "
              "boots.\nDisabling it is only intended for debugging."));
+    INSERT(Settings, optimize_spirv_output, tr("Optimize SPIRV output"),
+           tr("Runs an additional optimization pass over generated SPIRV shaders.\n"
+              "Will increase time required for shader compilation.\nMay slightly improve "
+              "performance.\nThis feature is experimental."));
    INSERT(Settings, use_asynchronous_gpu_emulation, tr("Use asynchronous GPU emulation"),
           tr("Uses an extra CPU thread for rendering.\nThis option should always remain enabled."));
    INSERT(Settings, nvdec_emulation, tr("NVDEC emulation:"),
@@ -101,10 +101,8 @@ QStringList GetModFolders(const QString& root, const QString& fallbackName) {
        } else {
            // Rename the existing mod folder.
            const auto new_path = std_path.parent_path() / name.toStdString();
-            if (new_path != std_path) {
-                fs::remove_all(new_path);
-                fs::rename(std_path, new_path);
-            }
+            fs::remove_all(new_path);
+            fs::rename(std_path, new_path);
            std_path = new_path;
        }

@@ -243,7 +243,7 @@ add_library(shader_recompiler STATIC

 )

-target_link_libraries(shader_recompiler PUBLIC common fmt::fmt sirit::sirit)
+target_link_libraries(shader_recompiler PUBLIC common fmt::fmt sirit::sirit SPIRV-Tools::SPIRV-Tools)

 if (MSVC)
    target_compile_options(shader_recompiler PRIVATE
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
@@ -9,6 +9,7 @@
 #include <type_traits>
 #include <utility>
 #include <vector>
+#include <spirv-tools/optimizer.hpp>

 #include "common/settings.h"
 #include "shader_recompiler/backend/spirv/emit_spirv.h"
@@ -21,7 +22,15 @@ namespace Shader::Backend::SPIRV {
 namespace {
 template <class Func>
 struct FuncTraits {};
+    thread_local std::unique_ptr<spvtools::Optimizer> thread_optimizer;

+    spvtools::Optimizer& GetThreadOptimizer() {
+        if (!thread_optimizer) {
+            thread_optimizer = std::make_unique<spvtools::Optimizer>(SPV_ENV_VULKAN_1_3);
+            thread_optimizer->RegisterPerformancePasses();
+        }
+        return *thread_optimizer;
+    }
 template <class ReturnType_, class... Args>
 struct FuncTraits<ReturnType_ (*)(Args...)> {
    using ReturnType = ReturnType_;
@@ -492,7 +501,8 @@ void PatchPhiNodes(IR::Program& program, EmitContext& ctx) {
        }
 } // Anonymous namespace

-std::vector<u32> EmitSPIRV(const Profile& profile, const RuntimeInfo& runtime_info, IR::Program& program, Bindings& bindings) {
+std::vector<u32> EmitSPIRV(const Profile& profile, const RuntimeInfo& runtime_info,
+                           IR::Program& program, Bindings& bindings, bool optimize) {
    EmitContext ctx{profile, runtime_info, program, bindings};
    const Id main{DefineMain(ctx, program)};
    DefineEntryPoint(program, ctx, main);
@@ -504,7 +514,29 @@ std::vector<u32> EmitSPIRV(const Profile& profile, const RuntimeInfo& runtime_in
    SetupCapabilities(profile, program.info, ctx);
    SetupTransformFeedbackCapabilities(ctx, main);
    PatchPhiNodes(program, ctx);
-    return ctx.Assemble();
+
+    if (!optimize) {
+        return ctx.Assemble();
+    } else {
+        std::vector<u32> spirv = ctx.Assemble();
+
+        // Use thread-local optimizer instead of creating a new one
+        auto& spv_opt = GetThreadOptimizer();
+        spv_opt.SetMessageConsumer([](spv_message_level_t, const char*, const spv_position_t&, const char* m) {
+            LOG_ERROR(HW_GPU, "spirv-opt: {}", m);
+        });
+
+        spvtools::OptimizerOptions opt_options;
+        opt_options.set_run_validator(false);
+
+        std::vector<u32> result;
+        if (!spv_opt.Run(spirv.data(), spirv.size(), &result, opt_options)) {
+            LOG_ERROR(HW_GPU,
+                      "Failed to optimize SPIRV shader output, continuing without optimization");
+            result = std::move(spirv);
+        }
+        return result;
+    }
 }

 Id EmitPhi(EmitContext& ctx, IR::Inst* inst) {
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
@@ -33,10 +33,13 @@ constexpr u32 RESCALING_LAYOUT_WORDS_OFFSET = offsetof(RescalingLayout, rescalin
 constexpr u32 RESCALING_LAYOUT_DOWN_FACTOR_OFFSET = offsetof(RescalingLayout, down_factor);
 constexpr u32 RENDERAREA_LAYOUT_OFFSET = offsetof(RenderAreaLayout, render_area);

-[[nodiscard]] std::vector<u32> EmitSPIRV(const Profile& profile, const RuntimeInfo& runtime_info, IR::Program& program, Bindings& bindings);
-[[nodiscard]] inline std::vector<u32> EmitSPIRV(const Profile& profile, IR::Program& program) {
+[[nodiscard]] std::vector<u32> EmitSPIRV(const Profile& profile, const RuntimeInfo& runtime_info,
+                                         IR::Program& program, Bindings& bindings, bool optimize);
+
+[[nodiscard]] inline std::vector<u32> EmitSPIRV(const Profile& profile, IR::Program& program,
+                                                bool optimize) {
    Bindings binding;
-    return EmitSPIRV(profile, {}, program, binding);
+    return EmitSPIRV(profile, {}, program, binding, optimize);
 }

 } // namespace Shader::Backend::SPIRV
@@ -178,9 +178,6 @@ void DefineGenericOutput(EmitContext& ctx, size_t index, std::optional<u32> invo
            ctx.Decorate(id, spv::Decoration::XfbBuffer, xfb_varying->buffer);
            ctx.Decorate(id, spv::Decoration::XfbStride, xfb_varying->stride);
            ctx.Decorate(id, spv::Decoration::Offset, xfb_varying->offset);
-            if (ctx.stage == Stage::Geometry && xfb_varying->stream != 0) {
-                ctx.Decorate(id, spv::Decoration::Stream, xfb_varying->stream);
-            }
        }
        if (num_components < 4 || element > 0) {
            const std::string_view subswizzle{swizzle.substr(element, num_components)};
@@ -979,7 +979,7 @@ private:
    Environment& env;
    IR::AbstractSyntaxList& syntax_list;
    bool uses_demote_to_helper{};
-    const Flow::Block dummy_flow_block{};
+    const Flow::Block dummy_flow_block;
 };
 } // Anonymous namespace

@@ -76,7 +76,6 @@ enum class TessSpacing {

 struct TransformFeedbackVarying {
    u32 buffer{};
-    u32 stream{};
    u32 stride{};
    u32 offset{};
    u32 components{};
@@ -1067,29 +1067,26 @@ void BufferCache<P>::BindHostTransformFeedbackBuffers() {
    HostBindings<typename P::Buffer> host_bindings;
    for (u32 index = 0; index < NUM_TRANSFORM_FEEDBACK_BUFFERS; ++index) {
        const Binding& binding = channel_state->transform_feedback_buffers[index];
-        const auto& control = maxwell3d->regs.transform_feedback.controls[index];
-        const bool has_layout = control.varying_count != 0 || control.stride != 0;
-
-        Buffer* host_buffer = &slot_buffers[NULL_BUFFER_ID];
-        u32 offset = 0;
-        u32 size = 0;
-
-        if (has_layout && binding.buffer_id != NULL_BUFFER_ID && binding.size != 0) {
-            Buffer& buffer = slot_buffers[binding.buffer_id];
-            TouchBuffer(buffer, binding.buffer_id);
-            size = binding.size;
-            SynchronizeBuffer(buffer, binding.device_addr, size);
-            MarkWrittenBuffer(binding.buffer_id, binding.device_addr, size);
-            offset = buffer.Offset(binding.device_addr);
-            buffer.MarkUsage(offset, size);
-            host_buffer = &buffer;
+        if (maxwell3d->regs.transform_feedback.controls[index].varying_count == 0 &&
+            maxwell3d->regs.transform_feedback.controls[index].stride == 0) {
+            break;
        }
+        Buffer& buffer = slot_buffers[binding.buffer_id];
+        TouchBuffer(buffer, binding.buffer_id);
+        const u32 size = binding.size;
+        SynchronizeBuffer(buffer, binding.device_addr, size);

-        host_bindings.buffers.push_back(host_buffer);
+        MarkWrittenBuffer(binding.buffer_id, binding.device_addr, size);
+
+        const u32 offset = buffer.Offset(binding.device_addr);
+        buffer.MarkUsage(offset, size);
+        host_bindings.buffers.push_back(&buffer);
        host_bindings.offsets.push_back(offset);
        host_bindings.sizes.push_back(size);
    }
-    runtime.BindTransformFeedbackBuffers(host_bindings);
+    if (host_bindings.buffers.size() > 0) {
+        runtime.BindTransformFeedbackBuffers(host_bindings);
+    }
 }

 template <class P>
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project
@@ -92,16 +92,7 @@ void ThreadManager::InvalidateRegion(DAddr addr, u64 size) {
 }

 void ThreadManager::FlushAndInvalidateRegion(DAddr addr, u64 size) {
-    if (Settings::IsGPULevelHigh()) {
-        if (!is_async) {
-            PushCommand(FlushRegionCommand(addr, size));
-        } else {
-            auto& gpu = system.GPU();
-            const u64 fence = gpu.RequestFlush(addr, size);
-            TickGPU();
-            gpu.WaitForSyncOperation(fence);
-        }
-    }
+    // Skip flush on asynch mode, as FlushAndInvalidateRegion is not used for anything too important
    rasterizer->OnCacheInvalidation(addr, size);
 }

@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

@@ -8,22 +5,16 @@

 layout(local_size_x = 1) in;

-layout(std430, binding = 0) readonly buffer Query {
-    uint data[];
+layout(std430, binding = 0) buffer Query {
+    uvec2 initial;
+    uvec2 unknown;
+    uvec2 current;
 };

-layout(std430, binding = 1) writeonly buffer Result {
+layout(std430, binding = 1) buffer Result {
    uint result;
 };

-layout(push_constant) uniform PushConstants {
-    uint compare_to_zero;
-};
-
 void main() {
-    if (compare_to_zero != 0u) {
-        result = (data[0] != 0u && data[1] != 0u) ? 1u : 0u;
-    } else {
-        result = (data[0] == data[4] && data[1] == data[5]) ? 1u : 0u;
-    }
+    result = all(equal(initial, current)) ? 1 : 0;
 }
@@ -285,11 +285,11 @@ void HLE_MultiDrawIndexedIndirectCount::Fallback(Engines::Maxwell3D& maxwell3d,
 }
 void HLE_DrawIndirectByteCount::Execute(Engines::Maxwell3D& maxwell3d, std::span<const u32> parameters, [[maybe_unused]] u32 method) {
    const bool force = maxwell3d.Rasterizer().HasDrawTransformFeedback();
-    if (!force) {
+    auto topology = Maxwell3D::Regs::PrimitiveTopology(parameters[0] & 0xFFFFU);
+    if (!force && (!maxwell3d.AnyParametersDirty() || !IsTopologySafe(topology))) {
        Fallback(maxwell3d, parameters);
        return;
    }
-    auto topology = Maxwell3D::Regs::PrimitiveTopology(parameters[0] & 0xFFFFU);
    auto& params = maxwell3d.draw_manager->GetIndirectParams();
    params.is_byte_count = true;
    params.is_indexed = false;
@@ -412,7 +412,6 @@ bool QueryCacheBase<Traits>::AccelerateHostConditionalRendering() {
                    .found_query = nullptr,
                };
            }
-            it_current = it_current_2;
        }
        auto* query = impl->ObtainQuery(it_current->second);
        qc_dirty |= True(query->flags & QueryFlagBits::IsHostManaged) &&
@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

@@ -78,7 +75,7 @@ public:
    }

    u64 GetDependentMask() const {
-        return dependent_mask;
+        return dependence_mask;
    }

    u64 GetAmendValue() const {
@@ -629,9 +629,6 @@ void RasterizerOpenGL::ReleaseFences(bool force) {

 void RasterizerOpenGL::FlushAndInvalidateRegion(DAddr addr, u64 size,
                                                VideoCommon::CacheType which) {
-    if (Settings::IsGPULevelHigh()) {
-        FlushRegion(addr, size, which);
-    }
    InvalidateRegion(addr, size, which);
 }

@@ -181,6 +181,7 @@ ShaderCache::ShaderCache(Tegra::MaxwellDeviceMemoryManager& device_memory_,
      state_tracker{state_tracker_}, shader_notify{shader_notify_},
      use_asynchronous_shaders{device.UseAsynchronousShaders()},
      strict_context_required{device.StrictContextRequired()},
+      optimize_spirv_output{Settings::values.optimize_spirv_output.GetValue() != Settings::SpirvOptimizeMode::Never},
      profile{
          .supported_spirv = 0x00010000,

@@ -347,6 +348,10 @@ void ShaderCache::LoadDiskResources(u64 title_id, std::stop_token stop_loading,
    if (!use_asynchronous_shaders) {
        workers.reset();
    }
+
+    if (Settings::values.optimize_spirv_output.GetValue() != Settings::SpirvOptimizeMode::Always) {
+        this->optimize_spirv_output = false;
+    }
 }

 GraphicsPipeline* ShaderCache::CurrentGraphicsPipeline() {
@@ -532,7 +537,7 @@ std::unique_ptr<GraphicsPipeline> ShaderCache::CreateGraphicsPipeline(
            break;
        case Settings::RendererBackend::OpenGL_SPIRV:
            ConvertLegacyToGeneric(program, runtime_info);
-            sources_spirv[stage_index] = EmitSPIRV(profile, runtime_info, program, binding);
+            sources_spirv[stage_index] = EmitSPIRV(profile, runtime_info, program, binding, this->optimize_spirv_output);
            break;
        default:
            UNREACHABLE();
@@ -593,7 +598,7 @@ std::unique_ptr<ComputePipeline> ShaderCache::CreateComputePipeline(
        code = EmitGLASM(profile, info, program);
        break;
    case Settings::RendererBackend::OpenGL_SPIRV:
-        code_spirv = EmitSPIRV(profile, program);
+        code_spirv = EmitSPIRV(profile, program, this->optimize_spirv_output);
        break;
    default:
        UNREACHABLE();
@@ -76,6 +76,7 @@ private:
    VideoCore::ShaderNotify& shader_notify;
    const bool use_asynchronous_shaders;
    const bool strict_context_required;
+    bool optimize_spirv_output{};

    GraphicsPipelineKey graphics_key{};
    GraphicsPipeline* current_pipeline{};
@@ -190,7 +190,9 @@ void FixedPipelineState::Refresh(Tegra::Engines::Maxwell3D& maxwell3d, DynamicFe
            }
        }
    }
-    dynamic_state.Refresh3(regs, features);
+    if (!extended_dynamic_state_3_enables) {
+        dynamic_state.Refresh3(regs);
+    }
    if (xfb_enabled) {
        RefreshXfbState(xfb_state, regs);
    }
@@ -293,22 +295,16 @@ void FixedPipelineState::DynamicState::Refresh2(const Maxwell& regs,
    depth_bias_enable.Assign(enabled_lut[POLYGON_OFFSET_ENABLE_LUT[topology_index]] != 0 ? 1 : 0);
 }

-void FixedPipelineState::DynamicState::Refresh3(const Maxwell& regs,
-                                                const DynamicFeatures& features) {
-    if (!features.has_dynamic_state3_logic_op_enable) {
-        logic_op_enable.Assign(regs.logic_op.enable != 0 ? 1 : 0);
-    }
-    if (!features.has_dynamic_state3_depth_clamp_enable) {
-        depth_clamp_disabled.Assign(regs.viewport_clip_control.geometry_clip ==
-                                        Maxwell::ViewportClipControl::GeometryClip::Passthrough ||
-                                    regs.viewport_clip_control.geometry_clip ==
-                                        Maxwell::ViewportClipControl::GeometryClip::FrustumXYZ ||
-                                    regs.viewport_clip_control.geometry_clip ==
-                                        Maxwell::ViewportClipControl::GeometryClip::FrustumZ);
-    }
-    if (!features.has_dynamic_state3_line_stipple_enable) {
-        line_stipple_enable.Assign(regs.line_stipple_enable);
-    }
+void FixedPipelineState::DynamicState::Refresh3(const Maxwell& regs) {
+    logic_op_enable.Assign(regs.logic_op.enable != 0 ? 1 : 0);
+    depth_clamp_disabled.Assign(regs.viewport_clip_control.geometry_clip ==
+                                    Maxwell::ViewportClipControl::GeometryClip::Passthrough ||
+                                regs.viewport_clip_control.geometry_clip ==
+                                    Maxwell::ViewportClipControl::GeometryClip::FrustumXYZ ||
+                                regs.viewport_clip_control.geometry_clip ==
+                                    Maxwell::ViewportClipControl::GeometryClip::FrustumZ);
+
+    line_stipple_enable.Assign(regs.line_stipple_enable);
 }

 size_t FixedPipelineState::Hash() const noexcept {
@@ -27,9 +27,6 @@ struct DynamicFeatures {
    bool has_extended_dynamic_state_2_patch_control_points;
    bool has_extended_dynamic_state_3_blend;
    bool has_extended_dynamic_state_3_enables;
-    bool has_dynamic_state3_depth_clamp_enable;
-    bool has_dynamic_state3_logic_op_enable;
-    bool has_dynamic_state3_line_stipple_enable;
    bool has_dynamic_vertex_input;
    bool has_provoking_vertex;
    bool has_provoking_vertex_first_mode;
@@ -178,7 +175,7 @@ struct FixedPipelineState {
        void Refresh(const Maxwell& regs);
        void Refresh2(const Maxwell& regs, Maxwell::PrimitiveTopology topology,
                      bool base_features_supported);
-        void Refresh3(const Maxwell& regs, const DynamicFeatures& features);
+        void Refresh3(const Maxwell& regs);

        Maxwell::ComparisonOp DepthTestFunc() const noexcept {
            return UnpackComparisonOp(depth_test_func);
@@ -268,7 +265,8 @@ struct FixedPipelineState {
            return sizeof(*this);
        }
        if (dynamic_vertex_input && extended_dynamic_state_3_blend) {
-            return offsetof(FixedPipelineState, attachments);
+            // Exclude dynamic state and attributes
+            return offsetof(FixedPipelineState, dynamic_state);
        }
        if (dynamic_vertex_input) {
            // Exclude dynamic state
@@ -8,7 +8,6 @@
 #include <array>
 #include <cstring>
 #include <memory>
-#include <mutex>
 #include <optional>
 #include <string>
 #include <vector>
@@ -172,11 +171,7 @@ try

 RendererVulkan::~RendererVulkan() {
    scheduler.RegisterOnSubmit([] {});
-    scheduler.Finish();
-    {
-        std::scoped_lock lock{scheduler.submit_mutex};
-        void(device.GetLogical().WaitIdle());
-    }
+    void(device.GetLogical().WaitIdle());
 }

 void RendererVulkan::Composite(std::span<const Tegra::FramebufferConfig> framebuffers) {
@@ -8,7 +8,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later

 #include <vulkan/vulkan_core.h>
-#include <mutex>
 #include "video_core/framebuffer_config.h"
 #include "video_core/present.h"
 #include "video_core/renderer_vulkan/present/filters.h"
@@ -32,10 +31,7 @@ BlitScreen::~BlitScreen() = default;
 void BlitScreen::WaitIdle() {
    present_manager.WaitPresent();
    scheduler.Finish();
-    {
-        std::scoped_lock lock{scheduler.submit_mutex};
-        device.GetLogical().WaitIdle();
-    }
+    device.GetLogical().WaitIdle();
 }

 void BlitScreen::SetWindowAdaptPass() {
@@ -637,10 +637,12 @@ void BufferCacheRuntime::BindTransformFeedbackBuffers(VideoCommon::HostBindings<
    for (u32 i = 0; i < bindings.buffers.size(); ++i) {
        auto handle = bindings.buffers[i]->Handle();
        if (handle == VK_NULL_HANDLE) {
-            ReserveNullBuffer();
-            handle = *null_buffer;
            bindings.offsets[i] = 0;
-            bindings.sizes[i] = 0;
+            bindings.sizes[i] = VK_WHOLE_SIZE;
+            if (!device.HasNullDescriptor()) {
+                ReserveNullBuffer();
+                handle = *null_buffer;
+            }
        }
        buffer_handles[i] = handle;
    }
@@ -228,10 +228,6 @@ struct QueriesPrefixScanPushConstants {
    u32 accumulation_limit;
    u32 buffer_offset;
 };
-
-struct ConditionalRenderingResolvePushConstants {
-    u32 compare_to_zero;
-};
 } // Anonymous namespace

 ComputePass::ComputePass(const Device& device_, DescriptorPool& descriptor_pool,
@@ -417,8 +413,7 @@ ConditionalRenderingResolvePass::ConditionalRenderingResolvePass(
    const Device& device_, Scheduler& scheduler_, DescriptorPool& descriptor_pool_,
    ComputePassDescriptorQueue& compute_pass_descriptor_queue_)
    : ComputePass(device_, descriptor_pool_, INPUT_OUTPUT_DESCRIPTOR_SET_BINDINGS,
-                  INPUT_OUTPUT_DESCRIPTOR_UPDATE_TEMPLATE, INPUT_OUTPUT_BANK_INFO,
-                  COMPUTE_PUSH_CONSTANT_RANGE<sizeof(ConditionalRenderingResolvePushConstants)>,
+                  INPUT_OUTPUT_DESCRIPTOR_UPDATE_TEMPLATE, INPUT_OUTPUT_BANK_INFO, nullptr,
                  RESOLVE_CONDITIONAL_RENDER_COMP_SPV),
      scheduler{scheduler_}, compute_pass_descriptor_queue{compute_pass_descriptor_queue_} {}

@@ -435,7 +430,7 @@ void ConditionalRenderingResolvePass::Resolve(VkBuffer dst_buffer, VkBuffer src_
    const void* const descriptor_data{compute_pass_descriptor_queue.UpdateData()};

    scheduler.RequestOutsideRenderPassOperationContext();
-    scheduler.Record([this, descriptor_data, compare_to_zero](vk::CommandBuffer cmdbuf) {
+    scheduler.Record([this, descriptor_data](vk::CommandBuffer cmdbuf) {
        static constexpr VkMemoryBarrier read_barrier{
            .sType = VK_STRUCTURE_TYPE_MEMORY_BARRIER,
            .pNext = nullptr,
@@ -448,9 +443,6 @@ void ConditionalRenderingResolvePass::Resolve(VkBuffer dst_buffer, VkBuffer src_
            .srcAccessMask = VK_ACCESS_SHADER_WRITE_BIT,
            .dstAccessMask = VK_ACCESS_CONDITIONAL_RENDERING_READ_BIT_EXT,
        };
-        const ConditionalRenderingResolvePushConstants uniforms{
-            .compare_to_zero = compare_to_zero ? 1U : 0U,
-        };
        const VkDescriptorSet set = descriptor_allocator.Commit();
        device.GetLogical().UpdateDescriptorSet(set, *descriptor_template, descriptor_data);

@@ -458,11 +450,9 @@ void ConditionalRenderingResolvePass::Resolve(VkBuffer dst_buffer, VkBuffer src_
                               VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, 0, read_barrier);
        cmdbuf.BindPipeline(VK_PIPELINE_BIND_POINT_COMPUTE, *pipeline);
        cmdbuf.BindDescriptorSets(VK_PIPELINE_BIND_POINT_COMPUTE, *layout, 0, set, {});
-        cmdbuf.PushConstants(*layout, VK_SHADER_STAGE_COMPUTE_BIT, uniforms);
        cmdbuf.Dispatch(1, 1, 1);
        cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT,
-                               VK_PIPELINE_STAGE_CONDITIONAL_RENDERING_BIT_EXT, 0,
-                               write_barrier);
+                               VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, 0, write_barrier);
    });
 }

@@ -530,7 +520,7 @@ void QueriesPrefixScanPass::Run(VkBuffer accumulation_buffer, VkBuffer dst_buffe
            const VkDescriptorSet set = descriptor_allocator.Commit();
            device.GetLogical().UpdateDescriptorSet(set, *descriptor_template, descriptor_data);

-            cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT,
+            cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,
                                   VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT, 0, read_barrier);
            cmdbuf.BindPipeline(VK_PIPELINE_BIND_POINT_COMPUTE, *pipeline);
            cmdbuf.BindDescriptorSets(VK_PIPELINE_BIND_POINT_COMPUTE, *layout, 0, set, {});
@@ -467,10 +467,6 @@ bool GraphicsPipeline::ConfigureImpl(bool is_indexed) {
        bind_stage_info(4);
    }

-    if (regs.transform_feedback_enabled != 0) {
-        scheduler.RequestOutsideRenderPassOperationContext();
-    }
-
    buffer_cache.UpdateGraphicsBuffers(is_indexed);
    buffer_cache.BindHostGeometryBuffers(is_indexed);

--- a/Show More
+++ b/Show More