fix nvdec

[host1x] inline nvenc, fix ffmpeg not having va-api on freebsd
Signed-off-by: lizzie <lizzie@eden-emu.dev>
2026-08-15 21:19:47 +00:00 · 2026-04-24 20:26:48 +02:00 · 2026-04-24 20:26:48 +02:00
79 changed files with 1644 additions and 1318 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()
@@ -239,7 +239,7 @@ Esto vetará su nombre de usuario del foro y su dirección IP.</translation>
    <message>
        <location filename="../../src/yuzu/compatdb.ui" line="36"/>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Should you choose to submit a test case to the &lt;/span&gt;&lt;a href=&quot;https://eden-emulator.github.io/game/&quot;&gt;&lt;span style=&quot; font-size:10pt; text-decoration: underline; color:#0000ff;&quot;&gt;eden Compatibility List&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;, The following information will be collected and displayed on the site:&lt;/span&gt;&lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Hardware Information (CPU / GPU / Operating System)&lt;/li&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Which version of eden you are running&lt;/li&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;The connected eden account&lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Si elijes entregar un caso de prueba a la &lt;/span&gt;&lt;a href=&quot;https://eden-emulator.github.io/game/&quot;&gt;&lt;span style=&quot; font-size:10pt; text-decoration: underline; color:#0000ff;&quot;&gt;lista de compatibilidad de Eden&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;, Se recopilará y mostrará la siguiente información en el sito:&lt;/span&gt;&lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Información del hardware (CPU / GPU / Sistema operativo)&lt;/li&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Qué version de Eden estás usando&lt;/li&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;La cuenta de eden que está conectada &lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Si elijes entregar un caso de prueba a la &lt;/span&gt;&lt;a href=&quot;https://eden-emulator.github.io/game/&quot;&gt;&lt;span style=&quot; font-size:10pt; text-decoration: underline; color:#0000ff;&quot;&gt;lista de compatibilidad de Eden&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;, Se recopilará y mostrará la siguiente información en el sito:&lt;/span&gt;&lt;/p&gt;&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Información del hardware (Procesador / Tarjeta gráfica / Sistema operativo)&lt;/li&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Qué version de Eden estás usando&lt;/li&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;La cuenta de eden que está conectada &lt;/li&gt;&lt;/ul&gt;&lt;/body&gt;&lt;/html&gt;</translation>
    </message>
    <message>
        <location filename="../../src/yuzu/compatdb.ui" line="77"/>
@@ -492,14 +492,14 @@ Esto vetará su nombre de usuario del foro y su dirección IP.</translation>
    <message>
        <location filename="../../src/qt_common/config/shared_translation.cpp" line="63"/>
        <source>Multicore CPU Emulation</source>
-        <translation>Emulación de la CPU multinúcleo </translation>
+        <translation>Emulación del procesador multinúcleo </translation>
    </message>
    <message>
        <location filename="../../src/qt_common/config/shared_translation.cpp" line="64"/>
        <source>This option increases CPU emulation thread use from 1 to the maximum of 4.
 This is mainly a debug option and shouldn&apos;t be disabled.</source>
-        <translation>Esta opción aumenta el uso de hilos de emulación de la CPU de 1 a un máximo de 4.
-Esta es una opción principalmente de depuración y no debería desactivarse.</translation>
+        <translation>Esta opción aumenta el uso de hilos de emulación del procesador de 1 a un máximo de 4.
+Principalmente es una opción de depuración y no debería desactivarse.</translation>
    </message>
    <message>
        <location filename="../../src/qt_common/config/shared_translation.cpp" line="66"/>
@@ -556,7 +556,7 @@ Desactivarlo hará que el juego se renderice lo más rápido posible según tu o
        <location filename="../../src/qt_common/config/shared_translation.cpp" line="86"/>
        <source>Synchronizes CPU core speed with the game's maximum rendering speed to boost FPS without affecting game speed (animations, physics, etc.).
 Can help reduce stuttering at lower framerates.</source>
-        <translation>Sincroniza la velocidad del núcleo de la CPU con la velocidad máxima de renderizado del juego para aumentar los fotogramas por segundo sin afectar la velocidad del juego (animaciones, físicas, etc.).
+        <translation>Sincroniza la velocidad del núcleo del procesador con la velocidad máxima de renderizado del juego para aumentar los fotogramas por segundo sin afectar la velocidad del juego (animaciones, físicas, etc.).
 Puede ayudar a reducir los tirones o parpadeos en tasas de fotogramas bajas.</translation>
    </message>
    <message>
@@ -567,7 +567,7 @@ Puede ayudar a reducir los tirones o parpadeos en tasas de fotogramas bajas.</tr
    <message>
        <location filename="../../src/qt_common/config/shared_translation.cpp" line="92"/>
        <source>Change the accuracy of the emulated CPU (for debugging only).</source>
-        <translation>Cambia la precisión de la CPU emulada (solo para depuración)</translation>
+        <translation>Cambia la precisión del procesador emulado (solo para depuración)</translation>
    </message>
    <message>
        <location filename="../../src/qt_common/config/shared_translation.cpp" line="93"/>
@@ -578,7 +578,7 @@ Puede ayudar a reducir los tirones o parpadeos en tasas de fotogramas bajas.</tr
    <message>
        <location filename="../../src/qt_common/config/shared_translation.cpp" line="95"/>
        <source>CPU Overclock</source>
-        <translation>Overclock de la CPU</translation>
+        <translation>Overclock del procesador</translation>
    </message>
    <message>
        <location filename="../../src/qt_common/config/shared_translation.cpp" line="96"/>
@@ -806,7 +806,7 @@ Esta función es experimental.</translation>
        <location filename="../../src/qt_common/config/shared_translation.cpp" line="173"/>
        <source>Uses an extra CPU thread for rendering.
 This option should always remain enabled.</source>
-        <translation>Usa un hilo adicional de la CPU para el renderizado.
+        <translation>Usa un hilo adicional del procesador para el renderizado.
 Esta opción siempre debe permanecer activada.</translation>
    </message>
    <message>
@@ -836,9 +836,9 @@ GPU: Use the GPU's compute shaders to decode ASTC textures (recommended).
 CPU Asynchronously: Use the CPU to decode ASTC textures on demand. EliminatesASTC decoding
 stuttering but may present artifacts.</source>
        <translation>Esta opción controla cómo deben descodificarse las texturas ASTC.
-CPU: utiliza la CPU para la descodificación.
-GPU: utiliza los sombreadores computables de la GPU para descodificar las texturas ASTC (recomendado).
-CPU asíncrona: usa la CPU para descodificar las texturas ASTC bajo demanda. Elimina los tirones causados por la descodificación ASTC, pero puede generar errores visuales.</translation>
+CPU: utiliza el procesador para la descodificación.
+GPU: utiliza los sombreadores computables de la tarjeta gráfica para descodificar las texturas ASTC (recomendado).
+CPU asíncrono: usa el procesador para descodificar las texturas ASTC bajo demanda. Elimina los tirones causados por la descodificación ASTC, pero puede generar errores visuales.</translation>
    </message>
    <message>
        <location filename="../../src/qt_common/config/shared_translation.cpp" line="184"/>
@@ -1354,7 +1354,7 @@ Cuando un programa intenta abrir el applet del controlador, se cierra inmediatam
    <message>
        <location filename="../../src/qt_common/config/shared_translation.cpp" line="393"/>
        <source>CPU</source>
-        <translation>CPU</translation>
+        <translation>Procesador</translation>
    </message>
    <message>
        <location filename="../../src/qt_common/config/shared_translation.cpp" line="394"/>
@@ -1364,7 +1364,7 @@ Cuando un programa intenta abrir el applet del controlador, se cierra inmediatam
    <message>
        <location filename="../../src/qt_common/config/shared_translation.cpp" line="395"/>
        <source>CPU Asynchronous</source>
-        <translation>CPU asíncrona</translation>
+        <translation>Procesador asíncrono</translation>
    </message>
    <message>
        <location filename="../../src/qt_common/config/shared_translation.cpp" line="400"/>
@@ -1517,7 +1517,7 @@ Cuando un programa intenta abrir el applet del controlador, se cierra inmediatam
    <message>
        <location filename="../../src/qt_common/config/shared_translation.cpp" line="460"/>
        <source>CPU Video Decoding</source>
-        <translation>Decodificación de vídeo en la CPU</translation>
+        <translation>Decodificación de vídeo en el procesador</translation>
    </message>
    <message>
        <location filename="../../src/qt_common/config/shared_translation.cpp" line="461"/>
@@ -2367,7 +2367,7 @@ Cuando un programa intenta abrir el applet del controlador, se cierra inmediatam
    <message>
        <location filename="../../src/yuzu/configuration/configure_cpu.ui" line="17"/>
        <source>CPU</source>
-        <translation>CPU</translation>
+        <translation>Procesador</translation>
    </message>
    <message>
        <location filename="../../src/yuzu/configuration/configure_cpu.ui" line="28"/>
@@ -2382,12 +2382,12 @@ Cuando un programa intenta abrir el applet del controlador, se cierra inmediatam
    <message>
        <location filename="../../src/yuzu/configuration/configure_cpu.ui" line="68"/>
        <source>CPU Backend</source>
-        <translation>Motor de la CPU</translation>
+        <translation>Motor del procesador</translation>
    </message>
    <message>
        <location filename="../../src/yuzu/configuration/configure_cpu.ui" line="95"/>
        <source>Unsafe CPU Optimization Settings</source>
-        <translation>Ajustes inseguros de la optimización de la CPU</translation>
+        <translation>Ajustes de optimización del procesador inseguro</translation>
    </message>
    <message>
        <location filename="../../src/yuzu/configuration/configure_cpu.ui" line="101"/>
@@ -2405,12 +2405,12 @@ Cuando un programa intenta abrir el applet del controlador, se cierra inmediatam
    <message>
        <location filename="../../src/yuzu/configuration/configure_cpu_debug.ui" line="17"/>
        <source>CPU</source>
-        <translation>CPU</translation>
+        <translation>Procesador</translation>
    </message>
    <message>
        <location filename="../../src/yuzu/configuration/configure_cpu_debug.ui" line="25"/>
        <source>Toggle CPU Optimizations</source>
-        <translation>Cambiar las optimizaciones de la CPU</translation>
+        <translation>Cambiar las optimizaciones del procesador</translation>
    </message>
    <message>
        <location filename="../../src/yuzu/configuration/configure_cpu_debug.ui" line="31"/>
@@ -2606,7 +2606,7 @@ Cuando un programa intenta abrir el applet del controlador, se cierra inmediatam
    <message>
        <location filename="../../src/yuzu/configuration/configure_cpu_debug.ui" line="212"/>
        <source>CPU settings are available only when game is not running.</source>
-        <translation>Los ajustes de la CPU solo están disponibles cuando no se esté ejecutando ningún juego.</translation>
+        <translation>Los ajustes del procesador solo están disponibles cuando no se esté ejecutando ningún juego.</translation>
    </message>
 </context>
 <context>
@@ -2644,17 +2644,17 @@ Cuando un programa intenta abrir el applet del controlador, se cierra inmediatam
    <message>
        <location filename="../../src/yuzu/configuration/configure_debug.ui" line="209"/>
        <source>Enable Extended Logging**</source>
-        <translation>Habilitar el registro extendido**</translation>
+        <translation>Habilitar registro extendido**</translation>
    </message>
    <message>
        <location filename="../../src/yuzu/configuration/configure_debug.ui" line="216"/>
        <source>Show Log in Console</source>
-        <translation>Ver el registro en la consola</translation>
+        <translation>Ver registro en consola</translation>
    </message>
    <message>
        <location filename="../../src/yuzu/configuration/configure_debug.ui" line="223"/>
        <source>Open Log Location</source>
-        <translation>Abrir la ubicación del archivo de registro</translation>
+        <translation>Abrir ubicación del archivo de registro</translation>
    </message>
    <message>
        <location filename="../../src/yuzu/configuration/configure_debug.ui" line="235"/>
@@ -2689,7 +2689,7 @@ Cuando un programa intenta abrir el applet del controlador, se cierra inmediatam
    <message>
        <location filename="../../src/yuzu/configuration/configure_debug.ui" line="282"/>
        <source>Dump Maxwell Macros</source>
-        <translation>Volcar macros Maxwell</translation>
+        <translation>Volcar Macros Maxwell</translation>
    </message>
    <message>
        <location filename="../../src/yuzu/configuration/configure_debug.ui" line="289"/>
@@ -2734,7 +2734,7 @@ Cuando un programa intenta abrir el applet del controlador, se cierra inmediatam
    <message>
        <location filename="../../src/yuzu/configuration/configure_debug.ui" line="338"/>
        <source>Disable Macro HLE</source>
-        <translation>Desactivar macro HLE</translation>
+        <translation>Desactivar Macro HLE</translation>
    </message>
    <message>
        <location filename="../../src/yuzu/configuration/configure_debug.ui" line="348"/>
@@ -2844,7 +2844,7 @@ Cuando un programa intenta abrir el applet del controlador, se cierra inmediatam
    <message>
        <location filename="../../src/yuzu/configuration/configure_debug.ui" line="538"/>
        <source>Debug Knobs: </source>
-        <translation>Interruptores de depuración:</translation>
+        <translation>perillas de depuración:</translation>
    </message>
    <message>
        <location filename="../../src/yuzu/configuration/configure_debug.ui" line="572"/>
@@ -2864,7 +2864,7 @@ Cuando un programa intenta abrir el applet del controlador, se cierra inmediatam
    <message>
        <location filename="../../src/yuzu/configuration/configure_debug.ui" line="611"/>
        <source>Flush log output on each line</source>
-        <translation>Limpia el registro de salida en cada línea</translation>
+        <translation>Limpia lg salida en cada linea</translation>
    </message>
    <message>
        <location filename="../../src/yuzu/configuration/configure_debug.ui" line="618"/>
@@ -2879,7 +2879,7 @@ Cuando un programa intenta abrir el applet del controlador, se cierra inmediatam
    <message>
        <location filename="../../src/yuzu/configuration/configure_debug.ui" line="632"/>
        <source>Censor username in logs</source>
-        <translation>Censura del nombre de usuario en los archivos de registro</translation>
+        <translation>Censura nombre de usario en logs</translation>
    </message>
    <message>
        <location filename="../../src/yuzu/configuration/configure_debug.ui" line="668"/>
@@ -2921,7 +2921,7 @@ Cuando un programa intenta abrir el applet del controlador, se cierra inmediatam
    <message>
        <location filename="../../src/yuzu/configuration/configure_debug_tab.cpp" line="17"/>
        <source>CPU</source>
-        <translation>CPU</translation>
+        <translation>Procesador</translation>
    </message>
 </context>
 <context>
@@ -2951,7 +2951,7 @@ Cuando un programa intenta abrir el applet del controlador, se cierra inmediatam
        <location filename="../../src/yuzu/configuration/configure_dialog.cpp" line="71"/>
        <location filename="../../src/yuzu/configuration/configure_dialog.cpp" line="180"/>
        <source>CPU</source>
-        <translation>CPU</translation>
+        <translation>Procesador</translation>
    </message>
    <message>
        <location filename="../../src/yuzu/configuration/configure_dialog.cpp" line="72"/>
@@ -2978,7 +2978,7 @@ Cuando un programa intenta abrir el applet del controlador, se cierra inmediatam
    <message>
        <location filename="../../src/yuzu/configuration/configure_dialog.cpp" line="76"/>
        <source>GraphicsAdvanced</source>
-        <translation>GráficosAvanzados</translation>
+        <translation>Gráficosavanzados</translation>
    </message>
    <message>
        <location filename="../../src/yuzu/configuration/configure_dialog.cpp" line="77"/>
@@ -3063,7 +3063,7 @@ Cuando un programa intenta abrir el applet del controlador, se cierra inmediatam
    <message>
        <location filename="../../src/yuzu/configuration/configure_filesystem.ui" line="65"/>
        <source>Save Data</source>
-        <translation>Datos de guardado</translation>
+        <translation>Datos guardados</translation>
    </message>
    <message>
        <location filename="../../src/yuzu/configuration/configure_filesystem.ui" line="101"/>
@@ -3169,7 +3169,7 @@ Cuando un programa intenta abrir el applet del controlador, se cierra inmediatam
    <message>
        <location filename="../../src/yuzu/configuration/configure_filesystem.cpp" line="151"/>
        <source>Set Custom Path</source>
-        <translation>Configura una ruta personalizado</translation>
+        <translation>Configure ruta personalizado</translation>
    </message>
    <message>
        <location filename="../../src/yuzu/configuration/configure_filesystem.cpp" line="152"/>
@@ -4812,7 +4812,7 @@ Los valores actuales son %1% y %2% respectivamente.</translation>
    <message>
        <location filename="../../src/yuzu/configuration/configure_per_game.cpp" line="79"/>
        <source>CPU</source>
-        <translation>CPU</translation>
+        <translation>Procesador</translation>
    </message>
    <message>
        <location filename="../../src/yuzu/configuration/configure_per_game.cpp" line="80"/>
@@ -5814,12 +5814,12 @@ Arrastre los puntos para cambiar de posición, o haga doble clic en las celdas d
    <message>
        <location filename="../../src/yuzu/data_dialog.cpp" line="32"/>
        <source>User NAND</source>
-        <translation>NAND del usuario</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../../src/yuzu/data_dialog.cpp" line="33"/>
        <source>System NAND</source>
-        <translation>NAND del sistema</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../../src/yuzu/data_dialog.cpp" line="34"/>
@@ -5819,12 +5819,12 @@ Drag points to change position, or double-click table cells to edit values.</sou
    <message>
        <location filename="../../src/yuzu/data_dialog.cpp" line="32"/>
        <source>User NAND</source>
-        <translation>NAND користувача</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../../src/yuzu/data_dialog.cpp" line="33"/>
        <source>System NAND</source>
-        <translation>NAND системи</translation>
+        <translation type="unfinished"/>
    </message>
    <message>
        <location filename="../../src/yuzu/data_dialog.cpp" line="34"/>
@@ -4,8 +4,7 @@
 - [Arch Linux](#arch-linux)
 - [Gentoo Linux](#gentoo-linux)
 - [macOS](#macos)
- [OpenIndiana](#openindiana)
- [OmniOS](#omnios)
+- [Solaris](#solaris)
 - [HaikuOS](#haikuos)
 - [OpenBSD](#openbsd)
 - [FreeBSD](#freebsd)
@@ -32,14 +31,14 @@ If you're having issues with building, always consult that ebuild.

 macOS is largely untested. Expect crashes, significant Vulkan issues, and other fun stuff.

-## OpenIndiana
+## Solaris

 Always consult [the OpenIndiana package list](https://pkg.openindiana.org/hipster/en/index.shtml) to cross-verify availability.

 Run the usual update + install of essential toolings: `sudo pkg update && sudo pkg install git cmake`.

- **gcc**: Install either `developer/gcc-14`.
- **clang**: Version 20 is broken, install `developer/clang-19`.
+- **gcc**: `sudo pkg install developer/gcc-14`.
+- **clang**: Version 20 is broken, use `sudo pkg install developer/clang-19`.

 Qt Widgets appears to be broken. For now, add `-DENABLE_QT=OFF` to your configure command. In the meantime, a Qt Quick frontend is in the works--check back later!

@@ -68,31 +67,6 @@ export LIBGL_ALWAYS_SOFTWARE=1
 - If using OpenIndiana, due to a bug in SDL2's CMake configuration, audio driver defaults to SunOS `<sys/audioio.h>`, which does not exist on OpenIndiana. Using external or bundled SDL2 may solve this.
 - System OpenSSL generally does not work. Instead, use `-DYUZU_USE_BUNDLED_OPENSSL=ON` to use a bundled static OpenSSL, or build a system dependency from source.

-## OmniOS
-
-Install `developer/gcc14` on OmniOS using pkgsrc.
-
-Since so many dependencies are missing on `OmniOS`, you may wish to use `-DCPMUTIL_FORCE_BUNDLED=ON -DYUZU_USE_EXTERNAL_SDL2=ON`
-
-For OmniOS you are required to build glslang yourself:
-```sh
-sudo pkg install python-313
-git clone --depth=1 https://github.com/KhronosGroup/glslang.git
-cd glslang
-python3.13 ./update_glslang_sources.py
-cmake -B build -DCMAKE_BUILD_TYPE=Release
-cmake --build build -- -j `nproc`
-cmake --install build
-```
-
-It may be tempting to specify `-t glslang`, but this will cause installation to fail. So don't.
-
-Using `--parallel` on CMake incorrectly passes `dmake ... -jn` instead of `dmake ... -j n`, this is a bug with OmniOS's CMake, and as such it's recommended to not use this option until it's fixed.
-
-You may also need to install `gmake` in order to properly build FFmpeg, this is provided by the `build-essential` package.
-
-If it wasn't obvious already, you require a X11 server to properly run the emulator within OmniOS, [this guide](https://web.archive.org/web/20260424200928/https://geekblood.wordpress.com/2017/10/26/installing-x11-and-a-desktop-environment-on-omnios/) is a great starting point for that, the links to pkgsrc are outdated so follow [this exemplar](https://pkgsrc.smartos.org/install-on-illumos/) as well:
-
 ## HaikuOS

 It's recommended to do a `pkgman full-sync` before installing. See [HaikuOS: Installing applications](https://www.haiku-os.org/guides/daily-tasks/install-applications/). Sometimes the process may be interrupted by an error like "Interrupted syscall". Simply firing the command again fixes the issue. By default `g++` is included on the default installation.
@@ -291,23 +291,13 @@ pkg install gcc14 git cmake unzip nasm autoconf bash pkgconf ffmpeg glslang gmak

 </details>
 <details>
-<summary>OpenIndiana</summary>
+<summary>Solaris / OpenIndiana</summary>

 ```sh
-sudo pkg install git cmake qt6 boost glslang libzip library/lz4 libusb-1 nlohmann-json openssl opus sdl2 zlib compress/zstd unzip pkg-config nasm autoconf mesa library/libdrm header-drm developer/fmt
+sudo pkg install qt6 boost glslang libzip library/lz4 libusb-1 nlohmann-json openssl opus sdl2 zlib compress/zstd unzip pkg-config nasm autoconf mesa library/libdrm header-drm developer/fmt
 ```

-[Caveats](./Caveats.md#openindiana).
-
-</details>
-<details>
-<summary>OmniOS</summary>
-
-```sh
-sudo pkgin install git cmake autoconf build-essential libusb-1 nasm gcc13
-```
-
-[Caveats](./Caveats.md#omnios).
+[Caveats](./Caveats.md#solaris).

 </details>
 <details>
@@ -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",
@@ -208,8 +222,8 @@
    },
    "ffmpeg": {
        "repo": "FFmpeg/FFmpeg",
-        "sha": "e717604a29",
-        "hash": "403390865aa3c0a947679ec2f24076383c72d308dda66918e64526ddc585e652dfda66b724fc04b1625a28c89d428b13d50ae2c19c7a7f16bd5e50904266f302",
+        "sha": "c7b5f1537d",
+        "hash": "ed177621176b3961bdcaa339187d3a7688c1c8b060b79c4bb0257cbc67ad7021ae5d5adca5303b45625abbbe3d9aafdd87ce777b8690ac295290d744c875489a",
        "bundled": true
    },
    "ffmpeg-ci": {
@@ -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
@@ -244,7 +244,7 @@ else()
    set(FFmpeg_BUILD_LIBRARIES ${FFmpeg_LIBRARIES})

    # BSD make or Solaris make don't support ffmpeg make-j8
-    if (DEFINED SYSTEM_THREADS AND (PLATFORM_LINUX OR ANDROID OR APPLE OR WIN32 OR PLATFORM_FREEBSD))
+    if (PLATFORM_LINUX OR ANDROID OR APPLE OR WIN32 OR PLATFORM_FREEBSD)
        set(FFmpeg_MAKE_ARGS -j${SYSTEM_THREADS})
    else()
        set(FFmpeg_MAKE_ARGS "")
@@ -254,7 +254,7 @@ else()
        OUTPUT
            ${FFmpeg_BUILD_LIBRARIES}
        COMMAND
-            gmake ${FFmpeg_MAKE_ARGS}
+            make ${FFmpeg_MAKE_ARGS}
        WORKING_DIRECTORY
            ${FFmpeg_BUILD_DIR}
    )
@@ -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,
@@ -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))

@@ -1760,7 +1760,7 @@ 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("https://{}/{}/{}",
+    const std::string url = fmt::format("{}/{}/{}",
        std::string{Common::g_build_auto_update_api},
        version_str, apk_filename);

@@ -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>
@@ -483,6 +485,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 26.0 及以上版本的 Turnip 驱动程序。在旧版驱动程序上会导致程序崩溃。</string>
+
    <string name="hacks">Hacks</string>

    <string name="fast_gpu_time">GPU 超频频率</string>
@@ -490,6 +494,7 @@
    <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_description">减少《塞尔达传说：智慧的再现》（Adreno 700）中的 bloom 模糊，并移除《Burnout》中的 bloom 效果。警告：可能会导致在其他游戏中出现画面显示问题。</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>
@@ -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.
@@ -89,7 +89,7 @@ void NvMap::UnmapHandle(Handle& handle_description) {

    // Free and unmap the handle from Host1x GMMU
    if (handle_description.pin_virt_address) {
-        host1x.GMMU().Unmap(static_cast<GPUVAddr>(handle_description.pin_virt_address),
+        host1x.gmmu_manager.Unmap(static_cast<GPUVAddr>(handle_description.pin_virt_address),
                            handle_description.aligned_size);
        host1x.Allocator().Free(handle_description.pin_virt_address,
                                static_cast<u32>(handle_description.aligned_size));
@@ -169,12 +169,8 @@ DAddr NvMap::PinHandle(NvMap::Handle::Id handle, bool low_area_pin) {
    std::scoped_lock lock(handle_description->mutex);
    const auto map_low_area = [&] {
        if (handle_description->pin_virt_address == 0) {
-            auto& gmmu_allocator = host1x.Allocator();
-            auto& gmmu = host1x.GMMU();
-            u32 address =
-                gmmu_allocator.Allocate(static_cast<u32>(handle_description->aligned_size));
-            gmmu.Map(static_cast<GPUVAddr>(address), handle_description->d_address,
-                     handle_description->aligned_size);
+            u32 address = host1x.Allocator().Allocate(u32(handle_description->aligned_size));
+            host1x.gmmu_manager.Map(GPUVAddr(address), handle_description->d_address, handle_description->aligned_size);
            handle_description->pin_virt_address = address;
        }
    };
@@ -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;
@@ -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
@@ -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

@@ -8,7 +8,7 @@ add_subdirectory(host_shaders)
 add_subdirectory(gpu_logging)

 if(LIBVA_FOUND)
-    set_source_files_properties(host1x/ffmpeg/ffmpeg.cpp
+    set_source_files_properties(host1x/ffmpeg.cpp
        PROPERTIES COMPILE_DEFINITIONS LIBVA_FOUND=1)
    list(APPEND FFmpeg_LIBRARIES ${LIBVA_LIBRARIES})
 endif()
@@ -72,9 +72,9 @@ add_library(video_core STATIC
    host1x/codecs/vp8.h
    host1x/codecs/vp9.cpp
    host1x/codecs/vp9.h
-    host1x/codecs/vp9_types.h
-    host1x/ffmpeg/ffmpeg.cpp
-    host1x/ffmpeg/ffmpeg.h
+    host1x/codec_types.h
+    host1x/ffmpeg.cpp
+    host1x/ffmpeg.h
    host1x/control.cpp
    host1x/control.h
    host1x/gpu_device_memory_manager.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: Ryujinx Team and Contributors
@@ -20,9 +20,10 @@
 namespace Tegra {

 CDmaPusher::CDmaPusher(Host1x::Host1x& host1x_, s32 id)
-    : host1x{host1x_}, memory_manager{host1x.GMMU()},
-      host_processor{std::make_unique<Host1x::Control>(host1x_)}, current_class{
-                                                                      static_cast<ChClassId>(id)} {
+    : host_processor{std::make_unique<Host1x::Control>(host1x_)}
+    , host1x{host1x_}
+    , current_class{ChClassId(id)}
+{
    thread = std::jthread([this](std::stop_token stop_token) { ProcessEntries(stop_token); });
 }

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

@@ -117,9 +120,6 @@ protected:

    virtual void ProcessMethod(u32 method, u32 arg) = 0;

-    Host1x::Host1x& host1x;
-    Tegra::MemoryManager& memory_manager;
-
 private:
    /// Process the command entry
    void ProcessEntries(std::stop_token stop_token);
@@ -127,14 +127,14 @@ private:
    /// Invoke command class devices to execute the command based on the current state
    void ExecuteCommand(u32 state_offset, u32 data);

-    std::unique_ptr<Host1x::Control> host_processor;
-
-    std::mutex command_mutex;
-    std::condition_variable_any command_cv;
-    std::deque<ChCommandHeaderList> command_lists;
-    std::jthread thread;
-
+protected:
    ThiRegisters thi_regs{};
+    std::deque<ChCommandHeaderList> command_lists;
+    std::condition_variable_any command_cv;
+    std::jthread thread;
+    std::unique_ptr<Host1x::Control> host_processor;
+    std::mutex command_mutex;
+    Host1x::Host1x& host1x;
    ChClassId current_class;
 };

@@ -89,7 +89,7 @@ struct GPU::Impl {
        renderer = std::move(renderer_);
        rasterizer = renderer->ReadRasterizer();
        host1x.MemoryManager().BindInterface(rasterizer);
-        host1x.GMMU().BindRasterizer(rasterizer);
+        host1x.gmmu_manager.BindRasterizer(rasterizer);
    }

    /// Flush all current written commands into the host GPU for execution.
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@@ -6,12 +9,192 @@
 #include <array>
 #include <vector>

+#include "common/bit_field.h"
 #include "common/common_funcs.h"
 #include "common/common_types.h"

 namespace Tegra {

 namespace Decoders {
+
+struct Offset {
+    constexpr u32 Address() const noexcept {
+        return offset << 8;
+    }
+
+private:
+    u32 offset;
+};
+static_assert(std::is_trivial_v<Offset>, "Offset must be trivial");
+static_assert(sizeof(Offset) == 0x4, "Offset has the wrong size!");
+
+struct H264ParameterSet {
+    s32 log2_max_pic_order_cnt_lsb_minus4; ///< 0x00
+    s32 delta_pic_order_always_zero_flag;  ///< 0x04
+    s32 frame_mbs_only_flag;               ///< 0x08
+    u32 pic_width_in_mbs;                  ///< 0x0C
+    u32 frame_height_in_mbs;               ///< 0x10
+    union {                                ///< 0x14
+        BitField<0, 2, u32> tile_format;
+        BitField<2, 3, u32> gob_height;
+        BitField<5, 27, u32> reserved_surface_format;
+    };
+    u32 entropy_coding_mode_flag;               ///< 0x18
+    s32 pic_order_present_flag;                 ///< 0x1C
+    s32 num_refidx_l0_default_active;           ///< 0x20
+    s32 num_refidx_l1_default_active;           ///< 0x24
+    s32 deblocking_filter_control_present_flag; ///< 0x28
+    s32 redundant_pic_cnt_present_flag;         ///< 0x2C
+    u32 transform_8x8_mode_flag;                ///< 0x30
+    u32 pitch_luma;                             ///< 0x34
+    u32 pitch_chroma;                           ///< 0x38
+    Offset luma_top_offset;                     ///< 0x3C
+    Offset luma_bot_offset;                     ///< 0x40
+    Offset luma_frame_offset;                   ///< 0x44
+    Offset chroma_top_offset;                   ///< 0x48
+    Offset chroma_bot_offset;                   ///< 0x4C
+    Offset chroma_frame_offset;                 ///< 0x50
+    u32 hist_buffer_size;                       ///< 0x54
+    union {                                     ///< 0x58
+        union {
+            BitField<0, 1, u64> mbaff_frame;
+            BitField<1, 1, u64> direct_8x8_inference;
+            BitField<2, 1, u64> weighted_pred;
+            BitField<3, 1, u64> constrained_intra_pred;
+            BitField<4, 1, u64> ref_pic;
+            BitField<5, 1, u64> field_pic;
+            BitField<6, 1, u64> bottom_field;
+            BitField<7, 1, u64> second_field;
+        } flags;
+        BitField<8, 4, u64> log2_max_frame_num_minus4;
+        BitField<12, 2, u64> chroma_format_idc;
+        BitField<14, 2, u64> pic_order_cnt_type;
+        BitField<16, 6, s64> pic_init_qp_minus26;
+        BitField<22, 5, s64> chroma_qp_index_offset;
+        BitField<27, 5, s64> second_chroma_qp_index_offset;
+        BitField<32, 2, u64> weighted_bipred_idc;
+        BitField<34, 7, u64> curr_pic_idx;
+        BitField<41, 5, u64> curr_col_idx;
+        BitField<46, 16, u64> frame_number;
+        BitField<62, 1, u64> frame_surfaces;
+        BitField<63, 1, u64> output_memory_layout;
+    };
+};
+static_assert(sizeof(H264ParameterSet) == 0x60, "H264ParameterSet is an invalid size");
+
+#define ASSERT_POSITION(field_name, position)                                                      \
+    static_assert(offsetof(H264ParameterSet, field_name) == position,                              \
+                  "Field " #field_name " has invalid position")
+
+ASSERT_POSITION(log2_max_pic_order_cnt_lsb_minus4, 0x00);
+ASSERT_POSITION(delta_pic_order_always_zero_flag, 0x04);
+ASSERT_POSITION(frame_mbs_only_flag, 0x08);
+ASSERT_POSITION(pic_width_in_mbs, 0x0C);
+ASSERT_POSITION(frame_height_in_mbs, 0x10);
+ASSERT_POSITION(tile_format, 0x14);
+ASSERT_POSITION(entropy_coding_mode_flag, 0x18);
+ASSERT_POSITION(pic_order_present_flag, 0x1C);
+ASSERT_POSITION(num_refidx_l0_default_active, 0x20);
+ASSERT_POSITION(num_refidx_l1_default_active, 0x24);
+ASSERT_POSITION(deblocking_filter_control_present_flag, 0x28);
+ASSERT_POSITION(redundant_pic_cnt_present_flag, 0x2C);
+ASSERT_POSITION(transform_8x8_mode_flag, 0x30);
+ASSERT_POSITION(pitch_luma, 0x34);
+ASSERT_POSITION(pitch_chroma, 0x38);
+ASSERT_POSITION(luma_top_offset, 0x3C);
+ASSERT_POSITION(luma_bot_offset, 0x40);
+ASSERT_POSITION(luma_frame_offset, 0x44);
+ASSERT_POSITION(chroma_top_offset, 0x48);
+ASSERT_POSITION(chroma_bot_offset, 0x4C);
+ASSERT_POSITION(chroma_frame_offset, 0x50);
+ASSERT_POSITION(hist_buffer_size, 0x54);
+ASSERT_POSITION(flags, 0x58);
+#undef ASSERT_POSITION
+
+struct DpbEntry {
+    union {
+        BitField<0, 7, u32> index;
+        BitField<7, 5, u32> col_idx;
+        BitField<12, 2, u32> state;
+        BitField<14, 1, u32> is_long_term;
+        BitField<15, 1, u32> non_existing;
+        BitField<16, 1, u32> is_field;
+        BitField<17, 4, u32> top_field_marking;
+        BitField<21, 4, u32> bottom_field_marking;
+        BitField<25, 1, u32> output_memory_layout;
+        BitField<26, 6, u32> reserved;
+    } flags;
+    std::array<u32, 2> field_order_cnt;
+    u32 frame_idx;
+};
+static_assert(sizeof(DpbEntry) == 0x10, "DpbEntry has the wrong size!");
+
+struct DisplayParam {
+    union {
+        BitField<0, 1, u32> enable_tf_output;
+        BitField<1, 1, u32> vc1_map_y_flag;
+        BitField<2, 3, u32> map_y_value;
+        BitField<5, 1, u32> vc1_map_uv_flag;
+        BitField<6, 3, u32> map_uv_value;
+        BitField<9, 8, u32> out_stride;
+        BitField<17, 3, u32> tiling_format;
+        BitField<20, 1, u32> output_structure; // 0=frame, 1=field
+        BitField<21, 11, u32> reserved0;
+    };
+    std::array<s32, 2> output_top;
+    std::array<s32, 2> output_bottom;
+    union {
+        BitField<0, 1, u32> enable_histogram;
+        BitField<1, 12, u32> histogram_start_x;
+        BitField<13, 12, u32> histogram_start_y;
+        BitField<25, 7, u32> reserved1;
+    };
+    union {
+        BitField<0, 12, u32> histogram_end_x;
+        BitField<12, 12, u32> histogram_end_y;
+        BitField<24, 8, u32> reserved2;
+    };
+};
+static_assert(sizeof(DisplayParam) == 0x1C, "DisplayParam has the wrong size!");
+
+struct H264DecoderContext {
+    INSERT_PADDING_WORDS_NOINIT(13);                        ///< 0x0000
+    std::array<u8, 16> eos;                                 ///< 0x0034
+    u8 explicit_eos_present_flag;                           ///< 0x0044
+    u8 hint_dump_en;                                        ///< 0x0045
+    INSERT_PADDING_BYTES_NOINIT(2);                         ///< 0x0046
+    u32 stream_len;                                         ///< 0x0048
+    u32 slice_count;                                        ///< 0x004C
+    u32 mbhist_buffer_size;                                 ///< 0x0050
+    u32 gptimer_timeout_value;                              ///< 0x0054
+    H264ParameterSet h264_parameter_set;                    ///< 0x0058
+    std::array<s32, 2> curr_field_order_cnt;                ///< 0x00B8
+    std::array<DpbEntry, 16> dpb;                           ///< 0x00C0
+    std::array<u8, 0x60> weight_scale_4x4;                  ///< 0x01C0
+    std::array<u8, 0x80> weight_scale_8x8;                  ///< 0x0220
+    std::array<u8, 2> num_inter_view_refs_lX;               ///< 0x02A0
+    std::array<u8, 14> reserved2;                           ///< 0x02A2
+    std::array<std::array<s8, 16>, 2> inter_view_refidx_lX; ///< 0x02B0
+    union {                                                 ///< 0x02D0
+        BitField<0, 1, u32> lossless_ipred8x8_filter_enable;
+        BitField<1, 1, u32> qpprime_y_zero_transform_bypass_flag;
+        BitField<2, 30, u32> reserved3;
+    };
+    DisplayParam display_param;   ///< 0x02D4
+    std::array<u32, 3> reserved4; ///< 0x02F0
+};
+static_assert(sizeof(H264DecoderContext) == 0x2FC, "H264DecoderContext is an invalid size");
+
+#define ASSERT_POSITION(field_name, position)                                                      \
+    static_assert(offsetof(H264DecoderContext, field_name) == position,                            \
+                  "Field " #field_name " has invalid position")
+
+ASSERT_POSITION(stream_len, 0x48);
+ASSERT_POSITION(h264_parameter_set, 0x58);
+ASSERT_POSITION(dpb, 0xC0);
+ASSERT_POSITION(weight_scale_4x4, 0x1C0);
+#undef ASSERT_POSITION
+
 enum class Vp9SurfaceIndex : u32 {
    Last = 0,
    Golden = 1,
@@ -287,10 +470,7 @@ struct RefPoolElement {
    bool refresh{};
 };

-#define ASSERT_POSITION(field_name, position)                                                      \
-    static_assert(offsetof(Vp9EntropyProbs, field_name) == position,                               \
-                  "Field " #field_name " has invalid position")
-
+#define ASSERT_POSITION(field_name, position) static_assert(offsetof(Vp9EntropyProbs, field_name) == position)
 ASSERT_POSITION(partition_prob, 0x0024);
 ASSERT_POSITION(switchable_interp_prob, 0x0724);
 ASSERT_POSITION(sign, 0x0772);
@@ -298,10 +478,7 @@ ASSERT_POSITION(class_0_fr, 0x079E);
 ASSERT_POSITION(high_precision, 0x07B2);
 #undef ASSERT_POSITION

-#define ASSERT_POSITION(field_name, position)                                                      \
-    static_assert(offsetof(PictureInfo, field_name) == position,                                   \
-                  "Field " #field_name " has invalid position")
-
+#define ASSERT_POSITION(field_name, position) static_assert(offsetof(PictureInfo, field_name) == position)
 ASSERT_POSITION(bitstream_size, 0x30);
 ASSERT_POSITION(last_frame_size, 0x48);
 ASSERT_POSITION(first_level, 0x70);
@@ -309,9 +486,7 @@ ASSERT_POSITION(segmentation, 0x80);
 ASSERT_POSITION(loop_filter, 0xE4);
 #undef ASSERT_POSITION

-#define ASSERT_POSITION(field_name, position)                                                      \
-    static_assert(offsetof(EntropyProbs, field_name) == position,                                  \
-                  "Field " #field_name " has invalid position")
+#define ASSERT_POSITION(field_name, position) static_assert(offsetof(EntropyProbs, field_name) == position)

 ASSERT_POSITION(inter_mode_prob, 0x400);
 ASSERT_POSITION(tx_8x8_prob, 0x470);
@@ -321,5 +496,47 @@ ASSERT_POSITION(class_0_fr, 0x560);
 ASSERT_POSITION(coef_probs, 0x5A0);
 #undef ASSERT_POSITION

+struct VP8PictureInfo {
+    INSERT_PADDING_WORDS_NOINIT(14);
+    u16 frame_width;  // actual frame width
+    u16 frame_height; // actual frame height
+    u8 key_frame;
+    u8 version;
+    union {
+        u8 raw;
+        BitField<0, 2, u8> tile_format;
+        BitField<2, 3, u8> gob_height;
+        BitField<5, 3, u8> reserved_surface_format;
+    };
+    u8 error_conceal_on;  // 1: error conceal on; 0: off
+    u32 first_part_size;  // the size of first partition(frame header and mb header partition)
+    u32 hist_buffer_size; // in units of 256
+    u32 vld_buffer_size;  // in units of 1
+    // Current frame buffers
+    std::array<u32, 2> frame_stride; // [y_c]
+    u32 luma_top_offset;             // offset of luma top field in units of 256
+    u32 luma_bot_offset;             // offset of luma bottom field in units of 256
+    u32 luma_frame_offset;           // offset of luma frame in units of 256
+    u32 chroma_top_offset;           // offset of chroma top field in units of 256
+    u32 chroma_bot_offset;           // offset of chroma bottom field in units of 256
+    u32 chroma_frame_offset;         // offset of chroma frame in units of 256
+
+    INSERT_PADDING_BYTES_NOINIT(0x1c); // NvdecDisplayParams
+
+    // Decode picture buffer related
+    s8 current_output_memory_layout;
+    // output NV12/NV24 setting. index 0: golden; 1: altref; 2: last
+    std::array<s8, 3> output_memory_layout;
+
+    u8 segmentation_feature_data_update;
+    INSERT_PADDING_BYTES_NOINIT(3);
+
+    // ucode return result
+    u32 result_value;
+    std::array<u32, 8> partition_offset;
+    INSERT_PADDING_WORDS_NOINIT(3);
+};
+static_assert(sizeof(VP8PictureInfo) == 0xc0, "PictureInfo is an invalid size");
+
 }; // namespace Decoders
 }; // namespace Tegra
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@@ -13,9 +16,12 @@
 namespace Tegra {

 Codec::Codec(Host1x::Host1x& host1x_, const Host1x::NvdecCommon::NvdecRegisters& regs)
-    : host1x(host1x_), state{regs}, h264_decoder(std::make_unique<Decoder::H264>(host1x)),
-      vp8_decoder(std::make_unique<Decoder::VP8>(host1x)),
-      vp9_decoder(std::make_unique<Decoder::VP9>(host1x)) {}
+    : host1x(host1x_)
+    , state{regs}
+    , h264_decoder(host1x_)
+    , vp8_decoder(host1x_)
+    , vp9_decoder(host1x_)
+{}

 Codec::~Codec() = default;

@@ -32,13 +38,11 @@ void Codec::SetTargetCodec(Host1x::NvdecCommon::VideoCodec codec) {

 void Codec::Decode() {
    const bool is_first_frame = !initialized;
-    if (is_first_frame) {
+    if (is_first_frame)
        Initialize();
-    }

-    if (!initialized) {
+    if (!initialized)
        return;
-    }

    // Assemble bitstream.
    bool vp9_hidden_frame = false;
@@ -46,13 +50,13 @@ void Codec::Decode() {
    const auto packet_data = [&]() {
        switch (current_codec) {
        case Tegra::Host1x::NvdecCommon::VideoCodec::H264:
-            return h264_decoder->ComposeFrame(state, &configuration_size, is_first_frame);
+            return h264_decoder.ComposeFrame(state, &configuration_size, is_first_frame);
        case Tegra::Host1x::NvdecCommon::VideoCodec::VP8:
-            return vp8_decoder->ComposeFrame(state);
+            return vp8_decoder.ComposeFrame(state);
        case Tegra::Host1x::NvdecCommon::VideoCodec::VP9:
-            vp9_decoder->ComposeFrame(state);
-            vp9_hidden_frame = vp9_decoder->WasFrameHidden();
-            return vp9_decoder->GetFrameBytes();
+            vp9_decoder.ComposeFrame(state);
+            vp9_hidden_frame = vp9_decoder.WasFrameHidden();
+            return vp9_decoder.GetFrameBytes();
        default:
            ASSERT(false);
            return std::span<const u8>{};
@@ -81,19 +85,13 @@ void Codec::Decode() {
 std::unique_ptr<FFmpeg::Frame> Codec::GetCurrentFrame() {
    // Sometimes VIC will request more frames than have been decoded.
    // in this case, return a blank frame and don't overwrite previous data.
-    if (frames.empty()) {
+    if (frames.empty())
        return {};
-    }
-
    auto frame = std::move(frames.front());
    frames.pop();
    return frame;
 }

-Host1x::NvdecCommon::VideoCodec Codec::GetCurrentCodec() const {
-    return current_codec;
-}
-
 std::string_view Codec::GetCurrentCodecName() const {
    switch (current_codec) {
    case Host1x::NvdecCommon::VideoCodec::None:
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@@ -8,17 +11,14 @@
 #include <string_view>
 #include <queue>
 #include "common/common_types.h"
-#include "video_core/host1x/ffmpeg/ffmpeg.h"
+#include "video_core/host1x/codecs/h264.h"
+#include "video_core/host1x/codecs/vp8.h"
+#include "video_core/host1x/codecs/vp9.h"
+#include "video_core/host1x/ffmpeg.h"
 #include "video_core/host1x/nvdec_common.h"

 namespace Tegra {

-namespace Decoder {
-class H264;
-class VP8;
-class VP9;
-} // namespace Decoder
-
 namespace Host1x {
 class Host1x;
 } // namespace Host1x
@@ -40,9 +40,6 @@ public:
    /// Returns next decoded frame
    [[nodiscard]] std::unique_ptr<FFmpeg::Frame> GetCurrentFrame();

-    /// Returns the value of current_codec
-    [[nodiscard]] Host1x::NvdecCommon::VideoCodec GetCurrentCodec() const;
-
    /// Return name of the current codec
    [[nodiscard]] std::string_view GetCurrentCodecName() const;

@@ -53,10 +50,9 @@ private:

    Host1x::Host1x& host1x;
    const Host1x::NvdecCommon::NvdecRegisters& state;
-    std::unique_ptr<Decoder::H264> h264_decoder;
-    std::unique_ptr<Decoder::VP8> vp8_decoder;
-    std::unique_ptr<Decoder::VP9> vp9_decoder;
-
+    Decoders::H264 h264_decoder;
+    Decoders::VP8 vp8_decoder;
+    Decoders::VP9 vp9_decoder;
    std::queue<std::unique_ptr<FFmpeg::Frame>> frames{};
 };

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

 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
@@ -12,10 +12,11 @@

 namespace Tegra {

-Decoder::Decoder(Host1x::Host1x& host1x_, s32 id_, const Host1x::NvdecCommon::NvdecRegisters& regs_,
-                 Host1x::FrameQueue& frame_queue_)
-    : host1x(host1x_), memory_manager{host1x.GMMU()}, regs{regs_}, id{id_}, frame_queue{
-                                                                                frame_queue_} {}
+Decoder::Decoder(Host1x::Host1x& host1x_, s32 id_, const Host1x::NvdecCommon::NvdecRegisters& regs_)
+    : host1x(host1x_)
+    , regs{regs_}
+    , id{id_}
+{}

 Decoder::~Decoder() = default;

@@ -53,11 +54,11 @@ void Decoder::Decode() {
        }

        if (UsingDecodeOrder()) {
-            frame_queue.PushDecodeOrder(id, luma_top, std::move(frame));
-            frame_queue.PushDecodeOrder(id, luma_bottom, std::move(frame_copy));
+            host1x.frame_queue.PushDecodeOrder(id, luma_top, std::move(frame));
+            host1x.frame_queue.PushDecodeOrder(id, luma_bottom, std::move(frame_copy));
        } else {
-            frame_queue.PushPresentOrder(id, luma_top, std::move(frame));
-            frame_queue.PushPresentOrder(id, luma_bottom, std::move(frame_copy));
+            host1x.frame_queue.PushPresentOrder(id, luma_top, std::move(frame));
+            host1x.frame_queue.PushPresentOrder(id, luma_bottom, std::move(frame_copy));
        }
    } else {
        auto [luma_offset, chroma_offset] = GetProgressiveOffsets();
@@ -68,9 +69,9 @@ void Decoder::Decode() {
        }

        if (UsingDecodeOrder()) {
-            frame_queue.PushDecodeOrder(id, luma_offset, std::move(frame));
+            host1x.frame_queue.PushDecodeOrder(id, luma_offset, std::move(frame));
        } else {
-            frame_queue.PushPresentOrder(id, luma_offset, std::move(frame));
+            host1x.frame_queue.PushPresentOrder(id, luma_offset, std::move(frame));
        }
    }
 }
@@ -14,7 +14,7 @@
 #include <queue>

 #include "common/common_types.h"
-#include "video_core/host1x/ffmpeg/ffmpeg.h"
+#include "video_core/host1x/ffmpeg.h"
 #include "video_core/host1x/nvdec_common.h"

 namespace Tegra {
@@ -35,33 +35,23 @@ public:
        return decode_api.UsingDecodeOrder();
    }

-    /// Returns the value of current_codec
-    [[nodiscard]] Host1x::NvdecCommon::VideoCodec GetCurrentCodec() const {
-        return codec;
-    }
-
    /// Return name of the current codec
    [[nodiscard]] virtual std::string_view GetCurrentCodecName() const = 0;

 protected:
-    explicit Decoder(Host1x::Host1x& host1x, s32 id,
-                     const Host1x::NvdecCommon::NvdecRegisters& regs,
-                     Host1x::FrameQueue& frame_queue);
+    explicit Decoder(Host1x::Host1x& host1x, s32 id, const Host1x::NvdecCommon::NvdecRegisters& regs);

    virtual std::span<const u8> ComposeFrame() = 0;
    virtual std::tuple<u64, u64> GetProgressiveOffsets() = 0;
    virtual std::tuple<u64, u64, u64, u64> GetInterlacedOffsets() = 0;
    virtual bool IsInterlaced() = 0;

+    FFmpeg::DecodeApi decode_api;
    Host1x::Host1x& host1x;
-    Tegra::MemoryManager& memory_manager;
    const Host1x::NvdecCommon::NvdecRegisters& regs;
    s32 id;
-    Host1x::FrameQueue& frame_queue;
-    Host1x::NvdecCommon::VideoCodec codec;
-    FFmpeg::DecodeApi decode_api;
-    bool initialized{};
-    bool vp9_hidden_frame{};
+    bool initialized : 1 = false;
+    bool vp9_hidden_frame : 1 = false;
 };

 } // namespace Tegra
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
@@ -14,25 +14,11 @@
 #include "video_core/memory_manager.h"

 namespace Tegra::Decoders {
-namespace {
-// ZigZag LUTs from libavcodec.
-constexpr std::array<u8, 64> zig_zag_direct{
-    0,  1,  8,  16, 9,  2,  3,  10, 17, 24, 32, 25, 18, 11, 4,  5,  12, 19, 26, 33, 40, 48,
-    41, 34, 27, 20, 13, 6,  7,  14, 21, 28, 35, 42, 49, 56, 57, 50, 43, 36, 29, 22, 15, 23,
-    30, 37, 44, 51, 58, 59, 52, 45, 38, 31, 39, 46, 53, 60, 61, 54, 47, 55, 62, 63,
-};

-constexpr std::array<u8, 16> zig_zag_scan{
-    0 + 0 * 4, 1 + 0 * 4, 0 + 1 * 4, 0 + 2 * 4, 1 + 1 * 4, 2 + 0 * 4, 3 + 0 * 4, 2 + 1 * 4,
-    1 + 2 * 4, 0 + 3 * 4, 1 + 3 * 4, 2 + 2 * 4, 3 + 1 * 4, 3 + 2 * 4, 2 + 3 * 4, 3 + 3 * 4,
-};
-} // Anonymous namespace
-
-H264::H264(Host1x::Host1x& host1x_, const Host1x::NvdecCommon::NvdecRegisters& regs_, s32 id_,
-           Host1x::FrameQueue& frame_queue_)
-    : Decoder{host1x_, id_, regs_, frame_queue_} {
-    codec = Host1x::NvdecCommon::VideoCodec::H264;
-    initialized = decode_api.Initialize(codec);
+H264::H264(Host1x::Host1x& host1x_, const Host1x::NvdecCommon::NvdecRegisters& regs_, s32 id_)
+    : Decoder{host1x_, id_, regs_}
+{
+    initialized = decode_api.Initialize(Host1x::NvdecCommon::VideoCodec::H264);
 }

 H264::~H264() = default;
@@ -65,14 +51,11 @@ bool H264::IsInterlaced() {
 }

 std::span<const u8> H264::ComposeFrame() {
-    memory_manager.ReadBlock(regs.picture_info_offset.Address(), &current_context,
-                             sizeof(H264DecoderContext));
-
+    host1x.memory_manager.ReadBlock(regs.picture_info_offset.Address(), &current_context, sizeof(H264DecoderContext));
    const s64 frame_number = current_context.h264_parameter_set.frame_number.Value();
    if (!is_first_frame && frame_number != 0) {
        frame_scratch.resize_destructive(current_context.stream_len);
-        memory_manager.ReadBlock(regs.frame_bitstream_offset.Address(), frame_scratch.data(),
-                                 frame_scratch.size());
+        host1x.memory_manager.ReadBlock(regs.frame_bitstream_offset.Address(), frame_scratch.data(), frame_scratch.size());
        return frame_scratch;
    }

@@ -174,15 +157,13 @@ std::span<const u8> H264::ComposeFrame() {

    for (s32 index = 0; index < 6; index++) {
        writer.WriteBit(true);
-        std::span<const u8> matrix{current_context.weight_scale_4x4};
-        writer.WriteScalingList(scan_scratch, matrix, index * 16, 16);
+        writer.WriteScalingList(current_context.weight_scale_4x4, index * 16, 16);
    }

    if (current_context.h264_parameter_set.transform_8x8_mode_flag) {
        for (s32 index = 0; index < 2; index++) {
            writer.WriteBit(true);
-            std::span<const u8> matrix{current_context.weight_scale_8x8};
-            writer.WriteScalingList(scan_scratch, matrix, index * 64, 64);
+            writer.WriteScalingList(current_context.weight_scale_8x8, index * 64, 64);
        }
    }

@@ -196,11 +177,7 @@ std::span<const u8> H264::ComposeFrame() {
    const auto& encoded_header = writer.GetByteArray();
    frame_scratch.resize(encoded_header.size() + current_context.stream_len);
    std::memcpy(frame_scratch.data(), encoded_header.data(), encoded_header.size());
-
-    memory_manager.ReadBlock(regs.frame_bitstream_offset.Address(),
-                             frame_scratch.data() + encoded_header.size(),
-                             current_context.stream_len);
-
+    host1x.memory_manager.ReadBlock(regs.frame_bitstream_offset.Address(), frame_scratch.data() + encoded_header.size(), current_context.stream_len);
    return frame_scratch;
 }

@@ -229,23 +206,37 @@ void H264BitWriter::WriteBit(bool state) {
    WriteBits(state ? 1 : 0, 1);
 }

-void H264BitWriter::WriteScalingList(Common::ScratchBuffer<u8>& scan, std::span<const u8> list,
-                                     s32 start, s32 count) {
-    scan.resize_destructive(count);
+void H264BitWriter::WriteScalingList(std::span<const u8> list, s32 start, s32 count) {
    if (count == 16) {
-        std::memcpy(scan.data(), zig_zag_scan.data(), scan.size());
+        u8 last_scale = 8;
+        for (s32 index = 0; index < count; index++) {
+            // libavcodec has a zig zag LUT, but we dont need it, just use a magic
+            // constant which is a packing of 4 bits for each component of the table
+            const u8 value = list[start + ((0xfeb7adc963258410 >> (index * 4)) & 0xf)];
+            const s32 delta_scale = s32(value - last_scale);
+            WriteSe(delta_scale);
+            last_scale = value;
+        }
    } else {
-        std::memcpy(scan.data(), zig_zag_direct.data(), scan.size());
-    }
-    u8 last_scale = 8;
-
-    for (s32 index = 0; index < count; index++) {
-        const u8 value = list[start + scan[index]];
-        const s32 delta_scale = static_cast<s32>(value - last_scale);
-
-        WriteSe(delta_scale);
-
-        last_scale = value;
+        // ZigZag LUTs from libavcodec: this is the famous zigzag pattern found in the ffmpeg logo itself!
+        static constexpr std::array<u8, 64> scan{
+            0,  1,  8,  16, 9,  2,  3,  10,
+            17, 24, 32, 25, 18, 11, 4,
+            5,  12, 19, 26, 33, 40, 48,
+            41, 34, 27, 20, 13, 6,  7,
+            14, 21, 28, 35, 42, 49, 56,
+            57, 50, 43, 36, 29, 22, 15,
+            23, 30, 37, 44, 51, 58, 59,
+            52, 45, 38, 31, 39, 46, 53,
+            60, 61, 54, 47, 55, 62, 63,
+        };
+        u8 last_scale = 8;
+        for (s32 index = 0; index < count; index++) {
+            const u8 value = list[start + scan[index]];
+            const s32 delta_scale = s32(value - last_scale);
+            WriteSe(delta_scale);
+            last_scale = value;
+        }
    }
 }

@@ -286,19 +277,15 @@ void H264BitWriter::WriteBits(s32 value, s32 bit_count) {

 void H264BitWriter::WriteExpGolombCodedInt(s32 value) {
    const s32 sign = value <= 0 ? 0 : 1;
-    if (value < 0) {
-        value = -value;
-    }
-    value = (value << 1) - sign;
-    WriteExpGolombCodedUInt(value);
+    if (!sign) value = -value;
+    WriteExpGolombCodedUInt((value << 1) - sign);
 }

 void H264BitWriter::WriteExpGolombCodedUInt(u32 value) {
    const s32 size = 32 - std::countl_zero(value + 1);
    WriteBits(1, size);
-
    value -= (1U << (size - 1)) - 1;
-    WriteBits(static_cast<s32>(value), size - 1);
+    WriteBits(s32(value), size - 1);
 }

 s32 H264BitWriter::GetFreeBufferBits() {
@@ -1,3 +1,6 @@
+// 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

@@ -6,11 +9,10 @@
 #include <span>
 #include <vector>

-#include "common/bit_field.h"
-#include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "common/scratch_buffer.h"
 #include "video_core/host1x/codecs/decoder.h"
+#include "video_core/host1x/codec_types.h"
 #include "video_core/host1x/nvdec_common.h"

 namespace Tegra {
@@ -40,8 +42,7 @@ public:

    /// Based on section 7.3.2.1.1.1 and Table 7-4 in the H.264 specification
    /// Writes the scaling matrices of the sream
-    void WriteScalingList(Common::ScratchBuffer<u8>& scan, std::span<const u8> list, s32 start,
-                          s32 count);
+    void WriteScalingList(std::span<const u8> list, s32 start, s32 count);

    /// Return the bitstream as a vector.
    [[nodiscard]] std::vector<u8>& GetByteArray();
@@ -61,188 +62,9 @@ private:
    std::vector<u8> byte_array;
 };

-struct Offset {
-    constexpr u32 Address() const noexcept {
-        return offset << 8;
-    }
-
-private:
-    u32 offset;
-};
-static_assert(std::is_trivial_v<Offset>, "Offset must be trivial");
-static_assert(sizeof(Offset) == 0x4, "Offset has the wrong size!");
-
-struct H264ParameterSet {
-    s32 log2_max_pic_order_cnt_lsb_minus4; ///< 0x00
-    s32 delta_pic_order_always_zero_flag;  ///< 0x04
-    s32 frame_mbs_only_flag;               ///< 0x08
-    u32 pic_width_in_mbs;                  ///< 0x0C
-    u32 frame_height_in_mbs;               ///< 0x10
-    union {                                ///< 0x14
-        BitField<0, 2, u32> tile_format;
-        BitField<2, 3, u32> gob_height;
-        BitField<5, 27, u32> reserved_surface_format;
-    };
-    u32 entropy_coding_mode_flag;               ///< 0x18
-    s32 pic_order_present_flag;                 ///< 0x1C
-    s32 num_refidx_l0_default_active;           ///< 0x20
-    s32 num_refidx_l1_default_active;           ///< 0x24
-    s32 deblocking_filter_control_present_flag; ///< 0x28
-    s32 redundant_pic_cnt_present_flag;         ///< 0x2C
-    u32 transform_8x8_mode_flag;                ///< 0x30
-    u32 pitch_luma;                             ///< 0x34
-    u32 pitch_chroma;                           ///< 0x38
-    Offset luma_top_offset;                     ///< 0x3C
-    Offset luma_bot_offset;                     ///< 0x40
-    Offset luma_frame_offset;                   ///< 0x44
-    Offset chroma_top_offset;                   ///< 0x48
-    Offset chroma_bot_offset;                   ///< 0x4C
-    Offset chroma_frame_offset;                 ///< 0x50
-    u32 hist_buffer_size;                       ///< 0x54
-    union {                                     ///< 0x58
-        union {
-            BitField<0, 1, u64> mbaff_frame;
-            BitField<1, 1, u64> direct_8x8_inference;
-            BitField<2, 1, u64> weighted_pred;
-            BitField<3, 1, u64> constrained_intra_pred;
-            BitField<4, 1, u64> ref_pic;
-            BitField<5, 1, u64> field_pic;
-            BitField<6, 1, u64> bottom_field;
-            BitField<7, 1, u64> second_field;
-        } flags;
-        BitField<8, 4, u64> log2_max_frame_num_minus4;
-        BitField<12, 2, u64> chroma_format_idc;
-        BitField<14, 2, u64> pic_order_cnt_type;
-        BitField<16, 6, s64> pic_init_qp_minus26;
-        BitField<22, 5, s64> chroma_qp_index_offset;
-        BitField<27, 5, s64> second_chroma_qp_index_offset;
-        BitField<32, 2, u64> weighted_bipred_idc;
-        BitField<34, 7, u64> curr_pic_idx;
-        BitField<41, 5, u64> curr_col_idx;
-        BitField<46, 16, u64> frame_number;
-        BitField<62, 1, u64> frame_surfaces;
-        BitField<63, 1, u64> output_memory_layout;
-    };
-};
-static_assert(sizeof(H264ParameterSet) == 0x60, "H264ParameterSet is an invalid size");
-
-#define ASSERT_POSITION(field_name, position)                                                      \
-    static_assert(offsetof(H264ParameterSet, field_name) == position,                              \
-                  "Field " #field_name " has invalid position")
-
-ASSERT_POSITION(log2_max_pic_order_cnt_lsb_minus4, 0x00);
-ASSERT_POSITION(delta_pic_order_always_zero_flag, 0x04);
-ASSERT_POSITION(frame_mbs_only_flag, 0x08);
-ASSERT_POSITION(pic_width_in_mbs, 0x0C);
-ASSERT_POSITION(frame_height_in_mbs, 0x10);
-ASSERT_POSITION(tile_format, 0x14);
-ASSERT_POSITION(entropy_coding_mode_flag, 0x18);
-ASSERT_POSITION(pic_order_present_flag, 0x1C);
-ASSERT_POSITION(num_refidx_l0_default_active, 0x20);
-ASSERT_POSITION(num_refidx_l1_default_active, 0x24);
-ASSERT_POSITION(deblocking_filter_control_present_flag, 0x28);
-ASSERT_POSITION(redundant_pic_cnt_present_flag, 0x2C);
-ASSERT_POSITION(transform_8x8_mode_flag, 0x30);
-ASSERT_POSITION(pitch_luma, 0x34);
-ASSERT_POSITION(pitch_chroma, 0x38);
-ASSERT_POSITION(luma_top_offset, 0x3C);
-ASSERT_POSITION(luma_bot_offset, 0x40);
-ASSERT_POSITION(luma_frame_offset, 0x44);
-ASSERT_POSITION(chroma_top_offset, 0x48);
-ASSERT_POSITION(chroma_bot_offset, 0x4C);
-ASSERT_POSITION(chroma_frame_offset, 0x50);
-ASSERT_POSITION(hist_buffer_size, 0x54);
-ASSERT_POSITION(flags, 0x58);
-#undef ASSERT_POSITION
-
-struct DpbEntry {
-    union {
-        BitField<0, 7, u32> index;
-        BitField<7, 5, u32> col_idx;
-        BitField<12, 2, u32> state;
-        BitField<14, 1, u32> is_long_term;
-        BitField<15, 1, u32> non_existing;
-        BitField<16, 1, u32> is_field;
-        BitField<17, 4, u32> top_field_marking;
-        BitField<21, 4, u32> bottom_field_marking;
-        BitField<25, 1, u32> output_memory_layout;
-        BitField<26, 6, u32> reserved;
-    } flags;
-    std::array<u32, 2> field_order_cnt;
-    u32 frame_idx;
-};
-static_assert(sizeof(DpbEntry) == 0x10, "DpbEntry has the wrong size!");
-
-struct DisplayParam {
-    union {
-        BitField<0, 1, u32> enable_tf_output;
-        BitField<1, 1, u32> vc1_map_y_flag;
-        BitField<2, 3, u32> map_y_value;
-        BitField<5, 1, u32> vc1_map_uv_flag;
-        BitField<6, 3, u32> map_uv_value;
-        BitField<9, 8, u32> out_stride;
-        BitField<17, 3, u32> tiling_format;
-        BitField<20, 1, u32> output_structure; // 0=frame, 1=field
-        BitField<21, 11, u32> reserved0;
-    };
-    std::array<s32, 2> output_top;
-    std::array<s32, 2> output_bottom;
-    union {
-        BitField<0, 1, u32> enable_histogram;
-        BitField<1, 12, u32> histogram_start_x;
-        BitField<13, 12, u32> histogram_start_y;
-        BitField<25, 7, u32> reserved1;
-    };
-    union {
-        BitField<0, 12, u32> histogram_end_x;
-        BitField<12, 12, u32> histogram_end_y;
-        BitField<24, 8, u32> reserved2;
-    };
-};
-static_assert(sizeof(DisplayParam) == 0x1C, "DisplayParam has the wrong size!");
-
-struct H264DecoderContext {
-    INSERT_PADDING_WORDS_NOINIT(13);                        ///< 0x0000
-    std::array<u8, 16> eos;                                 ///< 0x0034
-    u8 explicit_eos_present_flag;                           ///< 0x0044
-    u8 hint_dump_en;                                        ///< 0x0045
-    INSERT_PADDING_BYTES_NOINIT(2);                         ///< 0x0046
-    u32 stream_len;                                         ///< 0x0048
-    u32 slice_count;                                        ///< 0x004C
-    u32 mbhist_buffer_size;                                 ///< 0x0050
-    u32 gptimer_timeout_value;                              ///< 0x0054
-    H264ParameterSet h264_parameter_set;                    ///< 0x0058
-    std::array<s32, 2> curr_field_order_cnt;                ///< 0x00B8
-    std::array<DpbEntry, 16> dpb;                           ///< 0x00C0
-    std::array<u8, 0x60> weight_scale_4x4;                  ///< 0x01C0
-    std::array<u8, 0x80> weight_scale_8x8;                  ///< 0x0220
-    std::array<u8, 2> num_inter_view_refs_lX;               ///< 0x02A0
-    std::array<u8, 14> reserved2;                           ///< 0x02A2
-    std::array<std::array<s8, 16>, 2> inter_view_refidx_lX; ///< 0x02B0
-    union {                                                 ///< 0x02D0
-        BitField<0, 1, u32> lossless_ipred8x8_filter_enable;
-        BitField<1, 1, u32> qpprime_y_zero_transform_bypass_flag;
-        BitField<2, 30, u32> reserved3;
-    };
-    DisplayParam display_param;   ///< 0x02D4
-    std::array<u32, 3> reserved4; ///< 0x02F0
-};
-static_assert(sizeof(H264DecoderContext) == 0x2FC, "H264DecoderContext is an invalid size");
-
-#define ASSERT_POSITION(field_name, position)                                                      \
-    static_assert(offsetof(H264DecoderContext, field_name) == position,                            \
-                  "Field " #field_name " has invalid position")
-
-ASSERT_POSITION(stream_len, 0x48);
-ASSERT_POSITION(h264_parameter_set, 0x58);
-ASSERT_POSITION(dpb, 0xC0);
-ASSERT_POSITION(weight_scale_4x4, 0x1C0);
-#undef ASSERT_POSITION
-
 class H264 final : public Decoder {
 public:
-    explicit H264(Host1x::Host1x& host1x, const Host1x::NvdecCommon::NvdecRegisters& regs, s32 id,
-                  Host1x::FrameQueue& frame_queue);
+    explicit H264(Host1x::Host1x& host1x, const Host1x::NvdecCommon::NvdecRegisters& regs, s32 id);
    ~H264() override;

    H264(const H264&) = delete;
@@ -263,10 +85,10 @@ public:
    }

 private:
-    bool is_first_frame{true};
-    Common::ScratchBuffer<u8> frame_scratch;
-    Common::ScratchBuffer<u8> scan_scratch;
    H264DecoderContext current_context{};
+    std::array<u8, 64> scan_scratch;
+    Common::ScratchBuffer<u8> frame_scratch;
+    bool is_first_frame{true};
 };

 } // namespace Decoders
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2021 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@@ -8,11 +11,10 @@
 #include "video_core/memory_manager.h"

 namespace Tegra::Decoders {
-VP8::VP8(Host1x::Host1x& host1x_, const Host1x::NvdecCommon::NvdecRegisters& regs_, s32 id_,
-         Host1x::FrameQueue& frame_queue_)
-    : Decoder{host1x_, id_, regs_, frame_queue_} {
-    codec = Host1x::NvdecCommon::VideoCodec::VP8;
-    initialized = decode_api.Initialize(codec);
+VP8::VP8(Host1x::Host1x& host1x_, const Host1x::NvdecCommon::NvdecRegisters& regs_, s32 id_)
+    : Decoder{host1x_, id_, regs_}
+{
+    initialized = decode_api.Initialize(Host1x::NvdecCommon::VideoCodec::VP8);
 }

 VP8::~VP8() = default;
@@ -25,35 +27,30 @@ std::tuple<u64, u64> VP8::GetProgressiveOffsets() {

 std::tuple<u64, u64, u64, u64> VP8::GetInterlacedOffsets() {
    auto luma_top{regs.surface_luma_offsets[static_cast<u32>(Vp8SurfaceIndex::Current)].Address()};
-    auto luma_bottom{
-        regs.surface_luma_offsets[static_cast<u32>(Vp8SurfaceIndex::Current)].Address()};
-    auto chroma_top{
-        regs.surface_chroma_offsets[static_cast<u32>(Vp8SurfaceIndex::Current)].Address()};
-    auto chroma_bottom{
-        regs.surface_chroma_offsets[static_cast<u32>(Vp8SurfaceIndex::Current)].Address()};
+    auto luma_bottom = regs.surface_luma_offsets[u32(Vp8SurfaceIndex::Current)].Address();
+    auto chroma_top = regs.surface_chroma_offsets[u32(Vp8SurfaceIndex::Current)].Address();
+    auto chroma_bottom = regs.surface_chroma_offsets[u32(Vp8SurfaceIndex::Current)].Address();
    return {luma_top, luma_bottom, chroma_top, chroma_bottom};
 }

 std::span<const u8> VP8::ComposeFrame() {
-    memory_manager.ReadBlock(regs.picture_info_offset.Address(), &current_context,
-                             sizeof(VP8PictureInfo));
+    host1x.gmmu_manager.ReadBlock(regs.picture_info_offset.Address(), &current_context, sizeof(VP8PictureInfo));

    const bool is_key_frame = current_context.key_frame == 1u;
-    const auto bitstream_size = static_cast<size_t>(current_context.vld_buffer_size);
+    const auto bitstream_size = size_t(current_context.vld_buffer_size);
    const size_t header_size = is_key_frame ? 10u : 3u;
    frame_scratch.resize(header_size + bitstream_size);

    // Based on page 30 of the VP8 specification.
    // https://datatracker.ietf.org/doc/rfc6386/
    frame_scratch[0] = is_key_frame ? 0u : 1u; // 1-bit frame type (0: keyframe, 1: interframes).
-    frame_scratch[0] |=
-        static_cast<u8>((current_context.version & 7u) << 1u); // 3-bit version number
-    frame_scratch[0] |= static_cast<u8>(1u << 4u);             // 1-bit show_frame flag
+    frame_scratch[0] |= u8((current_context.version & 7u) << 1u); // 3-bit version number
+    frame_scratch[0] |= u8(1u << 4u);             // 1-bit show_frame flag

    // The next 19-bits are the first partition size
-    frame_scratch[0] |= static_cast<u8>((current_context.first_part_size & 7u) << 5u);
-    frame_scratch[1] = static_cast<u8>((current_context.first_part_size & 0x7f8u) >> 3u);
-    frame_scratch[2] = static_cast<u8>((current_context.first_part_size & 0x7f800u) >> 11u);
+    frame_scratch[0] |= u8((current_context.first_part_size & 7u) << 5u);
+    frame_scratch[1] = u8((current_context.first_part_size & 0x7f8u) >> 3u);
+    frame_scratch[2] = u8((current_context.first_part_size & 0x7f800u) >> 11u);

    if (is_key_frame) {
        frame_scratch[3] = 0x9du;
@@ -61,15 +58,15 @@ std::span<const u8> VP8::ComposeFrame() {
        frame_scratch[5] = 0x2au;
        // TODO(ameerj): Horizontal/Vertical Scale
        // 16 bits: (2 bits Horizontal Scale << 14) | Width (14 bits)
-        frame_scratch[6] = static_cast<u8>(current_context.frame_width & 0xff);
-        frame_scratch[7] = static_cast<u8>(((current_context.frame_width >> 8) & 0x3f));
+        frame_scratch[6] = u8(current_context.frame_width & 0xff);
+        frame_scratch[7] = u8(((current_context.frame_width >> 8) & 0x3f));
        // 16 bits:(2 bits Vertical Scale << 14) | Height (14 bits)
-        frame_scratch[8] = static_cast<u8>(current_context.frame_height & 0xff);
-        frame_scratch[9] = static_cast<u8>(((current_context.frame_height >> 8) & 0x3f));
+        frame_scratch[8] = u8(current_context.frame_height & 0xff);
+        frame_scratch[9] = u8(((current_context.frame_height >> 8) & 0x3f));
    }
-    const u64 bitstream_offset = regs.frame_bitstream_offset.Address();
-    memory_manager.ReadBlock(bitstream_offset, frame_scratch.data() + header_size, bitstream_size);

+    const u64 bitstream_offset = regs.frame_bitstream_offset.Address();
+    host1x.gmmu_manager.ReadBlock(bitstream_offset, frame_scratch.data() + header_size, bitstream_size);
    return frame_scratch;
 }

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

@@ -11,6 +14,7 @@
 #include "common/scratch_buffer.h"
 #include "video_core/host1x/codecs/decoder.h"
 #include "video_core/host1x/nvdec_common.h"
+#include "video_core/host1x/codec_types.h"

 namespace Tegra {

@@ -28,8 +32,7 @@ enum class Vp8SurfaceIndex : u32 {

 class VP8 final : public Decoder {
 public:
-    explicit VP8(Host1x::Host1x& host1x, const Host1x::NvdecCommon::NvdecRegisters& regs, s32 id,
-                 Host1x::FrameQueue& frame_queue);
+    explicit VP8(Host1x::Host1x& host1x, const Host1x::NvdecCommon::NvdecRegisters& regs, s32 id);
    ~VP8() override;

    VP8(const VP8&) = delete;
@@ -52,51 +55,8 @@ public:
    }

 private:
-    Common::ScratchBuffer<u8> frame_scratch;
-
-    struct VP8PictureInfo {
-        INSERT_PADDING_WORDS_NOINIT(14);
-        u16 frame_width;  // actual frame width
-        u16 frame_height; // actual frame height
-        u8 key_frame;
-        u8 version;
-        union {
-            u8 raw;
-            BitField<0, 2, u8> tile_format;
-            BitField<2, 3, u8> gob_height;
-            BitField<5, 3, u8> reserved_surface_format;
-        };
-        u8 error_conceal_on;  // 1: error conceal on; 0: off
-        u32 first_part_size;  // the size of first partition(frame header and mb header partition)
-        u32 hist_buffer_size; // in units of 256
-        u32 vld_buffer_size;  // in units of 1
-        // Current frame buffers
-        std::array<u32, 2> frame_stride; // [y_c]
-        u32 luma_top_offset;             // offset of luma top field in units of 256
-        u32 luma_bot_offset;             // offset of luma bottom field in units of 256
-        u32 luma_frame_offset;           // offset of luma frame in units of 256
-        u32 chroma_top_offset;           // offset of chroma top field in units of 256
-        u32 chroma_bot_offset;           // offset of chroma bottom field in units of 256
-        u32 chroma_frame_offset;         // offset of chroma frame in units of 256
-
-        INSERT_PADDING_BYTES_NOINIT(0x1c); // NvdecDisplayParams
-
-        // Decode picture buffer related
-        s8 current_output_memory_layout;
-        // output NV12/NV24 setting. index 0: golden; 1: altref; 2: last
-        std::array<s8, 3> output_memory_layout;
-
-        u8 segmentation_feature_data_update;
-        INSERT_PADDING_BYTES_NOINIT(3);
-
-        // ucode return result
-        u32 result_value;
-        std::array<u32, 8> partition_offset;
-        INSERT_PADDING_WORDS_NOINIT(3);
-    };
-    static_assert(sizeof(VP8PictureInfo) == 0xc0, "PictureInfo is an invalid size");
-
    VP8PictureInfo current_context{};
+    Common::ScratchBuffer<u8> frame_scratch;
 };

 } // namespace Decoders
@@ -1,10 +1,11 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

 #include <algorithm> // for std::copy
+#include <bit>
 #include <numeric>

 #include "common/alignment.h"
@@ -15,11 +16,11 @@

 namespace Tegra::Decoders {
 namespace {
-constexpr u32 diff_update_probability = 252;
-constexpr u32 frame_sync_code = 0x498342;
+static constexpr u32 diff_update_probability = 252;
+static constexpr u32 frame_sync_code = 0x498342;

 // Default compressed header probabilities once frame context resets
-constexpr Vp9EntropyProbs default_probs{
+static constexpr Vp9EntropyProbs default_probs{
    .y_mode_prob{
        65,  32, 18, 144, 162, 194, 41, 51, 98, 132, 68,  18, 165, 217, 196, 45, 40, 78,
        173, 80, 19, 176, 240, 193, 64, 35, 46, 221, 135, 38, 194, 248, 121, 96, 85, 29,
@@ -158,34 +159,6 @@ constexpr Vp9EntropyProbs default_probs{
    .high_precision{128, 128},
 };

-constexpr std::array<u8, 256> norm_lut{
-    0, 7, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-};
-
-constexpr std::array<u8, 254> map_lut{
-    20,  21,  22,  23,  24,  25,  0,   26,  27,  28,  29,  30,  31,  32,  33,  34,  35,  36,  37,
-    1,   38,  39,  40,  41,  42,  43,  44,  45,  46,  47,  48,  49,  2,   50,  51,  52,  53,  54,
-    55,  56,  57,  58,  59,  60,  61,  3,   62,  63,  64,  65,  66,  67,  68,  69,  70,  71,  72,
-    73,  4,   74,  75,  76,  77,  78,  79,  80,  81,  82,  83,  84,  85,  5,   86,  87,  88,  89,
-    90,  91,  92,  93,  94,  95,  96,  97,  6,   98,  99,  100, 101, 102, 103, 104, 105, 106, 107,
-    108, 109, 7,   110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 8,   122, 123, 124,
-    125, 126, 127, 128, 129, 130, 131, 132, 133, 9,   134, 135, 136, 137, 138, 139, 140, 141, 142,
-    143, 144, 145, 10,  146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 11,  158, 159,
-    160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 12,  170, 171, 172, 173, 174, 175, 176, 177,
-    178, 179, 180, 181, 13,  182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 14,  194,
-    195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 15,  206, 207, 208, 209, 210, 211, 212,
-    213, 214, 215, 216, 217, 16,  218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 17,
-    230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 18,  242, 243, 244, 245, 246, 247,
-    248, 249, 250, 251, 252, 253, 19,
-};
-
 // 6.2.14 Tile size calculation

 [[nodiscard]] s32 CalcMinLog2TileCols(s32 frame_width) {
@@ -227,25 +200,17 @@ constexpr std::array<u8, 254> map_lut{
 [[nodiscard]] s32 RemapProbability(s32 new_prob, s32 old_prob) {
    new_prob--;
    old_prob--;
-
-    std::size_t index{};
-
-    if (old_prob * 2 <= 0xff) {
-        index = static_cast<std::size_t>((std::max)(0, RecenterNonNeg(new_prob, old_prob) - 1));
-    } else {
-        index = static_cast<std::size_t>(
-            (std::max)(0, RecenterNonNeg(0xff - 1 - new_prob, 0xff - 1 - old_prob) - 1));
-    }
-
-    return static_cast<s32>(map_lut[index]);
+    u8 i = old_prob * 2 <= 0xff
+        ? u8((std::max)(0, RecenterNonNeg(new_prob, old_prob) - 1))
+        : u8((std::max)(0, RecenterNonNeg(0xff - 1 - new_prob, 0xff - 1 - old_prob) - 1));
+    return s32((i + 7) % 13 == 0 ? (i + 7) / 13 - 1 : i + 20 - (i + 7) / 13);
 }
 } // Anonymous namespace

-VP9::VP9(Host1x::Host1x& host1x_, const Host1x::NvdecCommon::NvdecRegisters& regs_, s32 id_,
-         Host1x::FrameQueue& frame_queue_)
-    : Decoder{host1x_, id_, regs_, frame_queue_} {
-    codec = Host1x::NvdecCommon::VideoCodec::VP9;
-    initialized = decode_api.Initialize(codec);
+VP9::VP9(Host1x::Host1x& host1x_, const Host1x::NvdecCommon::NvdecRegisters& regs_, s32 id_)
+    : Decoder{host1x_, id_, regs_}
+{
+    initialized = decode_api.Initialize(Host1x::NvdecCommon::VideoCodec::VP9);
 }

 VP9::~VP9() = default;
@@ -377,8 +342,7 @@ void VP9::WriteSegmentation(VpxBitStreamWriter& writer) {

    if (update_map) {
        EntropyProbs entropy_probs{};
-        memory_manager.ReadBlock(regs.vp9_prob_tab_buffer_offset.Address(), &entropy_probs,
-                                 sizeof(entropy_probs));
+        host1x.gmmu_manager.ReadBlock(regs.vp9_prob_tab_buffer_offset.Address(), &entropy_probs, sizeof(entropy_probs));

        auto WriteProb = [&](u8 prob) {
            bool coded = prob != 255;
@@ -442,8 +406,7 @@ void VP9::WriteSegmentation(VpxBitStreamWriter& writer) {
 }

 Vp9PictureInfo VP9::GetVp9PictureInfo() {
-    memory_manager.ReadBlock(regs.picture_info_offset.Address(), &current_picture_info,
-                             sizeof(PictureInfo));
+    host1x.gmmu_manager.ReadBlock(regs.picture_info_offset.Address(), &current_picture_info, sizeof(PictureInfo));
    Vp9PictureInfo vp9_info = current_picture_info.Convert();

    InsertEntropy(regs.vp9_prob_tab_buffer_offset.Address(), vp9_info.entropy);
@@ -459,7 +422,7 @@ Vp9PictureInfo VP9::GetVp9PictureInfo() {

 void VP9::InsertEntropy(u64 offset, Vp9EntropyProbs& dst) {
    EntropyProbs entropy;
-    memory_manager.ReadBlock(offset, &entropy, sizeof(EntropyProbs));
+    host1x.gmmu_manager.ReadBlock(offset, &entropy, sizeof(EntropyProbs));
    entropy.Convert(dst);
 }

@@ -469,9 +432,7 @@ Vp9FrameContainer VP9::GetCurrentFrame() {
        // gpu.SyncGuestHost(); epic, why?
        current_frame.info = GetVp9PictureInfo();
        current_frame.bit_stream.resize(current_frame.info.bitstream_size);
-        memory_manager.ReadBlock(regs.frame_bitstream_offset.Address(),
-                                 current_frame.bit_stream.data(),
-                                 current_frame.info.bitstream_size);
+        host1x.gmmu_manager.ReadBlock(regs.frame_bitstream_offset.Address(), current_frame.bit_stream.data(), current_frame.info.bitstream_size);
    }
    if (!next_frame.bit_stream.empty()) {
        Vp9FrameContainer temp{
@@ -893,13 +854,9 @@ std::span<const u8> VP9::ComposeFrame() {
    // Write headers and frame to buffer
    frame_scratch.resize(uncompressed_header.size() + compressed_header.size() + bitstream.size());
    std::copy(uncompressed_header.begin(), uncompressed_header.end(), frame_scratch.begin());
-    std::copy(compressed_header.begin(), compressed_header.end(),
-              frame_scratch.begin() + uncompressed_header.size());
-    std::copy(bitstream.begin(), bitstream.end(),
-              frame_scratch.begin() + uncompressed_header.size() + compressed_header.size());
-
+    std::copy(compressed_header.begin(), compressed_header.end(), frame_scratch.begin() + uncompressed_header.size());
+    std::copy(bitstream.begin(), bitstream.end(), frame_scratch.begin() + uncompressed_header.size() + compressed_header.size());
    vp9_hidden_frame = WasFrameHidden();
-
    return GetFrameBytes();
 }

@@ -929,7 +886,7 @@ void VpxRangeEncoder::Write(bool bit, s32 probability) {
        local_range = range - split;
    }

-    s32 shift = static_cast<s32>(norm_lut[local_range]);
+    s32 shift = s32(local_range == 0 ? 0 : (std::countl_zero<uint32_t>(local_range) - 24));
    local_range <<= shift;
    count += shift;

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

@@ -11,7 +14,7 @@
 #include "common/scratch_buffer.h"
 #include "common/stream.h"
 #include "video_core/host1x/codecs/decoder.h"
-#include "video_core/host1x/codecs/vp9_types.h"
+#include "video_core/host1x/codec_types.h"
 #include "video_core/host1x/nvdec_common.h"

 namespace Tegra {
@@ -113,8 +116,7 @@ private:

 class VP9 final : public Decoder {
 public:
-    explicit VP9(Host1x::Host1x& host1x, const Host1x::NvdecCommon::NvdecRegisters& regs, s32 id,
-                 Host1x::FrameQueue& frame_queue);
+    explicit VP9(Host1x::Host1x& host1x, const Host1x::NvdecCommon::NvdecRegisters& regs, s32 id);
    ~VP9() override;

    VP9(const VP9&) = delete;
@@ -193,11 +195,10 @@ private:
    [[nodiscard]] std::vector<u8> ComposeCompressedHeader();
    [[nodiscard]] VpxBitStreamWriter ComposeUncompressedHeader();

-    Common::ScratchBuffer<u8> frame_scratch;
-
    std::array<s8, 4> loop_filter_ref_deltas{};
    std::array<s8, 2> loop_filter_mode_deltas{};

+    Common::ScratchBuffer<u8> frame_scratch;
    Vp9FrameContainer next_frame{};
    std::array<Vp9EntropyProbs, 4> frame_ctxs{};
    bool swap_ref_indices{};
@@ -9,7 +9,7 @@
 #include "common/scope_exit.h"
 #include "common/settings.h"
 #include "core/memory.h"
-#include "video_core/host1x/ffmpeg/ffmpeg.h"
+#include "video_core/host1x/ffmpeg.h"
 #include "video_core/memory_manager.h"

 extern "C" {
@@ -34,7 +34,9 @@ constexpr std::array PreferredGpuDecoders = {
    AV_HWDEVICE_TYPE_DXVA2,
    AV_HWDEVICE_TYPE_D3D12VA,
 #elif defined(__FreeBSD__)
+    AV_HWDEVICE_TYPE_VAAPI,
    AV_HWDEVICE_TYPE_VDPAU,
+    AV_HWDEVICE_TYPE_DRM,
 #elif defined(__APPLE__)
    AV_HWDEVICE_TYPE_VIDEOTOOLBOX,
 #elif defined(ANDROID)
@@ -105,18 +107,17 @@ Frame::~Frame() {
 Decoder::Decoder(Tegra::Host1x::NvdecCommon::VideoCodec codec) {
    const AVCodecID av_codec = [&] {
        switch (codec) {
-            case Tegra::Host1x::NvdecCommon::VideoCodec::H264:
-                return AV_CODEC_ID_H264;
-            case Tegra::Host1x::NvdecCommon::VideoCodec::VP8:
-                return AV_CODEC_ID_VP8;
-            case Tegra::Host1x::NvdecCommon::VideoCodec::VP9:
-                return AV_CODEC_ID_VP9;
-            default:
-                UNIMPLEMENTED_MSG("Unknown codec {}", codec);
-                return AV_CODEC_ID_NONE;
+        case Tegra::Host1x::NvdecCommon::VideoCodec::H264:
+            return AV_CODEC_ID_H264;
+        case Tegra::Host1x::NvdecCommon::VideoCodec::VP8:
+            return AV_CODEC_ID_VP8;
+        case Tegra::Host1x::NvdecCommon::VideoCodec::VP9:
+            return AV_CODEC_ID_VP9;
+        default:
+            UNIMPLEMENTED_MSG("Unknown codec {}", codec);
+            return AV_CODEC_ID_NONE;
        }
    }();
-
    m_codec = avcodec_find_decoder(av_codec);
 }

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

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

 // SPDX-FileCopyrightText: 2021 yuzu Emulator Project
@@ -12,9 +12,12 @@
 namespace Tegra::Host1x {

 Host1x::Host1x(Core::System& system_)
-    : system{system_}, syncpoint_manager{},
-      memory_manager(system.DeviceMemory()), gmmu_manager{system, memory_manager, 32, 0, 12},
-      allocator{std::make_unique<Common::FlatAllocator<u32, 0, 32>>(1 << 12)} {}
+    : system{system_}
+    , syncpoint_manager{}
+    , memory_manager(system.DeviceMemory())
+    , gmmu_manager{system, memory_manager, 32, 0, 12}
+    , allocator{1 << 12}
+{}

 Host1x::~Host1x() = default;

@@ -24,13 +27,13 @@ void Host1x::StartDevice(s32 fd, ChannelType type, u32 syncpt) {
 #ifdef YUZU_LEGACY
        std::call_once(nvdec_first_init, []() {std::this_thread::sleep_for(std::chrono::milliseconds{500});}); // HACK: For Astroneer
 #endif
-        devices[fd] = std::make_unique<Tegra::Host1x::Nvdec>(*this, fd, syncpt, frame_queue);
+        devices[fd] = std::make_unique<Tegra::Host1x::Nvdec>(*this, fd, syncpt);
        break;
    case ChannelType::VIC:
 #ifdef YUZU_LEGACY
        std::call_once(vic_first_init, []() {std::this_thread::sleep_for(std::chrono::milliseconds{500});}); // HACK: For Astroneer
 #endif
-        devices[fd] = std::make_unique<Tegra::Host1x::Vic>(*this, fd, syncpt, frame_queue);
+        devices[fd] = std::make_unique<Tegra::Host1x::Vic>(*this, fd, syncpt);
        break;
    default:
        LOG_ERROR(HW_GPU, "Unimplemented host1x device {}", static_cast<u32>(type));
@@ -184,20 +184,12 @@ public:
        return memory_manager;
    }

-    Tegra::MemoryManager& GMMU() {
-        return gmmu_manager;
-    }
-
-    const Tegra::MemoryManager& GMMU() const {
-        return gmmu_manager;
-    }
-
    Common::FlatAllocator<u32, 0, 32>& Allocator() {
-        return *allocator;
+        return allocator;
    }

    const Common::FlatAllocator<u32, 0, 32>& Allocator() const {
-        return *allocator;
+        return allocator;
    }

    void StartDevice(s32 fd, ChannelType type, u32 syncpt);
@@ -211,12 +203,11 @@ public:
        it->second->PushEntries(std::move(entries));
    }

-private:
    Core::System& system;
    SyncpointManager syncpoint_manager;
    Tegra::MaxwellDeviceMemoryManager memory_manager;
    Tegra::MemoryManager gmmu_manager;
-    std::unique_ptr<Common::FlatAllocator<u32, 0, 32>> allocator;
+    Common::FlatAllocator<u32, 0, 32> allocator;
    FrameQueue frame_queue;
    ankerl::unordered_dense::map<s32, std::unique_ptr<CDmaPusher>> devices;
 #ifdef YUZU_LEGACY
@@ -1,9 +1,10 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

+#include <variant>
 #include "common/assert.h"

 #include "common/polyfill_thread.h"
@@ -19,10 +20,13 @@ namespace Tegra::Host1x {
 #define NVDEC_REG_INDEX(field_name)                                                                \
    (offsetof(NvdecCommon::NvdecRegisters, field_name) / sizeof(u64))

-Nvdec::Nvdec(Host1x& host1x_, s32 id_, u32 syncpt, FrameQueue& frame_queue_)
-    : CDmaPusher{host1x_, id_}, id{id_}, syncpoint{syncpt}, frame_queue{frame_queue_} {
+Nvdec::Nvdec(Host1x& host1x_, s32 id_, u32 syncpt)
+    : CDmaPusher{host1x_, id_}
+    , id{id_}
+    , syncpoint{syncpt}
+{
    LOG_INFO(HW_GPU, "Created nvdec {}", id);
-    frame_queue.Open(id);
+    host1x.frame_queue.Open(id);
 }

 Nvdec::~Nvdec() {
@@ -43,24 +47,22 @@ void Nvdec::ProcessMethod(u32 method, u32 argument) {
 }

 void Nvdec::CreateDecoder(NvdecCommon::VideoCodec codec) {
-    if (decoder.get()) {
-        return;
+    if (std::holds_alternative<std::monostate>(decoder)) {
+        switch (codec) {
+        case NvdecCommon::VideoCodec::H264:
+            decoder.emplace<Decoders::H264>(host1x, regs, id);
+            break;
+        case NvdecCommon::VideoCodec::VP8:
+            decoder.emplace<Decoders::VP8>(host1x, regs, id);
+            break;
+        case NvdecCommon::VideoCodec::VP9:
+            decoder.emplace<Decoders::VP9>(host1x, regs, id);
+            break;
+        default:
+            break;
+        }
+        LOG_INFO(HW_GPU, "Created decoder {} for id {}", codec, id);
    }
-    switch (codec) {
-    case NvdecCommon::VideoCodec::H264:
-        decoder = std::make_unique<Decoders::H264>(host1x, regs, id, frame_queue);
-        break;
-    case NvdecCommon::VideoCodec::VP8:
-        decoder = std::make_unique<Decoders::VP8>(host1x, regs, id, frame_queue);
-        break;
-    case NvdecCommon::VideoCodec::VP9:
-        decoder = std::make_unique<Decoders::VP9>(host1x, regs, id, frame_queue);
-        break;
-    default:
-        UNIMPLEMENTED_MSG("Codec {}", decoder->GetCurrentCodecName());
-        break;
-    }
-    LOG_INFO(HW_GPU, "Created decoder {} for id {}", decoder->GetCurrentCodecName(), id);
 }

 void Nvdec::Execute() {
@@ -70,15 +72,14 @@ void Nvdec::Execute() {
        std::this_thread::sleep_for(std::chrono::milliseconds(8));
        return;
    }
-    switch (decoder->GetCurrentCodec()) {
-    case NvdecCommon::VideoCodec::H264:
-    case NvdecCommon::VideoCodec::VP8:
-    case NvdecCommon::VideoCodec::VP9:
-        decoder->Decode();
-        break;
-    default:
-        UNIMPLEMENTED_MSG("Codec {}", decoder->GetCurrentCodecName());
-        break;
+    if (auto* h264 = std::get_if<Decoders::H264>(&decoder)) {
+        h264->Decode();
+    } else if (auto* vp8 = std::get_if<Decoders::VP8>(&decoder)) {
+        vp8->Decode();
+    } else if (auto* vp9 = std::get_if<Decoders::VP9>(&decoder)) {
+        vp9->Decode();
+    } else {
+        LOG_ERROR(HW_GPU, "Unrecognized codec executed?");
    }
 }

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

 // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
@@ -8,10 +8,14 @@

 #include <memory>
 #include <vector>
+#include <variant>

 #include "common/common_types.h"
 #include "video_core/cdma_pusher.h"
 #include "video_core/host1x/codecs/decoder.h"
+#include "video_core/host1x/codecs/h264.h"
+#include "video_core/host1x/codecs/vp8.h"
+#include "video_core/host1x/codecs/vp9.h"

 namespace Tegra {

@@ -21,7 +25,7 @@ class FrameQueue;

 class Nvdec final : public CDmaPusher {
 public:
-    explicit Nvdec(Host1x& host1x, s32 id, u32 syncpt, FrameQueue& frame_queue_);
+    explicit Nvdec(Host1x& host1x, s32 id, u32 syncpt);
    ~Nvdec();

    /// Writes the method into the state, Invoke Execute() if encountered
@@ -38,12 +42,15 @@ private:
    /// Invoke codec to decode a frame
    void Execute();

+    NvdecCommon::NvdecRegisters regs{};
+    std::variant<
+        Decoders::H264,
+        Decoders::VP8,
+        Decoders::VP9,
+        std::monostate
+    > decoder = std::monostate{};
    s32 id;
    u32 syncpoint;
-    FrameQueue& frame_queue;
-
-    NvdecCommon::NvdecRegisters regs{};
-    std::unique_ptr<Decoder> decoder;
 };

 } // namespace Host1x
@@ -85,18 +85,17 @@ void SwizzleSurface(std::span<u8> output, u32 out_stride, std::span<const u8> in

 } // namespace

-Vic::Vic(Host1x& host1x_, s32 id_, u32 syncpt, FrameQueue& frame_queue_) noexcept :
-    CDmaPusher{host1x_, id_}
+Vic::Vic(Host1x& host1x_, s32 id_, u32 syncpt) noexcept
+    : CDmaPusher{host1x_, id_}
    , id{id_}
    , syncpoint{syncpt}
-    , frame_queue{frame_queue_}
 {
    LOG_INFO(HW_GPU, "Created vic {}", id);
 }

 Vic::~Vic() noexcept {
    LOG_INFO(HW_GPU, "Destroying vic {}", id);
-    frame_queue.Close(id);
+    host1x.frame_queue.Close(id);
 }

 void Vic::ProcessMethod(u32 method, u32 arg) noexcept {
@@ -113,7 +112,7 @@ void Vic::ProcessMethod(u32 method, u32 arg) noexcept {

 void Vic::Execute() noexcept {
    ConfigStruct config{};
-    memory_manager.ReadBlock(regs.config_struct_offset.Address(), &config, sizeof(ConfigStruct));
+    host1x.gmmu_manager.ReadBlock(regs.config_struct_offset.Address(), &config, sizeof(ConfigStruct));

    auto output_width = config.output_surface_config.out_surface_width + 1;
    auto output_height = config.output_surface_config.out_surface_height + 1;
@@ -124,8 +123,8 @@ void Vic::Execute() noexcept {
            if (auto& slot_config = config.slot_structs[i]; slot_config.config.slot_enable) {
                auto const luma_offset = regs.surfaces[i][SurfaceIndex::Current].luma.Address();
                if (nvdec_id == -1)
-                    nvdec_id = frame_queue.VicFindNvdecFdFromOffset(luma_offset);
-                if (auto frame = frame_queue.GetFrame(nvdec_id, luma_offset); frame.get()) {
+                    nvdec_id = host1x.frame_queue.VicFindNvdecFdFromOffset(luma_offset);
+                if (auto frame = host1x.frame_queue.GetFrame(nvdec_id, luma_offset); frame.get()) {
                    switch (frame->GetPixelFormat()) {
                    case AV_PIX_FMT_YUV420P:
                        ReadY8__V8U8_N420(slot_config, regs.surfaces[i], std::move(frame), true);
@@ -881,8 +880,8 @@ void Vic::WriteY8__V8U8_N420(const OutputSurfaceConfig& output_surface_config) n
        chroma_scratch.resize_destructive(out_chroma_size);
        Decode(luma_scratch.data(), chroma_scratch.data());

-        Tegra::Memory::GpuGuestMemoryScoped<u8, Core::Memory::GuestMemoryFlags::SafeWrite> out_luma(memory_manager, regs.output_surface.luma.Address(), out_luma_swizzle_size, &swizzle_scratch);
-        Tegra::Memory::GpuGuestMemoryScoped<u8, Core::Memory::GuestMemoryFlags::SafeWrite> out_chroma(memory_manager, regs.output_surface.chroma_u.Address(), out_chroma_swizzle_size, &swizzle_scratch);
+        Tegra::Memory::GpuGuestMemoryScoped<u8, Core::Memory::GuestMemoryFlags::SafeWrite> out_luma(host1x.gmmu_manager, regs.output_surface.luma.Address(), out_luma_swizzle_size, &swizzle_scratch);
+        Tegra::Memory::GpuGuestMemoryScoped<u8, Core::Memory::GuestMemoryFlags::SafeWrite> out_chroma(host1x.gmmu_manager, regs.output_surface.chroma_u.Address(), out_chroma_swizzle_size, &swizzle_scratch);
        if (block_height == 1) {
            SwizzleSurface(out_luma, out_luma_stride, luma_scratch, out_luma_stride, out_luma_height);
            SwizzleSurface(out_chroma, out_chroma_stride, chroma_scratch, out_chroma_stride, out_chroma_height);
@@ -910,8 +909,8 @@ void Vic::WriteY8__V8U8_N420(const OutputSurfaceConfig& output_surface_config) n
        luma_scratch.resize_destructive(out_luma_size);
        chroma_scratch.resize_destructive(out_chroma_size);
        Decode(luma_scratch.data(), chroma_scratch.data());
-        memory_manager.WriteBlock(regs.output_surface.luma.Address(), luma_scratch.data(), out_luma_size);
-        memory_manager.WriteBlock(regs.output_surface.chroma_u.Address(), chroma_scratch.data(), out_chroma_size);
+        host1x.gmmu_manager.WriteBlock(regs.output_surface.luma.Address(), luma_scratch.data(), out_luma_size);
+        host1x.gmmu_manager.WriteBlock(regs.output_surface.chroma_u.Address(), chroma_scratch.data(), out_chroma_size);
    } break;
    default:
        UNREACHABLE();
@@ -1046,7 +1045,7 @@ void Vic::WriteABGR(const OutputSurfaceConfig& output_surface_config, VideoPixel
        luma_scratch.resize_destructive(out_luma_size);
        Decode(luma_scratch.data(), output_surface.data());

-        Tegra::Memory::GpuGuestMemoryScoped<u8, Core::Memory::GuestMemoryFlags::SafeWrite> out_luma(memory_manager, regs.output_surface.luma.Address(), out_swizzle_size, &swizzle_scratch);
+        Tegra::Memory::GpuGuestMemoryScoped<u8, Core::Memory::GuestMemoryFlags::SafeWrite> out_luma(host1x.gmmu_manager, regs.output_surface.luma.Address(), out_swizzle_size, &swizzle_scratch);
        if (block_height == 1) {
            SwizzleSurface(out_luma, out_luma_stride, luma_scratch, out_luma_stride, out_luma_height);
        } else {
@@ -1061,7 +1060,7 @@ void Vic::WriteABGR(const OutputSurfaceConfig& output_surface_config, VideoPixel
            surface_stride * surface_height * BytesPerPixel, out_luma_width, out_luma_height,
            out_luma_stride, out_luma_size);
        luma_scratch.resize_destructive(out_luma_size);
-        Tegra::Memory::GpuGuestMemoryScoped<u8, Core::Memory::GuestMemoryFlags::SafeWrite> out_luma(memory_manager, regs.output_surface.luma.Address(), out_luma_size, &luma_scratch);
+        Tegra::Memory::GpuGuestMemoryScoped<u8, Core::Memory::GuestMemoryFlags::SafeWrite> out_luma(host1x.gmmu_manager, regs.output_surface.luma.Address(), out_luma_size, &luma_scratch);
        Decode(out_luma.data(), output_surface.data());
    } break;
    default:
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
@@ -15,6 +15,7 @@
 #include "common/common_types.h"
 #include "common/scratch_buffer.h"
 #include "video_core/cdma_pusher.h"
+#include "video_core/host1x/host1x.h"

 namespace Tegra::Host1x {
 class Host1x;
@@ -605,7 +606,7 @@ public:
        SetOutputSurfaceChromaUnusedOffset = offsetof(VicRegisters, output_surface.chroma_v)
    };

-    explicit Vic(Host1x& host1x, s32 id, u32 syncpt, FrameQueue& frame_queue) noexcept;
+    explicit Vic(Host1x& host1x, s32 id, u32 syncpt) noexcept;
    ~Vic() noexcept;

    /// Write to the device state.
@@ -620,18 +621,17 @@ private:
    void WriteY8__V8U8_N420(const OutputSurfaceConfig& output_surface_config) noexcept;
    void WriteABGR(const OutputSurfaceConfig& output_surface_config, VideoPixelFormat format) noexcept;

-    s32 id;
-    s32 nvdec_id{-1};
-    u32 syncpoint;
-
    VicRegisters regs{};
-    FrameQueue& frame_queue;

    Common::ScratchBuffer<u8> swizzle_scratch;
    Common::ScratchBuffer<Pixel> output_surface;
    Common::ScratchBuffer<Pixel> slot_surface;
    Common::ScratchBuffer<u8> luma_scratch;
    Common::ScratchBuffer<u8> chroma_scratch;
+
+    s32 id;
+    s32 nvdec_id{-1};
+    u32 syncpoint;
 };

 } // namespace Tegra::Host1x
@@ -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{};
@@ -369,6 +369,7 @@ PipelineCache::PipelineCache(Tegra::MaxwellDeviceMemoryManager& device_memory_,
      texture_cache{texture_cache_}, shader_notify{shader_notify_},
      use_asynchronous_shaders{Settings::values.use_asynchronous_shaders.GetValue()},
      use_vulkan_pipeline_cache{Settings::values.use_vulkan_driver_pipeline_cache.GetValue()},
+      optimize_spirv_output{Settings::values.optimize_spirv_output.GetValue() != Settings::SpirvOptimizeMode::Never},
      workers(device.HasBrokenParallelShaderCompiling() ? 1ULL : GetTotalPipelineWorkers(),
              "VkPipelineBuilder"),
      serialization_thread(1, "VkPipelineSerialization") {
@@ -668,6 +669,10 @@ void PipelineCache::LoadDiskResources(u64 title_id, std::stop_token stop_loading
    if (state.statistics) {
        state.statistics->Report();
    }
+
+    if (Settings::values.optimize_spirv_output.GetValue() != Settings::SpirvOptimizeMode::Always) {
+        this->optimize_spirv_output = false;
+    }
 }

 GraphicsPipeline* PipelineCache::CurrentGraphicsPipelineSlowPath() {
@@ -772,7 +777,7 @@ std::unique_ptr<GraphicsPipeline> PipelineCache::CreateGraphicsPipeline(

        const auto runtime_info{MakeRuntimeInfo(programs, key, program, previous_stage, device)};
        ConvertLegacyToGeneric(program, runtime_info);
-        const std::vector<u32> code{EmitSPIRV(profile, runtime_info, program, binding)};
+        const std::vector<u32> code{EmitSPIRV(profile, runtime_info, program, binding, this->optimize_spirv_output)};
        device.SaveShader(code);
        modules[stage_index] = BuildShader(device, code);

@@ -890,7 +895,7 @@ std::unique_ptr<ComputePipeline> PipelineCache::CreateComputePipeline(
                    max_shared_memory / 1024);
        program.shared_memory_size = max_shared_memory;
    }
-    const std::vector<u32> code{EmitSPIRV(profile, program)};
+    const std::vector<u32> code{EmitSPIRV(profile, program, this->optimize_spirv_output)};
    device.SaveShader(code);
    vk::ShaderModule spv_module{BuildShader(device, code)};

@@ -153,6 +153,7 @@ private:
    VideoCore::ShaderNotify& shader_notify;
    bool use_asynchronous_shaders{};
    bool use_vulkan_pipeline_cache{};
+    bool optimize_spirv_output{};

    GraphicsPipelineCacheKey graphics_key{};
    GraphicsPipeline* current_pipeline{};
@@ -31,10 +31,11 @@ ModSelectDialog::ModSelectDialog(const QStringList& mods, QWidget* parent)
    }

    ui->treeView->expandAll();
+    ui->treeView->resizeColumnToContents(0);

    int rows = item_model->rowCount();
    int height =
-        4 + ui->treeView->contentsMargins().top() * 4 + ui->treeView->contentsMargins().bottom() * 4;
+        ui->treeView->contentsMargins().top() * 4 + ui->treeView->contentsMargins().bottom() * 4;
    int width = 0;

    for (int i = 0; i < rows; ++i) {
@@ -45,7 +46,7 @@ ModSelectDialog::ModSelectDialog(const QStringList& mods, QWidget* parent)
    width +=
        ui->treeView->contentsMargins().left() * 4 + ui->treeView->contentsMargins().right() * 4;
    ui->treeView->setMinimumHeight(qMin(height, 600));
-    ui->treeView->setMinimumWidth(qMax(width, 540));
+    ui->treeView->setMinimumWidth(qMin(width, 700));
    adjustSize();

    connect(this, &QDialog::accepted, this, [this]() {
@@ -6,12 +6,12 @@
   <rect>
    <x>0</x>
    <y>0</y>
-    <width>580</width>
+    <width>400</width>
    <height>430</height>
   </rect>
  </property>
  <property name="windowTitle">
-   <string>Import Mods</string>
+   <string>Dialog</string>
  </property>
  <layout class="QVBoxLayout" name="verticalLayout">
   <item>
Author	SHA1	Message	Date
lizzie	f6cab5068b	fix nvdec	2026-04-24 20:26:48 +02:00
lizzie	b5512f0708	[host1x] inline nvenc, fix ffmpeg not having va-api on freebsd Signed-off-by: lizzie <lizzie@eden-emu.dev>	2026-04-24 20:26:48 +02:00