fix span shit

[audio_core] remove dangling Core::System& references
Signed-off-by: lizzie <lizzie@eden-emu.dev>
2026-08-15 05:15:14 +00:00 · 2026-07-21 11:29:26 +02:00 · 2026-07-21 11:29:26 +02:00 · 2026-07-18 21:01:58 +02:00 · 2026-07-16 20:56:00 +02:00 · 2026-07-14 16:04:34 +02:00
139 changed files with 17949 additions and 22172 deletions
@@ -112,11 +112,6 @@ Files: src/yuzu/*.ui
 Copyright: 2018-2022 yuzu Emulator Project
 License: GPL-2.0-or-later

-Files: src/yuzu/compatdb.ui
-       src/yuzu/main.ui
-Copyright: 2014-2017 Citra Emulator Project
-License: GPL-2.0-or-later
-
 Files: src/yuzu/loading_screen.ui
 Copyright: 2019 James Rowe <jroweboy@gmail.com>
 License: GPL-2.0-or-later
@@ -281,25 +281,6 @@ if(EXISTS ${PROJECT_SOURCE_DIR}/hooks/pre-commit AND NOT EXISTS ${PROJECT_SOURCE
    endif()
 endif()

-set(compat_base dist/compatibility_list/compatibility_list)
-set(compat_qrc ${compat_base}.qrc)
-set(compat_json ${compat_base}.json)
-
-configure_file(${PROJECT_SOURCE_DIR}/${compat_qrc}
-    ${PROJECT_BINARY_DIR}/${compat_qrc}
-    COPYONLY)
-
-if (EXISTS ${PROJECT_SOURCE_DIR}/${compat_json})
-    configure_file("${PROJECT_SOURCE_DIR}/${compat_json}"
-        "${PROJECT_BINARY_DIR}/${compat_json}"
-        COPYONLY)
-endif()
-
-# TODO: Compat list download
-if (NOT EXISTS ${PROJECT_BINARY_DIR}/${compat_json})
-    file(WRITE ${PROJECT_BINARY_DIR}/${compat_json} "")
-endif()
-
 if (ARCHITECTURE_arm64 AND (ANDROID OR PLATFORM_LINUX))
    set(HAS_NCE 1)
    add_compile_definitions(HAS_NCE=1)
@@ -95,7 +95,7 @@ macro(echo)
        execute_process(COMMAND ${CMAKE_COMMAND} -E echo
            "${message}")
    else()
-        message(STATUS "${message}")
+        message(DEBUG "${message}")
    endif()
 endmacro()

@@ -120,47 +120,6 @@ macro(sleep time)
    execute_process(COMMAND ${CMAKE_COMMAND} -E sleep ${time})
 endmacro()

-# Analogous to GNU mktemp, with fallbacks
-function(mktempdir out)
-    # shell out to system mktemp if available
-    find_program(MKTEMP_EXECUTABLE mktemp)
-    if (MKTEMP_EXECUTABLE)
-        execute_process(COMMAND mktemp -d
-            OUTPUT_VARIABLE dir
-            OUTPUT_STRIP_TRAILING_WHITESPACE
-            RESULT_VARIABLE ret)
-
-        if (ret EQUAL 0)
-            set(${out} "${dir}" PARENT_SCOPE)
-            return()
-        endif()
-    endif()
-
-    string(RANDOM LENGTH 10 rand_str)
-    set(tmp_str "tmp.${rand_str}")
-
-    # create something in /tmp if it exists
-    if(EXISTS "/tmp" AND IS_DIRECTORY "/tmp")
-        set(dir "/tmp/${tmp_str}")
-        file(MAKE_DIRECTORY "${dir}" RESULT res)
-        if (res EQUAL 0)
-            set(${out} "${dir}" PARENT_SCOPE)
-            return()
-        endif()
-    endif()
-
-    # tmpdir does not exist, extremely legacy mode
-    set(dir "${CMAKE_CURRENT_LIST_DIR}/.tmp/${tmp_str}")
-    file(MAKE_DIRECTORY "${dir}" RESULT res)
-    if (res EQUAL 0)
-        set(${out} "${dir}" PARENT_SCOPE)
-        return()
-    endif()
-
-    fatal("Fatal: Could not create temporary directory. "
-        "Check write permissions to the current directory")
-endfunction()
-
 # Get a package's effective URL.
 function(get_package_url)
    set(oneValueArgs
@@ -218,6 +177,7 @@ endfunction()
 # Download a URL to file, with a sha512 hash
 # And retry 5 times
 function(cpm_download url file)
+    echo("Downloading ${url} to ${file}")
    list(LENGTH ARGN argn_len)
    if(argn_len GREATER 0)
        list(GET ARGN 0 hash)
@@ -229,8 +189,7 @@ function(cpm_download url file)
    foreach(i RANGE 5)
        file(DOWNLOAD ${url} ${file}
            ${args}
-            STATUS ret
-            LOG log)
+            STATUS ret)

        list(GET ret 0 code)
        if (code EQUAL 0)
@@ -339,60 +298,47 @@ function(fetch_package)
        return()
    endif()

-    # Temporary directory.
-    mktempdir(TMP)
-
-    # Get filename from URL
-    get_filename_component(base_filename ${ARG_URL} NAME)
-
-    # Download
-    set(file ${TMP}/${base_filename})
-    cpm_download(${ARG_URL} ${file} ${ARG_HASH})
-    message(DEBUG "Downloaded ${base_filename}")
-
-    # Extract the downloaded archive
-    # TODO: Moar error handling
-    set(dir ${TMP}/${base_filename}-extracted)
-    file(MAKE_DIRECTORY ${dir})
-
-    file(ARCHIVE_EXTRACT
-        INPUT ${file}
-        DESTINATION ${dir})
-
-    # This is copied near-verbatim from ExternalProject/extractfile.cmake.in
-
-    # If there's just one subdirectory and nothing else, move it
-    file(GLOB contents "${dir}/*")
-    list(REMOVE_ITEM contents "${dir}/.DS_Store")
-    list(LENGTH contents n)
-
-    # If n == 1 and contents points to a directory, this is a GitHub-style pack
-    # In this case contents points to the subdir which will get renamed
-    # If not, contents will point to the parent dir which will get renamed
-    if (NOT n EQUAL 1 OR NOT IS_DIRECTORY "${contents}")
-        set(contents "${dir}")
-    endif()
-
-    file(REAL_PATH "${contents}" contents_abs)
-
    # paths
    cmake_path(ABSOLUTE_PATH ARG_PATH
        NORMALIZE
        OUTPUT_VARIABLE abs_path)

    cmake_path(GET abs_path PARENT_PATH path_parent)
-    cmake_path(GET abs_path FILENAME path_name)
+    file(MAKE_DIRECTORY ${path_parent})

-    # rename tmp dir
-    set(tmp_renamed "${TMP}/${path_name}")
-    file(RENAME "${contents_abs}" "${tmp_renamed}")
+    # Get filename from URL
+    get_filename_component(base_filename ${ARG_URL} NAME)

-    # now copy
-    # TODO: Error handling beyond what cmake does????
-    file(COPY ${tmp_renamed} DESTINATION ${path_parent})
+    # Download
+    set(file ${path_parent}/${base_filename})
+    cpm_download(${ARG_URL} ${file} ${ARG_HASH})
+    echo("Downloaded ${base_filename}")
+
+    # Extract
+    echo("Extracting ${file}...")
+    file(ARCHIVE_EXTRACT
+        INPUT ${file}
+        DESTINATION ${abs_path})
+
+    # This is copied near-verbatim from ExternalProject/extractfile.cmake.in
+
+    # If there's just one subdirectory and nothing else, move it
+    file(GLOB contents "${abs_path}/*")
+    list(REMOVE_ITEM contents "${abs_path}/.DS_Store")
+    list(LENGTH contents n)
+
+    # If n == 1 and contents points to a directory, this is a GitHub-style pack
+    # In this case contents points to the subdir which will get renamed
+    # If not, contents will point to the parent dir which will get renamed
+    if (n EQUAL 1 AND IS_DIRECTORY "${contents}")
+        set(temp_path "${abs_path}_tmp")
+        file(RENAME "${contents}" "${temp_path}")
+        file(REMOVE_RECURSE "${abs_path}")
+        file(RENAME "${temp_path}" "${abs_path}")
+    endif()

    # TODO: only echo this in script mode
-    message(DEBUG "Extracted to ${abs_path}")
+    echo("Extracted to ${abs_path}")

    # Apply patches
    apply_patches("${ARG_PATCHES}" "${abs_path}")
@@ -401,7 +347,7 @@ function(fetch_package)
    file(WRITE "${abs_path}/.cpm_patch_key" ${ARG_PATCH_KEY})

    # done! :)
-    file(REMOVE_RECURSE ${TMP})
+    file(REMOVE_RECURSE ${file})
 endfunction()

 # compute a hash of all patch file contents
@@ -1,354 +0,0 @@
-[
-  {
-    "compatibility": 0,
-    "directory": "the-legend-of-zelda-breath-of-the-wild",
-    "releases": [
-      {"id": "01007EF00011E000"}
-    ],
-    "title": "The Legend of Zelda: Breath of the Wild"
-  },
-  {
-    "compatibility": 1,
-    "directory": "super-mario-odyssey",
-    "releases": [
-      {"id": "0100000000010000"}
-    ],
-    "title": "Super Mario Odyssey"
-  },
-  {
-    "compatibility": 0,
-    "directory": "animal-crossing-new-horizons",
-    "releases": [
-      {"id": "01006F8002326000"}
-    ],
-    "title": "Animal Crossing: New Horizons"
-  },
-  {
-    "compatibility": 1,
-    "directory": "pokemon-legends-z-a",
-    "releases": [
-      {"id": "0100F43008C44000"}
-    ],
-    "title": "Pokémon Legends: Z-A"
-  },
-  {
-    "compatibility": 1,
-    "directory": "the-legend-of-zelda-tears-of-the-kingdom",
-    "releases": [
-      {"id": "0100F2C0115B6000"}
-    ],
-    "title": "The Legend of Zelda: Tears of the Kingdom"
-  },
-  {
-    "compatibility": 0,
-    "directory": "super-mario-galaxy",
-    "releases": [
-      {"id": "010099C022B96000"}
-    ],
-    "title": "Super Mario Galaxy"
-  },
-  {
-    "compatibility": 3,
-    "directory": "star-wars-republic-commando",
-    "releases": [
-      {"id": "0100FA10115F8000"}
-    ],
-    "title": "Star Wars: Republic Commando"
-  },
-  {
-    "compatibility": 0,
-    "directory": "doki-doki-literature-club-plus",
-    "releases": [
-      {"id": "010086901543E000"}
-    ],
-    "title": "Doki Doki Literature Club Plus"
-  },
-  {
-    "compatibility": 1,
-    "directory": "pokemon-scarlet",
-    "releases": [
-      {"id": "0100A3D008C5C000"}
-    ],
-    "title": "Pokémon Scarlet"
-  },
-    {
-    "compatibility": 1,
-    "directory": "pokemon-violet",
-    "releases": [
-      {"id": "01008F6008C5E000"}
-    ],
-    "title": "Pokémon Violet"
-  },
-  {
-    "compatibility": 2,
-    "directory": "pokemon-legends-arceus",
-    "releases": [
-      {"id": "01001E300D162000"}
-    ],
-    "title": "Pokémon Legends: Arceus"
-  },
-  {
-    "compatibility": 0,
-    "directory": "splatoon-2",
-    "releases": [
-      {"id": "01003BC0000A0000"}
-    ],
-    "title": "Splatoon 2"
-  },
-  {
-    "compatibility": 1,
-    "directory": "super-smash-bros-ultimate",
-    "releases": [
-      {"id": "01006A800016E000"}
-    ],
-    "title": "Super Smash Bros. Ultimate"
-  },
-  {
-    "compatibility": 0,
-    "directory": "mario-kart-8-deluxe",
-    "releases": [
-      {"id": "0100152000022000"}
-    ],
-    "title": "Mario Kart 8 Deluxe"
-  },
-  {
-    "compatibility": 0,
-    "directory": "splatoon-3",
-    "releases": [
-      {"id": "0100C2500FC20000"}
-    ],
-    "title": "Splatoon 3"
-  },
-  {
-    "compatibility": 0,
-    "directory": "new-super-mario-bros-u-deluxe",
-    "releases": [
-      {"id": "0100EA80032EA000"}
-    ],
-    "title": "New Super Mario Bros. U Deluxe"
-  },
-  {
-    "compatibility": 0,
-    "directory": "hyrule-warriors-age-of-calamity",
-    "releases": [
-      {"id": "01002B00111A2000"}
-    ],
-    "title": "Hyrule Warriors: Age of Calamity"
-  },
-  {
-    "compatibility": 2,
-    "directory": "luigis-mansion-3",
-    "releases": [
-      {"id": "0100DCA0064A6000"}
-    ],
-    "title": "Luigi's Mansion 3"
-  },
-  {
-    "compatibility": 2,
-    "directory": "pokemon-brilliant-diamond",
-    "releases": [
-      {"id": "0100000011D90000"}
-    ],
-    "title": "Pokémon Brilliant Diamond"
-  },
-  {
-    "compatibility": 2,
-    "directory": "pokemon-shining-pearl",
-    "releases": [
-      {"id": "010018E011D92000"}
-    ],
-    "title": "Pokémon Shining Pearl"
-  },
-  {
-    "compatibility": 1,
-    "directory": "super-mario-3d-world-bowsers-fury",
-    "releases": [
-      {"id": "010028600EBDA000"}
-    ],
-    "title": "Super Mario 3D World + Bowser's Fury"
-  },
-  {
-    "compatibility": 0,
-    "directory": "the-legend-of-zelda-links-awakening",
-    "releases": [
-      {"id": "01006BB00C6F0000"}
-    ],
-    "title": "The Legend of Zelda: Link's Awakening"
-  },
-  {
-    "compatibility": 1,
-    "directory": "fire-emblem-three-houses",
-    "releases": [
-      {"id": "010055D009F78000"}
-    ],
-    "title": "Fire Emblem: Three Houses"
-  },
-  {
-    "compatibility": 2,
-    "directory": "metroid-dread",
-    "releases": [
-      {"id": "010093801237C000"}
-    ],
-    "title": "Metroid Dread"
-  },
-  {
-    "compatibility": 0,
-    "directory": "paper-mario-the-origami-king",
-    "releases": [
-      {"id": "0100A3900C3E2000"}
-    ],
-    "title": "Paper Mario: The Origami King"
-  },
-  {
-    "compatibility": 1,
-    "directory": "xenoblade-chronicles-definitive-edition",
-    "releases": [
-      {"id": "0100FF500E34A000"}
-    ],
-    "title": "Xenoblade Chronicles: Definitive Edition"
-  },
-  {
-    "compatibility": 2,
-    "directory": "xenoblade-chronicles-3",
-    "releases": [
-      {"id": "010074F013262000"}
-    ],
-    "title": "Xenoblade Chronicles 3"
-  },
-  {
-    "compatibility": 1,
-    "directory": "pikmin-3-deluxe",
-    "releases": [
-      {"id": "0100F8600D4B0000"}
-    ],
-    "title": "Pikmin 3 Deluxe"
-  },
-  {
-    "compatibility": 0,
-    "directory": "donkey-kong-country-tropical-freeze",
-    "releases": [
-      {"id": "0100C1F0054B6000"}
-    ],
-    "title": "Donkey Kong Country: Tropical Freeze"
-  },
-  {
-    "compatibility": 1,
-    "directory": "kirby-and-the-forgotten-land",
-    "releases": [
-      {"id": "01004D300C5AE000"}
-    ],
-    "title": "Kirby and the Forgotten Land"
-  },
-  {
-    "compatibility": 2,
-    "directory": "mario-party-superstars",
-    "releases": [
-      {"id": "01006B400D8B2000"}
-    ],
-    "title": "Mario Party Superstars"
-  },
-  {
-    "compatibility": 0,
-    "directory": "clubhouse-games-51-worldwide-classics",
-    "releases": [
-      {"id": "0100F8600D4B0000"}
-    ],
-    "title": "Clubhouse Games: 51 Worldwide Classics"
-  },
-  {
-    "compatibility": 1,
-    "directory": "ring-fit-adventure",
-    "releases": [
-      {"id": "01006B300BAF8000"}
-    ],
-    "title": "Ring Fit Adventure"
-  },
-  {
-    "compatibility": 2,
-    "directory": "arms",
-    "releases": [
-      {"id": "01009B500007C000"}
-    ],
-    "title": "ARMS"
-  },
-  {
-    "compatibility": 0,
-    "directory": "super-mario-maker-2",
-    "releases": [
-      {"id": "01009B90006DC000"}
-    ],
-    "title": "Super Mario Maker 2"
-  },
-  {
-    "compatibility": 0,
-    "directory": "pokemon-lets-go-pikachu",
-    "releases": [
-      {"id": "010003F003A34000"}
-    ],
-    "title": "Pokémon: Let's Go, Pikachu!"
-  },
-  {
-    "compatibility": 1,
-    "directory": "pokemon-lets-go-eevee",
-    "releases": [
-      {"id": "0100187003A36000"}
-    ],
-    "title": "Pokémon: Let's Go, Eevee!"
-  },
-  {
-    "compatibility": 2,
-    "directory": "pokemon-sword",
-    "releases": [
-      {"id": "0100ABF008968000"}
-    ],
-    "title": "Pokémon Sword"
-  },
-  {
-    "compatibility": 2,
-    "directory": "pokemon-shield",
-    "releases": [
-      {"id": "01008DB008C2C000"}
-    ],
-    "title": "Pokémon Shield"
-  },
-  {
-    "compatibility": 1,
-    "directory": "new-pokemon-snap",
-    "releases": [
-      {"id": "0100F4300C182000"}
-    ],
-    "title": "New Pokémon Snap"
-  },
-  {
-    "compatibility": 0,
-    "directory": "mario-golf-super-rush",
-    "releases": [
-      {"id": "0100C9C00E25C000"}
-    ],
-    "title": "Mario Golf: Super Rush"
-  },
-  {
-    "compatibility": 1,
-    "directory": "mario-tennis-aces",
-    "releases": [
-      {"id": "0100BDE00862A000"}
-    ],
-    "title": "Mario Tennis Aces"
-  },
-  {
-    "compatibility": 2,
-    "directory": "wario-ware-get-it-together",
-    "releases": [
-      {"id": "0100563010F22000"}
-    ],
-    "title": "WarioWare: Get It Together!"
-  },
-  {
-    "compatibility": 0,
-    "directory": "big-brain-academy-brain-vs-brain",
-    "releases": [
-      {"id": "0100190010F24000"}
-    ],
-    "title": "Big Brain Academy: Brain vs. Brain"
-  }
-]
@@ -1,5 +0,0 @@
-<RCC>
-  <qresource prefix="compatibility_list">
-      <file>compatibility_list.json</file>
-  </qresource>
-</RCC>
@@ -16,7 +16,6 @@ enum class BooleanSetting(override val key: String) : AbstractBooleanSetting {
    RENDERER_USE_SPEED_LIMIT("use_speed_limit"),
    USE_CUSTOM_CPU_TICKS("use_custom_cpu_ticks"),
    SKIP_CPU_INNER_INVALIDATION("skip_cpu_inner_invalidation"),
-    ANTIFLICKER("antiflicker"),
    FIX_BLOOM_EFFECTS("fix_bloom_effects"),
    EMULATE_BGR565("emulate_bgr565"),
    RESCALE_HACK("rescale_hack"),
@@ -27,6 +27,7 @@ enum class IntSetting(override val key: String) : AbstractIntSetting {

    RENDERER_DYNA_STATE("dyna_state"),
    DMA_ACCURACY("dma_accuracy"),
+    GPU_FENCE_BEHAVIOR("gpu_fence_behavior"),
    FRAME_PACING_MODE("frame_pacing_mode"),
    AUDIO_OUTPUT_ENGINE("output_engine"),
    MAX_ANISOTROPY("max_anisotropy"),
@@ -669,6 +669,15 @@ abstract class SettingsItem(
                    valuesId = R.array.dmaAccuracyValues
                )
            )
+            put(
+                SingleChoiceSetting(
+                    IntSetting.GPU_FENCE_BEHAVIOR,
+                    titleId = R.string.gpu_fence_behavior,
+                    descriptionId = R.string.gpu_fence_behavior_description,
+                    choicesId = R.array.gpuFenceBehaviorNames,
+                    valuesId = R.array.gpuFenceBehaviorValues
+                )
+            )
            put(
                SwitchSetting(
                    BooleanSetting.RENDERER_ASYNCHRONOUS_SHADERS,
@@ -757,13 +766,6 @@ abstract class SettingsItem(
                    descriptionId = R.string.skip_cpu_inner_invalidation_description
                )
            )
-            put(
-                SwitchSetting(
-                    BooleanSetting.ANTIFLICKER,
-                    titleId = R.string.antiflicker,
-                    descriptionId = R.string.antiflicker_description
-                )
-            )
            put(
                SwitchSetting(
                    BooleanSetting.FIX_BLOOM_EFFECTS,
@@ -283,6 +283,7 @@ class SettingsFragmentPresenter(

            add(IntSetting.RENDERER_ACCURACY.key)
            add(IntSetting.DMA_ACCURACY.key)
+            add(IntSetting.GPU_FENCE_BEHAVIOR.key)
            add(IntSetting.MAX_ANISOTROPY.key)
            add(IntSetting.RENDERER_VRAM_USAGE_MODE.key)
            add(IntSetting.RENDERER_ASTC_DECODE_METHOD.key)
@@ -299,7 +300,6 @@ class SettingsFragmentPresenter(

            add(IntSetting.FAST_GPU_TIME.key)
            add(BooleanSetting.SKIP_CPU_INNER_INVALIDATION.key)
-            add(BooleanSetting.ANTIFLICKER.key)
            add(BooleanSetting.FIX_BLOOM_EFFECTS.key)
            add(BooleanSetting.EMULATE_BGR565.key)
            add(BooleanSetting.RESCALE_HACK.key)
@@ -476,6 +476,8 @@
    <string name="renderer_accuracy_description">يتحكم في وضع محاكاة وحدة معالجة الرسومات. تعمل معظم الألعاب بشكل جيد مع وضعي سريع أو متوازن، لكن الوضع الدقيق لا يزال مطلوبًا لبعض الألعاب. تميل الجسيمات إلى العرض بشكل صحيح فقط عند استخدام الوضع الدقيق.</string>
    <string name="dma_accuracy">دقة DMA</string>
    <string name="dma_accuracy_description">يتحكم في دقة DMA. يمكن أن تؤدي الدقة الآمنة إلى حل المشكلات في بعض الألعاب، ولكنها قد تؤثر أيضًا على الأداء في بعض الحالات. إذا لم تكن متأكدًا، فاترك هذا الخيار على الإعداد الافتراضي.</string>
+    <string name="gpu_fence_behavior">سلوك حاجز وحدة معالجة الرسومات</string>
+    <string name="gpu_fence_behavior_description">يتحكم في سلوك تزامن حاجز وحدة معالجة الرسوميات. الخيار الفوري هو الأسرع، لكنه قد يسبب بعض المشاكل. الخيار المتوازن يقدم توافقًا أفضل وقد يصلح مشاكل في بعض الألعاب. الخيار الدقيق يحسن التوافق أكثر لكنه قد يقلل الأداء قليلاً. الخيار الصارم هو الأبطأ، لكنه قد يصلح المشاكل التي تتطلب تزامنًا أكثر صرامة. الإعداد الافتراضي يتبع إعداد دقة وحدة معالجة الرسوميات.</string>
    <string name="anisotropic_filtering">تصفية متباينة الخواص</string>
    <string name="anisotropic_filtering_description">يحسن جودة الأنسجة عند عرضها بزوايا مائلة</string>
    <string name="vram_usage_mode">وضع استخدام ذاكرة VRAM</string>
@@ -497,6 +499,8 @@
    <string name="renderer_reactive_flushing_description">يحسن دقة العرض في بعض الألعاب على حساب الأداء.</string>
    <string name="enable_buffer_history">تمكين سجل التخزين المؤقت</string>
    <string name="enable_buffer_history_description">يُتيح هذا الخيار الوصول إلى حالات التخزين المؤقت السابقة. وقد يُحسّن جودة العرض وثبات الأداء في بعض الألعاب.</string>
+    <string name="enable_gpu_buffer_readback">تفعيل قراءة مخزن وحدة معالجة الرسومات</string>
+    <string name="enable_gpu_buffer_readback_description">يحافظ هذا النظام على بيانات المخزن المؤقت المُعدّلة بواسطة وحدة معالجة الرسومات عن طريق قراءتها مرة أخرى قبل التحميل. تتطلب بعض الألعاب ذلك لعرض بعض التأثيرات بشكل صحيح. قد يُسبب ذلك مشاكل إذا لم يتمكن الجهاز من التعامل مع عبء العمل الإضافي.</string>
    <string name="use_optimized_vertex_buffers">مخازن الرؤوس المُحسّنة</string>
    <string name="use_optimized_vertex_buffers_description">يُتيح ربطًا مُحسَّنًا لمخازن الرؤوس لتحسين الأداء. يتطلب برامج تشغيل Mesa 26.0+ Turnip/ برامج تشغيل QCOM. قد يتعطل على برامج تشغيل Turnip القديمة (25.3 وما دون).</string>

@@ -506,8 +510,6 @@
    <string name="fast_gpu_time_description">يُجبر هذا الخيار معظم الألعاب على العمل بأعلى دقة عرض أصلية. استخدم 256 للحصول على أقصى أداء و512 للحصول على أعلى جودة رسومات.</string>
    <string name="skip_cpu_inner_invalidation">تخطي إبطال صلاحية وحدة المعالجة المركزية الداخلية</string>
    <string name="skip_cpu_inner_invalidation_description">يتخطى بعض عمليات إبطال ذاكرة التخزين المؤقتة من جانب وحدة المعالجة المركزية أثناء تحديثات الذاكرة، مما يقلل من استخدام وحدة المعالجة المركزية ويحسن أداءها. قد يتسبب ذلك في حدوث أعطال أو تعطل في بعض الألعاب.</string>
-    <string name="antiflicker">مضاد الوميض</string>
-    <string name="antiflicker_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>
@@ -573,6 +575,12 @@
    <string name="gpu_log_level_description">مستوى التفاصيل لسجلات وحدة معالجة الرسومات (كلما زاد المستوى، زادت التفاصيل وزادت التكاليف الإضافية)</string>
    <string name="gpu_log_vulkan_calls">تسجيل استدعاءات واجهة برمجة تطبيقات Vulkan</string>
    <string name="gpu_log_vulkan_calls_description">تتبع جميع استدعاءات واجهة برمجة تطبيقات Vulkan في المخزن المؤقت الحلقي</string>
+    <string name="gpu_log_shader_dumps">تفريغ مظللات SPIR-V</string>
+    <string name="gpu_log_shader_dumps_description">احفظ ملفات SPIR-V الثنائية المُعاد تجميعها (.spv) في مجلد التفريغ. افحصها باستخدام spirv-dis/spirv-cross/spirv-val.</string>
+    <string name="dump_guest_shaders">تظليلات ضيف التفريغ (ماكسويل)</string>
+    <string name="dump_guest_shaders_description">احفظ ملفات بايت كود برنامج التظليل الضيف الخاص بـ «ماكسويل» (*.ash) في مجلد «dump». افحصها باستخدام nvdisasm.</string>
+    <string name="dump_macros">تفريغ ماكرو ماكسويل</string>
+    <string name="dump_macros_description">احفظ ملفات برامج ماكرو ماكسويل (*.macro) في مجلد «dump». افحصها باستخدام برنامج «envydis».</string>
    <string name="gpu_log_memory_tracking">تتبع ذاكرة وحدة معالجة الرسومات</string>
    <string name="gpu_log_memory_tracking_description">مراقبة تخصيصات ذاكرة وحدة معالجة الرسومات وإلغاء تخصيصها</string>
    <string name="gpu_log_driver_debug">معلومات تصحيح أخطاء برنامج التشغيل</string>
@@ -1000,6 +1008,13 @@
    <string name="dma_accuracy_unsafe">غير آمن</string>
    <string name="dma_accuracy_safe">آمن</string>

+    <!-- GPU Fence Behavior -->
+    <string name="gpu_fence_behavior_default">افتراضي</string>
+    <string name="gpu_fence_behavior_immediate">فوري</string>
+    <string name="gpu_fence_behavior_balanced">متوازن</string>
+    <string name="gpu_fence_behavior_accurate">دقيق</string>
+    <string name="gpu_fence_behavior_strict">صارم</string>
+
    <string name="vram_usage_conservative">محافظ</string>
    <string name="vram_usage_aggressive">عدواني</string>

@@ -470,6 +470,7 @@
    <string name="renderer_accuracy_description">Controla el modo de la emulación de la GPU. La mayoría de los juegos se renderizan correctamente en los modos Rápido o Equilibrado, pero algunos requieren Preciso. Las partículas tienden a renderizarse correctamente solo con el modo Preciso.</string>
    <string name="dma_accuracy">Precisión de DMA</string>
    <string name="dma_accuracy_description">Controla la precisión de DMA. La precisión segura puede solucionar problemas en algunos juegos, pero también puede afectar al rendimiento en algunos casos. Si no está seguro, déjelo en Predeterminado.</string>
+    <string name="gpu_fence_behavior">Comportamiento de vallado de la GPU</string>
    <string name="anisotropic_filtering">Filtrado anisotrópico</string>
    <string name="anisotropic_filtering_description">Mejora la calidad de las texturas al ser observadas desde ángulos oblicuos</string>
    <string name="vram_usage_mode">Modo de uso de VRAM</string>
@@ -502,8 +503,6 @@
    <string name="fast_gpu_time_description">Fuerza a la mayoría de los juegos a ejecutarse a su resolución nativa más alta. Usa 256 para un máximo rendimiento y 512 para una fidelidad gráfica óptima.</string>
    <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="antiflicker">Antiparpadeo</string>
-    <string name="antiflicker_description">Fuerza a las funciones de devolución de llamada de la GPU a esperar a que se envíen las tareas a la GPU.\nÚsalo con el modo de GPU rápida para evitar el parpadeo con un menor impacto en el rendimiento.</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>
@@ -1002,6 +1001,13 @@
    <string name="dma_accuracy_unsafe">Inseguro</string>
    <string name="dma_accuracy_safe">Seguro</string>

+    <!-- GPU Fence Behavior -->
+    <string name="gpu_fence_behavior_default">Predeterminado</string>
+    <string name="gpu_fence_behavior_immediate">Inmediato</string>
+    <string name="gpu_fence_behavior_balanced">Equilibrado</string>
+    <string name="gpu_fence_behavior_accurate">Preciso</string>
+    <string name="gpu_fence_behavior_strict">Estricto</string>
+
    <string name="vram_usage_conservative">Conservador</string>
    <string name="vram_usage_aggressive">Agresivo</string>

@@ -499,8 +499,6 @@
    <string name="fast_gpu_time_description">Принудительно запускает большинство игр в их максимальном нативном разрешении. Используйте значение 256 для максимальной производительности и 512 для максимального качества графики.</string>
    <string name="skip_cpu_inner_invalidation">Пропустить внутреннюю инвалидацию ЦП</string>
    <string name="skip_cpu_inner_invalidation_description">Пропускает некоторые инвалидации кэша на стороне ЦП при обновлениях памяти, уменьшая нагрузку на процессор и повышая производительность. Может вызывать сбои в некоторых играх.</string>
-    <string name="antiflicker">Анти-мерцание</string>
-    <string name="antiflicker_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>
@@ -502,8 +502,6 @@
    <string name="fast_gpu_time_description">Примушує більшість ігор працювати на їхній максимальній нативній роздільності. Використовуйте 256 для максимальної продуктивності та 512 для найкращої якості.</string>
    <string name="skip_cpu_inner_invalidation">Пропустити внутрішнє інвалідування CPU</string>
    <string name="skip_cpu_inner_invalidation_description">Пропускає деякі інвалідації кешу на стороні CPU під час оновлення пам\'яті, зменшуючи навантаження на процесор і покращуючи продуктивність. Може спричинити збої в деяких іграх.</string>
-    <string name="antiflicker">Антимерехтіння</string>
-    <string name="antiflicker_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>
@@ -67,7 +67,7 @@
    <string name="show_shaders_building">显示着色器编译信息</string>
    <string name="show_shaders_building_description">显示当前正在编译的着色器数量</string>
    <string name="pipeline_worker_cores">管线工作线程</string>
-    <string name="pipeline_worker_cores_description">管理用于构建 Vulkan 管线的核心数量，数值越高则管线编译性能越好，但温度也会随之升高。</string>
+    <string name="pipeline_worker_cores_description">管理用于构建 Vulkan 管线的核心数量，较高的值可提升管线编译性能，但温度也会随之升高。</string>
    <string name="overlay_position">叠加层位置</string>
    <string name="overlay_position_description">选择叠加层在屏幕上显示的位置</string>
    <string name="overlay_position_top_left">左上</string>
@@ -185,7 +185,7 @@
    <string name="multiplayer_preferred_game_name">首选游戏</string>
    <string name="multiplayer_lobby_type">游戏大厅类型</string>
    <string name="multiplayer_room_name_error">长度需为3-20个字符</string>
-    <string name="multiplayer_required">必填</string>
+    <string name="multiplayer_required">需要</string>
    <string name="multiplayer_token_required">需要Web令牌，请前往高级设置 -> 系统 -> 网络</string>
    <string name="multiplayer_ip_error">IP格式无效</string>
    <string name="multiplayer_username_error">必须为4至20个字符，且仅包含字母、数字、点号、连字符、下划线和空格</string>
@@ -287,7 +287,7 @@
    <string name="warning_skip">跳过</string>
    <string name="warning_cancel">取消</string>
    <string name="install_amiibo_keys">安装 Amiibo 密钥文件</string>
-    <string name="install_amiibo_keys_description">在遊戏中使用 Amiibo 时必需</string>
+    <string name="install_amiibo_keys_description">在遊戏中使用 Amiibo 时需要</string>
    <string name="gpu_driver_fetcher">GPU驱动获取器</string>
    <string name="gpu_driver_manager">GPU 驱动管理器</string>
    <string name="install_gpu_driver_description">安装替代的驱动程序以获得更好的性能和精度</string>
@@ -463,11 +463,13 @@
    <string name="advanced">高级</string>

    <string name="renderer_accuracy">GPU 模式</string>
-    <string name="renderer_accuracy_description">控制 GPU 模拟模式。大多数游戏在“快速”或“平衡”模式下都能正常渲染，但有些游戏仍需使用“精确”模式。粒子效果通常只有在“精确”模式下才能正确渲染。</string>
+    <string name="renderer_accuracy_description">控制 GPU 模拟模式。大多数游戏在“快速”或“均衡”模式下都能获得良好的渲染，但有些游戏仍需使用“精确”模式。粒子效果通常只有在“精确”模式下才能正确渲染。</string>
    <string name="dma_accuracy">DMA 精度</string>
    <string name="dma_accuracy_description">控制 DMA 的精准度。安全精度可以修复存在于某些游戏中的问题，但在某些情况下也会对性能造成影响。如不确定，请保持“默认”。</string>
+    <string name="gpu_fence_behavior">GPU 围栏行为</string>
+    <string name="gpu_fence_behavior_description">控制 GPU 围栏同步行为。“即时”是速度最快的选项，但可能会引入一些问题。“均衡”提供了更好的兼容性，可能修复某些游戏中的问题。“精确”在牺牲部分性能的前提下进一步提升兼容性。“严格”是速度最慢的选项，但可以修复那些要求更严格同步的问题。默认遵循 GPU “精确”设定。</string>
    <string name="anisotropic_filtering">各向异性过滤</string>
-    <string name="anisotropic_filtering_description">提高斜角的纹理质量</string>
+    <string name="anisotropic_filtering_description">提升斜视角下的纹理质量</string>
    <string name="vram_usage_mode">显存使用模式</string>
    <string name="vram_usage_mode_description">控制显存分配与释放策略</string>
    <string name="accelerate_astc">ASTC解码方式</string>
@@ -488,7 +490,7 @@
    <string name="enable_buffer_history">启用缓冲区历史</string>
    <string name="enable_buffer_history_description">启用对先前缓冲区状态的访问。此选项可在某些游戏中提升渲染质量并保持性能的一致性。</string>
    <string name="enable_gpu_buffer_readback">启用 GPU 缓冲区回读</string>
-    <string name="enable_gpu_buffer_readback_description">在上传前回读经由 GPU 修改过的缓冲区数据，以将其保留。一些游戏需要这样做才能正确渲染某些效果。如果硬件无法处理额外的工作负载，则可能会导致问题。</string>
+    <string name="enable_gpu_buffer_readback_description">在上传前回读经由 GPU 修改过的缓冲区数据，以将其保留。一些游戏会用到这项设定以正确渲染某些效果。如果硬件无法处理额外的工作负载，则可能会导致问题。</string>
    <string name="use_optimized_vertex_buffers">优化顶点缓冲区</string>
    <string name="use_optimized_vertex_buffers_description">启用经过优化的顶点缓冲区绑定以提升性能。需要 Mesa 26.0 及以上版本的 Turnip 或 QCOM 驱动程序。若使用较旧版本的 Turnip 驱动 (25.3 及以下版本) 则会导致崩溃。</string>

@@ -498,8 +500,6 @@
    <string name="fast_gpu_time_description">强制大多数游戏以其最高原生分辨率运行。设置为 256 可获得最佳性能，设置为 512 可获得最佳画面保真度。</string>
    <string name="skip_cpu_inner_invalidation">跳过CPU内部无效化</string>
    <string name="skip_cpu_inner_invalidation_description">在更新内存时跳过某些 CPU 端的缓存失效操作，从而降低 CPU 占用率并提升性能。可能会在某些游戏中引发故障点或崩溃。</string>
-    <string name="antiflicker">防闪烁</string>
-    <string name="antiflicker_description">强制 GPU 围栏回调等待已提交的 GPU 任务。配合“快速 GPU 模式”一起使用，以牺牲少量性能为代价来避免画面闪烁现象。</string>
    <string name="fix_bloom_effects">修复 Bloom 效果</string>
    <string name="fix_bloom_effects_description">减少《智慧的再现》和《众神的三角力量2》（Adreno A6XX - A7XX/ Turnip）中的 bloom 模糊，并移除《Burnout》中的 bloom 效果。警告：可能会导致在其他游戏中出现图形异常。</string>
    <string name="emulate_bgr565">模拟 BGR565</string>
@@ -513,7 +513,7 @@
    <string name="gpu_unswizzle_enable">启用 GPU Unswizzle</string>
    <string name="gpu_unswizzle_disabled">禁用</string>
    <string name="gpu_unswizzle_texture_size">GPU Unswizzle 最大纹理尺寸</string>
-    <string name="gpu_unswizzle_texture_size_description">设置基于 GPU 的纹理 unswizzling 的最大尺寸（MB）。虽然 GPU 处理中等和大型纹理的速度更快，但对于非常小的纹理，CPU 可能更为高效。通过调节此项设置，以尝试在 GPU 加速与 CPU 开销之间找到平衡。</string>
+    <string name="gpu_unswizzle_texture_size_description">设置基于 GPU 的纹理 unswizzling 的最大尺寸（MB）。虽然 GPU 处理中等和大型纹理的速度更快，但对于非常小的纹理，CPU 可能更为高效。通过调节此项设置，以平衡GPU 加速与 CPU 开销。</string>
    <string name="gpu_unswizzle_stream_size">GPU Unswizzle 流大小</string>
    <string name="gpu_unswizzle_stream_size_description">设置用于 unswizzling 大型纹理时的每帧数据限制。较高的数值可以加速纹理的加载过程，但会带来更高的帧延迟。而较低的数值则可以降低 GPU 的开销，但也可能会导致可见的纹理闪现。</string>
    <string name="gpu_unswizzle_chunk_size">GPU Unswizzle 块大小</string>
@@ -990,7 +990,7 @@

    <!-- Renderer Accuracy -->
    <string name="renderer_accuracy_low">快速</string>
-    <string name="renderer_accuracy_medium">平衡</string>
+    <string name="renderer_accuracy_medium">均衡</string>
    <string name="renderer_accuracy_high">精确</string>

    <!-- DMA Accuracy -->
@@ -998,6 +998,13 @@
    <string name="dma_accuracy_unsafe">不安全</string>
    <string name="dma_accuracy_safe">安全</string>

+    <!-- GPU Fence Behavior -->
+    <string name="gpu_fence_behavior_default">默认</string>
+    <string name="gpu_fence_behavior_immediate">即时</string>
+    <string name="gpu_fence_behavior_balanced">均衡</string>
+    <string name="gpu_fence_behavior_accurate">精确</string>
+    <string name="gpu_fence_behavior_strict">严格</string>
+
    <string name="vram_usage_conservative">保守式</string>
    <string name="vram_usage_aggressive">主动式</string>

@@ -1021,7 +1028,7 @@
    <string name="ratio_stretch">拉伸窗口</string>

    <!-- CPU Accuracy -->
-    <string name="cpu_accuracy_accurate">精准</string>
+    <string name="cpu_accuracy_accurate">精确</string>
    <string name="cpu_accuracy_unsafe">不安全</string>
    <string name="cpu_accuracy_paranoid">极致</string>
    <string name="cpu_accuracy_debugging">调试</string>
@@ -522,6 +522,21 @@
        <item>2</item>
    </integer-array>

+    <string-array name="gpuFenceBehaviorNames">
+        <item>@string/gpu_fence_behavior_default</item>
+        <item>@string/gpu_fence_behavior_immediate</item>
+        <item>@string/gpu_fence_behavior_balanced</item>
+        <item>@string/gpu_fence_behavior_accurate</item>
+        <item>@string/gpu_fence_behavior_strict</item>
+    </string-array>
+    <integer-array name="gpuFenceBehaviorValues">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+    </integer-array>
+

    <string-array name="appletEntries">
        <item>@string/applet_hle</item>
@@ -482,6 +482,8 @@
    <string name="renderer_accuracy_description">Controls the GPU emulation mode. Most games render fine with Fast or Balanced modes, but Accurate is still required for some. Particles tend to only render correctly with Accurate mode.</string>
    <string name="dma_accuracy">DMA Accuracy</string>
    <string name="dma_accuracy_description">Controls the DMA precision accuracy. Safe precision can fix issues in some games, but it can also impact performance in some cases. If unsure, leave this on Default.</string>
+    <string name="gpu_fence_behavior">GPU Fence Behavior</string>
+    <string name="gpu_fence_behavior_description">Controls the GPU fence synchronization behavior. Immediate is the fastest option, but can introduce some issues. Balanced offers better compatibility and may fix issues in some games. Accurate further improves compatibility at the cost of some performance. Strict is the slowest option, but can fix issues that require stricter synchronization. Default follows the GPU Accuracy setting.</string>
    <string name="anisotropic_filtering">Anisotropic filtering</string>
    <string name="anisotropic_filtering_description">Improves the quality of textures when viewed at oblique angles</string>
    <string name="vram_usage_mode">VRAM Usage Mode</string>
@@ -514,8 +516,6 @@
    <string name="fast_gpu_time_description">Forces most games to run at their highest native resolution. Use 256 for maximal performance and 512 for maximal graphics fidelity.</string>
    <string name="skip_cpu_inner_invalidation">Skip CPU Inner Invalidation</string>
    <string name="skip_cpu_inner_invalidation_description">Skips certain CPU-side cache invalidations during memory updates, reducing CPU usage and improving it\'s performance. This may cause glitches or crashes on some games.</string>
-    <string name="antiflicker">Anti-Flicker</string>
-    <string name="antiflicker_description">Forces GPU fence callbacks to wait for submitted GPU work. Use with Fast GPU mode, to avoid flicker with lower performance impact.</string>
    <string name="fix_bloom_effects">Fix Bloom Effects</string>
    <string name="fix_bloom_effects_description">Reduces bloom blur in LA/EOW (Adreno A6XX - A7XX/ Turnip), removes bloom in Burnout. Warning: may cause graphical artifacts in other games.</string>
    <string name="emulate_bgr565">Emulate BGR565</string>
@@ -1047,6 +1047,13 @@
    <string name="dma_accuracy_unsafe">Unsafe</string>
    <string name="dma_accuracy_safe">Safe</string>

+    <!-- GPU Fence Behavior -->
+    <string name="gpu_fence_behavior_default">Default</string>
+    <string name="gpu_fence_behavior_immediate">Immediate</string>
+    <string name="gpu_fence_behavior_balanced">Balanced</string>
+    <string name="gpu_fence_behavior_accurate">Accurate</string>
+    <string name="gpu_fence_behavior_strict">Strict</string>
+
    <!-- ASTC Decoding Method Choices -->
    <string name="accelerate_astc_cpu" translatable="false">CPU</string>
    <string name="accelerate_astc_gpu" translatable="false">GPU</string>
@@ -12,7 +12,7 @@
 namespace AudioCore {

 AudioCore::AudioCore(Core::System& system) {
-    audio_manager.emplace();
+    audio_manager.emplace(system);
    CreateSinks();
    // Must be created after the sinks
    adsp.emplace(system, *output_sink);
@@ -15,12 +15,12 @@

 namespace AudioCore::AudioIn {

-Manager::Manager(Core::System& system_) : system{system_} {
+Manager::Manager(Core::System& system) {
    std::iota(session_ids.begin(), session_ids.end(), 0);
    num_free_sessions = MaxInSessions;
 }

-Result Manager::AcquireSessionId(size_t& session_id) {
+Result Manager::AcquireSessionId(Core::System& system, size_t& session_id) {
    if (num_free_sessions == 0) {
        LOG_ERROR(Service_Audio, "All 4 AudioIn sessions are in use, cannot create any more");
        return Service::Audio::ResultOutOfSessions;
@@ -31,7 +31,7 @@ Result Manager::AcquireSessionId(size_t& session_id) {
    return ResultSuccess;
 }

-void Manager::ReleaseSessionId(const size_t session_id) {
+void Manager::ReleaseSessionId(Core::System& system, const size_t session_id) {
    std::scoped_lock l{mutex};
    LOG_DEBUG(Service_Audio, "Freeing AudioIn session {}", session_id);
    session_ids[free_session_id] = session_id;
@@ -41,21 +41,20 @@ void Manager::ReleaseSessionId(const size_t session_id) {
    applet_resource_user_ids[session_id] = 0;
 }

-Result Manager::LinkToManager() {
+Result Manager::LinkToManager(Core::System& system) {
    std::scoped_lock l{mutex};
    if (!linked_to_manager) {
-        system.AudioCore().GetAudioManager().SetInManager(std::bind(&Manager::BufferReleaseAndRegister, this));
+        system.AudioCore().GetAudioManager().SetInManager(&Manager::BufferReleaseAndRegister);
        linked_to_manager = true;
    }

    return ResultSuccess;
 }

-void Manager::Start() {
+void Manager::Start(Core::System& system) {
    if (sessions_started) {
        return;
    }
-
    std::scoped_lock l{mutex};
    for (auto& session : sessions) {
        if (session) {
@@ -66,21 +65,19 @@ void Manager::Start() {
    sessions_started = true;
 }

-void Manager::BufferReleaseAndRegister() {
-    std::scoped_lock l{mutex};
-    for (auto& session : sessions) {
+void Manager::BufferReleaseAndRegister(void *data, Core::System& system) noexcept {
+    Manager* this_ = (Manager*)data;
+    std::scoped_lock l{this_->mutex};
+    for (auto& session : this_->sessions) {
        if (session != nullptr) {
            session->ReleaseAndRegisterBuffers();
        }
    }
 }

-u32 Manager::GetDeviceNames(std::span<Renderer::AudioDevice::AudioDeviceName> names,
-                            [[maybe_unused]] const bool filter) {
+u32 Manager::GetDeviceNames(Core::System& system, std::span<Renderer::AudioDevice::AudioDeviceName> names, [[maybe_unused]] const bool filter) {
    std::scoped_lock l{mutex};
-
-    LinkToManager();
-
+    LinkToManager(system);
    auto input_devices{Sink::GetDeviceListForSink(Settings::values.sink_id.GetValue(), true)};
    if (!input_devices.empty() && !names.empty()) {
        names[0] = Renderer::AudioDevice::AudioDeviceName("Uac");
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@@ -30,31 +33,29 @@ public:
     * @param session_id - Output session_id.
     * @return Result code.
     */
-    Result AcquireSessionId(size_t& session_id);
+    Result AcquireSessionId(Core::System& system, size_t& session_id);

    /**
     * Release a session id on close.
     *
     * @param session_id - Session id to free.
     */
-    void ReleaseSessionId(size_t session_id);
+    void ReleaseSessionId(Core::System& system, const size_t session_id);

    /**
     * Link the audio in manager to the main audio manager.
     *
     * @return Result code.
     */
-    Result LinkToManager();
+    Result LinkToManager(Core::System& system);

    /**
     * Start the audio in manager.
     */
-    void Start();
+    void Start(Core::System& system);

-    /**
-     * Callback function, called by the audio manager when the audio in event is signalled.
-     */
-    void BufferReleaseAndRegister();
+    /// @brief Callback function, called by the audio manager when the audio in event is signalled.
+    static void BufferReleaseAndRegister(void *data, Core::System& system) noexcept;

    /**
     * Get a list of audio in device names.
@@ -64,10 +65,8 @@ public:
     *
     * @return Number of names written.
     */
-    u32 GetDeviceNames(std::span<Renderer::AudioDevice::AudioDeviceName> names, bool filter);
+    u32 GetDeviceNames(Core::System& system, std::span<Renderer::AudioDevice::AudioDeviceName> names, bool filter);

-    /// Core system
-    Core::System& system;
    /// Array of session ids
    std::array<size_t, MaxInSessions> session_ids{};
    /// Array of resource user ids
@@ -11,8 +11,8 @@

 namespace AudioCore {

-AudioManager::AudioManager() {
-    thread = std::jthread([this](std::stop_token stop_token) {
+AudioManager::AudioManager(Core::System& system) {
+    thread = std::jthread([&](std::stop_token stop_token) {
        Common::SetCurrentThreadName("AudioManager");
        std::unique_lock l{events.GetAudioEventLock()};
        events.ClearEvents();
@@ -25,7 +25,7 @@ AudioManager::AudioManager() {
                const auto event_type = Event::Type(i);
                if (events.CheckAudioEventSet(event_type) || timed_out) {
                    if (buffer_events[i]) {
-                        buffer_events[i]();
+                        buffer_events[i](this, system);
                    }
                }
                events.SetAudioEvent(event_type, false);
@@ -16,6 +16,10 @@

 #include "audio_core/audio_event.h"

+namespace Core {
+class System;
+}
+
 union Result;

 namespace AudioCore {
@@ -34,10 +38,9 @@ namespace AudioCore {
 * This is only used by audio in and audio out.
 */
 class AudioManager {
-    using BufferEventFunc = std::function<void()>;
-
+    using BufferEventFunc = void (*)(void *data, Core::System& system) noexcept;
 public:
-    explicit AudioManager();
+    explicit AudioManager(Core::System& system);

    /**
     * Shutdown the audio manager.
@@ -14,12 +14,12 @@

 namespace AudioCore::AudioOut {

-Manager::Manager(Core::System& system_) : system{system_} {
+Manager::Manager(Core::System& system) {
    std::iota(session_ids.begin(), session_ids.end(), 0);
    num_free_sessions = MaxOutSessions;
 }

-Result Manager::AcquireSessionId(size_t& session_id) {
+Result Manager::AcquireSessionId(Core::System& system, size_t& session_id) {
    if (num_free_sessions == 0) {
        LOG_ERROR(Service_Audio, "All 12 Audio Out sessions are in use, cannot create any more");
        return Service::Audio::ResultOutOfSessions;
@@ -30,7 +30,7 @@ Result Manager::AcquireSessionId(size_t& session_id) {
    return ResultSuccess;
 }

-void Manager::ReleaseSessionId(const size_t session_id) {
+void Manager::ReleaseSessionId(Core::System& system, const size_t session_id) {
    std::scoped_lock l{mutex};
    LOG_DEBUG(Service_Audio, "Freeing AudioOut session {}", session_id);
    session_ids[free_session_id] = session_id;
@@ -40,17 +40,17 @@ void Manager::ReleaseSessionId(const size_t session_id) {
    applet_resource_user_ids[session_id] = 0;
 }

-Result Manager::LinkToManager() {
+Result Manager::LinkToManager(Core::System& system) {
    std::scoped_lock l{mutex};
    if (!linked_to_manager) {
-        system.AudioCore().GetAudioManager().SetOutManager(std::bind(&Manager::BufferReleaseAndRegister, this));
+        system.AudioCore().GetAudioManager().SetOutManager(&Manager::BufferReleaseAndRegister);
        linked_to_manager = true;
    }

    return ResultSuccess;
 }

-void Manager::Start() {
+void Manager::Start(Core::System& system) {
    if (sessions_started) {
        return;
    }
@@ -65,19 +65,14 @@ void Manager::Start() {
    sessions_started = true;
 }

-void Manager::BufferReleaseAndRegister() {
-    std::scoped_lock l{mutex};
-    for (auto& session : sessions) {
+void Manager::BufferReleaseAndRegister(void *data, Core::System& system) noexcept {
+    Manager* this_ = (Manager*)data;
+    std::scoped_lock l{this_->mutex};
+    for (auto& session : this_->sessions) {
        if (session != nullptr) {
            session->ReleaseAndRegisterBuffers();
        }
    }
 }

-u32 Manager::GetAudioOutDeviceNames(
-    std::vector<Renderer::AudioDevice::AudioDeviceName>& names) const {
-    names.emplace_back("DeviceOut");
-    return 1;
-}
-
 } // namespace AudioCore::AudioOut
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@@ -29,42 +32,32 @@ public:
     * @param session_id - Output session_id.
     * @return Result code.
     */
-    Result AcquireSessionId(size_t& session_id);
+    Result AcquireSessionId(Core::System& system, size_t& session_id);

    /**
     * Release a session id on close.
     *
     * @param session_id - Session id to free.
     */
-    void ReleaseSessionId(size_t session_id);
+    void ReleaseSessionId(Core::System& system, const size_t session_id);

    /**
     * Link this manager to the main audio manager.
     *
     * @return Result code.
     */
-    Result LinkToManager();
+    Result LinkToManager(Core::System& system);

    /**
     * Start the audio out manager.
     */
-    void Start();
+    void Start(Core::System& system);

    /**
     * Callback function, called by the audio manager when the audio out event is signalled.
     */
-    void BufferReleaseAndRegister();
+    static void BufferReleaseAndRegister(void* data, Core::System& system) noexcept;

-    /**
-     * Get a list of audio out device names.
-     *
-     * @param names     - Output container to write names to.
-     * @return Number of names written.
-     */
-    u32 GetAudioOutDeviceNames(std::vector<Renderer::AudioDevice::AudioDeviceName>& names) const;
-
-    /// Core system
-    Core::System& system;
    /// Array of session ids
    std::array<size_t, MaxOutSessions> session_ids{};
    /// Array of resource user ids
@@ -1,15 +1,20 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

 #include "audio_core/audio_render_manager.h"
 #include "audio_core/common/audio_renderer_parameter.h"
+#include "audio_core/renderer/system_manager.h"
 #include "audio_core/common/feature_support.h"
 #include "core/core.h"

 namespace AudioCore::Renderer {

 Manager::Manager(Core::System& system_)
-    : system{system_}, system_manager{std::make_unique<SystemManager>(system)} {
+    : system_manager{std::make_unique<SystemManager>(system_)}
+{
    std::iota(session_ids.begin(), session_ids.end(), 0);
 }

@@ -59,11 +64,11 @@ u32 Manager::GetSessionCount() const {
    return session_count;
 }

-bool Manager::AddSystem(System& system_) {
+bool Manager::AddSystem(Renderer::System& system_) {
    return system_manager->Add(system_);
 }

-bool Manager::RemoveSystem(System& system_) {
+bool Manager::RemoveSystem(Renderer::System& system_) {
    return system_manager->Remove(system_);
 }

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

@@ -71,7 +74,7 @@ public:
     * @param system - The system to add.
     * @return True if the system was successfully added, otherwise false.
     */
-    bool AddSystem(System& system);
+    bool AddSystem(Renderer::System& system);

    /**
     * Remove a renderer system from the manager.
@@ -79,7 +82,7 @@ public:
     * @param system - The system to remove.
     * @return True if the system was successfully removed, otherwise false.
     */
-    bool RemoveSystem(System& system);
+    bool RemoveSystem(Renderer::System& system);

    /**
     * Free a session id when the system wants to shut down.
@@ -89,8 +92,6 @@ public:
    void ReleaseSessionId(s32 session_id);

 private:
-    /// Core system
-    Core::System& system;
    /// Session ids, -1 when in use
    std::array<s32, MaxRendererSessions> session_ids{};
    /// Number of active renderers
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@@ -16,8 +19,9 @@ namespace AudioCore {
 */
 class WorkbufferAllocator {
 public:
-    explicit WorkbufferAllocator(std::span<u8> buffer_, u64 size_)
-        : buffer{reinterpret_cast<u64>(buffer_.data())}, size{size_} {}
+    explicit WorkbufferAllocator(std::span<u8> buffer_)
+        : buffer{buffer_}
+    {}

    /**
     * Allocate the given count of T elements, aligned to alignment.
@@ -29,36 +33,31 @@ public:
    template <typename T>
    std::span<T> Allocate(u64 count, u64 alignment) {
        u64 out{0};
-        u64 byte_size{count * sizeof(T)};
-
+        u64 byte_size = count * sizeof(T);
        if (byte_size > 0) {
-            auto current{buffer + offset};
+            auto current{uintptr_t(buffer.data()) + offset};
            auto aligned_buffer{Common::AlignUp(current, alignment)};
-            if (aligned_buffer + byte_size <= buffer + size) {
+            if (aligned_buffer + byte_size <= uintptr_t(buffer.data()) + buffer.size()) {
                out = aligned_buffer;
-                offset = byte_size - buffer + aligned_buffer;
+                offset = byte_size - uintptr_t(buffer.data()) + aligned_buffer;
            } else {
                LOG_ERROR(
                    Service_Audio,
                    "Allocated buffer was too small to hold new alloc.\nAllocator size={:08X}, "
                    "offset={:08X}.\nAttempting to allocate {:08X} with alignment={:02X}",
-                    size, offset, byte_size, alignment);
+                    buffer.size(), offset, byte_size, alignment);
                count = 0;
            }
        }
-
        return std::span<T>(reinterpret_cast<T*>(out), count);
    }

-    /**
-     * Align the current offset to the given alignment.
-     *
-     * @param alignment - The required starting alignment.
-     */
+    /// @brief Align the current offset to the given alignment.
+    /// @param alignment - The required starting alignment.
    void Align(u64 alignment) {
-        auto current{buffer + offset};
+        auto current{uintptr_t(buffer.data()) + offset};
        auto aligned_buffer{Common::AlignUp(current, alignment)};
-        offset = 0 - buffer + aligned_buffer;
+        offset = 0 - uintptr_t(buffer.data()) + aligned_buffer;
    }

    /**
@@ -76,7 +75,7 @@ public:
     * @return The size of the current buffer.
     */
    u64 GetSize() const {
-        return size;
+        return buffer.size();
    }

    /**
@@ -85,14 +84,11 @@ public:
     * @return The remaining size left in the buffer.
     */
    u64 GetRemainingSize() const {
-        return size - offset;
+        return buffer.size() - offset;
    }

 private:
-    /// The buffer into which we are allocating.
-    u64 buffer;
-    /// Size of the buffer we're allocating to.
-    u64 size;
+    const std::span<u8> buffer;
    /// Current offset into the buffer, an error will be thrown if it exceeds size.
    u64 offset{};
 };
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@@ -8,42 +11,43 @@
 namespace AudioCore::AudioIn {

 In::In(Core::System& system_, Manager& manager_, Kernel::KEvent* event_, size_t session_id_)
-    : manager{manager_}, parent_mutex{manager.mutex}, event{event_}, system{system_, event,
-                                                                            session_id_} {}
+    : manager{manager_}, parent_mutex{manager.mutex}, event{event_}
+    , audio_system{system_, event, session_id_}
+{}

-void In::Free() {
+void In::Free(Core::System& system) {
    std::scoped_lock l{parent_mutex};
-    manager.ReleaseSessionId(system.GetSessionId());
+    manager.ReleaseSessionId(system, audio_system.GetSessionId());
 }

 System& In::GetSystem() {
-    return system;
+    return audio_system;
 }

 AudioIn::State In::GetState() {
    std::scoped_lock l{parent_mutex};
-    return system.GetState();
+    return audio_system.GetState();
 }

 Result In::StartSystem() {
    std::scoped_lock l{parent_mutex};
-    return system.Start();
+    return audio_system.Start();
 }

 void In::StartSession() {
    std::scoped_lock l{parent_mutex};
-    system.StartSession();
+    audio_system.StartSession();
 }

 Result In::StopSystem() {
    std::scoped_lock l{parent_mutex};
-    return system.Stop();
+    return audio_system.Stop();
 }

 Result In::AppendBuffer(const AudioInBuffer& buffer, u64 tag) {
    std::scoped_lock l{parent_mutex};

-    if (system.AppendBuffer(buffer, tag)) {
+    if (audio_system.AppendBuffer(buffer, tag)) {
        return ResultSuccess;
    }
    return Service::Audio::ResultBufferCountReached;
@@ -51,20 +55,20 @@ Result In::AppendBuffer(const AudioInBuffer& buffer, u64 tag) {

 void In::ReleaseAndRegisterBuffers() {
    std::scoped_lock l{parent_mutex};
-    if (system.GetState() == State::Started) {
-        system.ReleaseBuffers();
-        system.RegisterBuffers();
+    if (audio_system.GetState() == State::Started) {
+        audio_system.ReleaseBuffers();
+        audio_system.RegisterBuffers();
    }
 }

 bool In::FlushAudioInBuffers() {
    std::scoped_lock l{parent_mutex};
-    return system.FlushAudioInBuffers();
+    return audio_system.FlushAudioInBuffers();
 }

 u32 In::GetReleasedBuffers(std::span<u64> tags) {
    std::scoped_lock l{parent_mutex};
-    return system.GetReleasedBuffers(tags);
+    return audio_system.GetReleasedBuffers(tags);
 }

 Kernel::KReadableEvent& In::GetBufferEvent() {
@@ -74,27 +78,27 @@ Kernel::KReadableEvent& In::GetBufferEvent() {

 f32 In::GetVolume() const {
    std::scoped_lock l{parent_mutex};
-    return system.GetVolume();
+    return audio_system.GetVolume();
 }

 void In::SetVolume(f32 volume) {
    std::scoped_lock l{parent_mutex};
-    system.SetVolume(volume);
+    audio_system.SetVolume(volume);
 }

 bool In::ContainsAudioBuffer(u64 tag) const {
    std::scoped_lock l{parent_mutex};
-    return system.ContainsAudioBuffer(tag);
+    return audio_system.ContainsAudioBuffer(tag);
 }

 u32 In::GetBufferCount() const {
    std::scoped_lock l{parent_mutex};
-    return system.GetBufferCount();
+    return audio_system.GetBufferCount();
 }

 u64 In::GetPlayedSampleCount() const {
    std::scoped_lock l{parent_mutex};
-    return system.GetPlayedSampleCount();
+    return audio_system.GetPlayedSampleCount();
 }

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

@@ -30,7 +33,7 @@ public:
    /**
     * Free this audio in from the audio in manager.
     */
-    void Free();
+    void Free(Core::System& system);

    /**
     * Get this audio in's system.
@@ -141,7 +144,7 @@ private:
    /// Buffer event, signalled when buffers are ready to be released
    Kernel::KEvent* event;
    /// Main audio in system
-    System system;
+    System audio_system;
 };

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

@@ -8,42 +11,43 @@
 namespace AudioCore::AudioOut {

 Out::Out(Core::System& system_, Manager& manager_, Kernel::KEvent* event_, size_t session_id_)
-    : manager{manager_}, parent_mutex{manager.mutex}, event{event_}, system{system_, event,
-                                                                            session_id_} {}
+    : manager{manager_}, parent_mutex{manager.mutex}, event{event_}
+    , audio_system{system_, event, session_id_}
+{}

-void Out::Free() {
+void Out::Free(Core::System& system) {
    std::scoped_lock l{parent_mutex};
-    manager.ReleaseSessionId(system.GetSessionId());
+    manager.ReleaseSessionId(system, audio_system.GetSessionId());
 }

 System& Out::GetSystem() {
-    return system;
+    return audio_system;
 }

 AudioOut::State Out::GetState() {
    std::scoped_lock l{parent_mutex};
-    return system.GetState();
+    return audio_system.GetState();
 }

 Result Out::StartSystem() {
    std::scoped_lock l{parent_mutex};
-    return system.Start();
+    return audio_system.Start();
 }

 void Out::StartSession() {
    std::scoped_lock l{parent_mutex};
-    system.StartSession();
+    audio_system.StartSession();
 }

 Result Out::StopSystem() {
    std::scoped_lock l{parent_mutex};
-    return system.Stop();
+    return audio_system.Stop();
 }

 Result Out::AppendBuffer(const AudioOutBuffer& buffer, const u64 tag) {
    std::scoped_lock l{parent_mutex};

-    if (system.AppendBuffer(buffer, tag)) {
+    if (audio_system.AppendBuffer(buffer, tag)) {
        return ResultSuccess;
    }
    return Service::Audio::ResultBufferCountReached;
@@ -51,20 +55,20 @@ Result Out::AppendBuffer(const AudioOutBuffer& buffer, const u64 tag) {

 void Out::ReleaseAndRegisterBuffers() {
    std::scoped_lock l{parent_mutex};
-    if (system.GetState() == State::Started) {
-        system.ReleaseBuffers();
-        system.RegisterBuffers();
+    if (audio_system.GetState() == State::Started) {
+        audio_system.ReleaseBuffers();
+        audio_system.RegisterBuffers();
    }
 }

 bool Out::FlushAudioOutBuffers() {
    std::scoped_lock l{parent_mutex};
-    return system.FlushAudioOutBuffers();
+    return audio_system.FlushAudioOutBuffers();
 }

 u32 Out::GetReleasedBuffers(std::span<u64> tags) {
    std::scoped_lock l{parent_mutex};
-    return system.GetReleasedBuffers(tags);
+    return audio_system.GetReleasedBuffers(tags);
 }

 Kernel::KReadableEvent& Out::GetBufferEvent() {
@@ -74,27 +78,27 @@ Kernel::KReadableEvent& Out::GetBufferEvent() {

 f32 Out::GetVolume() const {
    std::scoped_lock l{parent_mutex};
-    return system.GetVolume();
+    return audio_system.GetVolume();
 }

 void Out::SetVolume(const f32 volume) {
    std::scoped_lock l{parent_mutex};
-    system.SetVolume(volume);
+    audio_system.SetVolume(volume);
 }

 bool Out::ContainsAudioBuffer(const u64 tag) const {
    std::scoped_lock l{parent_mutex};
-    return system.ContainsAudioBuffer(tag);
+    return audio_system.ContainsAudioBuffer(tag);
 }

 u32 Out::GetBufferCount() const {
    std::scoped_lock l{parent_mutex};
-    return system.GetBufferCount();
+    return audio_system.GetBufferCount();
 }

 u64 Out::GetPlayedSampleCount() const {
    std::scoped_lock l{parent_mutex};
-    return system.GetPlayedSampleCount();
+    return audio_system.GetPlayedSampleCount();
 }

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

@@ -30,7 +33,7 @@ public:
    /**
     * Free this audio out from the audio out manager.
     */
-    void Free();
+    void Free(Core::System& system);

    /**
     * Get this audio out's system.
@@ -141,7 +144,7 @@ private:
    /// Buffer event, signalled when buffers are ready to be released
    Kernel::KEvent* event;
    /// Main audio out system
-    System system;
+    System audio_system;
 };

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

@@ -13,56 +16,48 @@
 namespace AudioCore::Renderer {

 Renderer::Renderer(Core::System& system_, Manager& manager_, Kernel::KEvent* rendered_event)
-    : core{system_}, manager{manager_}, system{system_, rendered_event} {}
+    : system{system_}, manager{manager_}
+    , audio_system{system_, rendered_event}
+{}

-Result Renderer::Initialize(const AudioRendererParameterInternal& params,
-                            Kernel::KTransferMemory* transfer_memory,
-                            const u64 transfer_memory_size, Kernel::KProcess* process_handle,
-                            const u64 applet_resource_user_id, const s32 session_id) {
+Result Renderer::Initialize(const AudioRendererParameterInternal& params, Kernel::KTransferMemory* transfer_memory, const u64 transfer_memory_size, Kernel::KProcess* process_handle, const u64 applet_resource_user_id, const s32 session_id) {
    if (params.execution_mode == ExecutionMode::Auto) {
-        if (!manager.AddSystem(system)) {
-            LOG_ERROR(Service_Audio,
-                      "Both Audio Render sessions are in use, cannot create any more");
+        if (!manager.AddSystem(audio_system)) {
+            LOG_ERROR(Service_Audio, "Both Audio Render sessions are in use, cannot create any more");
            return Service::Audio::ResultOutOfSessions;
        }
        system_registered = true;
    }

    initialized = true;
-    system.Initialize(params, transfer_memory, transfer_memory_size, process_handle,
-                      applet_resource_user_id, session_id);
-
+    audio_system.Initialize(params, transfer_memory, transfer_memory_size, process_handle, applet_resource_user_id, session_id);
    return ResultSuccess;
 }

 void Renderer::Finalize() {
-    auto session_id{system.GetSessionId()};
-
-    system.Finalize();
-
+    auto const session_id{audio_system.GetSessionId()};
+    audio_system.Finalize();
    if (system_registered) {
-        manager.RemoveSystem(system);
+        manager.RemoveSystem(audio_system);
        system_registered = false;
    }
-
    manager.ReleaseSessionId(session_id);
 }

 System& Renderer::GetSystem() {
-    return system;
+    return audio_system;
 }

 void Renderer::Start() {
-    system.Start();
+    audio_system.Start();
 }

 void Renderer::Stop() {
-    system.Stop();
+    audio_system.Stop();
 }

-Result Renderer::RequestUpdate(std::span<const u8> input, std::span<u8> performance,
-                               std::span<u8> output) {
-    return system.Update(input, performance, output);
+Result Renderer::RequestUpdate(std::span<const u8> input, std::span<u8> performance, std::span<u8> output) {
+    return audio_system.Update(input, performance, output);
 }

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

@@ -84,7 +87,7 @@ public:

 private:
    /// System core
-    Core::System& core;
+    Core::System& system;
    /// Manager this renderer is registered with
    Manager& manager;
    /// Is the audio renderer initialized?
@@ -92,7 +95,7 @@ private:
    /// Is the system registered with the manager?
    bool system_registered{};
    /// Audio render system, main driver of audio rendering
-    System system;
+    System audio_system;
 };

 } // namespace Renderer
@@ -145,7 +145,7 @@ Result System::Initialize(const AudioRendererParameterInternal& params,
    PoolMapper pool_mapper(process_handle, false);
    pool_mapper.InitializeSystemPool(memory_pool_info, workbuffer.get(), workbuffer_size);

-    WorkbufferAllocator allocator({workbuffer.get(), workbuffer_size}, workbuffer_size);
+    WorkbufferAllocator allocator({workbuffer.get(), workbuffer_size});

    samples_workbuffer =
        allocator.Allocate<s32>((voice_channels + mix_buffer_count) * sample_count, 0x10);
@@ -156,14 +156,6 @@ void UpdateGPUAccuracy() {
    values.current_gpu_accuracy = values.gpu_accuracy.GetValue();
 }

-bool IsGPULevelLow() {
-    return values.current_gpu_accuracy == GpuAccuracy::Low;
-}
-
-bool IsGPULevelMedium() {
-    return values.current_gpu_accuracy == GpuAccuracy::Medium;
-}
-
 bool IsGPULevelHigh() {
    return values.current_gpu_accuracy == GpuAccuracy::High;
 }
@@ -176,6 +168,22 @@ bool IsDMALevelSafe() {
    return values.dma_accuracy.GetValue() == DmaAccuracy::Safe;
 }

+bool IsGPUFenceBehaviorDefault() {
+    return values.gpu_fence_behavior.GetValue() == GpuFenceBehavior::Default;
+}
+
+bool IsGPUFenceBehaviorBalanced() {
+    return values.gpu_fence_behavior.GetValue() == GpuFenceBehavior::Balanced;
+}
+
+bool IsGPUFenceBehaviorAccurate() {
+    return values.gpu_fence_behavior.GetValue() == GpuFenceBehavior::Accurate;
+}
+
+bool IsGPUFenceBehaviorStrict() {
+    return values.gpu_fence_behavior.GetValue() == GpuFenceBehavior::Strict;
+}
+
 bool IsFastmemEnabled() {
    if (values.cpu_accuracy.GetValue() == Settings::CpuAccuracy::Debugging)
        return bool(values.cpuopt_fastmem);
@@ -420,7 +420,7 @@ struct Values {
 #ifdef __ANDROID__
                                                      GpuAccuracy::Low,
 #else
-                                                      GpuAccuracy::Medium,
+                                                      GpuAccuracy::High,
 #endif
                                                      "gpu_accuracy",
                                                      Category::RendererAdvanced,
@@ -428,7 +428,7 @@ struct Values {
                                                      true,
                                                      true};

-    GpuAccuracy current_gpu_accuracy{GpuAccuracy::Medium};
+    GpuAccuracy current_gpu_accuracy{GpuAccuracy::High};

    SwitchableSetting<DmaAccuracy, true> dma_accuracy{linkage,
                                                      DmaAccuracy::Default,
@@ -438,6 +438,16 @@ struct Values {
                                                      true,
                                                      true};

+    SwitchableSetting<GpuFenceBehavior, true> gpu_fence_behavior{linkage,
+                                                                 GpuFenceBehavior::Default,
+                                                                 GpuFenceBehavior::Default,
+                                                                 GpuFenceBehavior::Strict,
+                                                                 "gpu_fence_behavior",
+                                                                 Category::RendererAdvanced,
+                                                                 Specialization::Default,
+                                                                 true,
+                                                                 true};
+
    SwitchableSetting<VramUsageMode, true> vram_usage_mode{linkage,
                                                           VramUsageMode::Conservative,
                                                           "vram_usage_mode",
@@ -545,13 +555,6 @@ struct Values {
                                                        Specialization::Default,
                                                        true,
                                                        true};
-    SwitchableSetting<bool> antiflicker{linkage,
-                                        false,
-                                        "antiflicker",
-                                        Category::RendererHacks,
-                                        Specialization::Default,
-                                        true,
-                                        true};
    SwitchableSetting<bool> async_presentation{linkage,
 #ifdef __ANDROID__
                                               false,
@@ -871,13 +874,16 @@ extern Values values;
 bool getDebugKnobAt(u8 i);

 void UpdateGPUAccuracy();
-bool IsGPULevelLow();
-bool IsGPULevelMedium();
 bool IsGPULevelHigh();

 bool IsDMALevelDefault();
 bool IsDMALevelSafe();

+bool IsGPUFenceBehaviorDefault();
+bool IsGPUFenceBehaviorBalanced();
+bool IsGPUFenceBehaviorAccurate();
+bool IsGPUFenceBehaviorStrict();
+
 bool IsFastmemEnabled();
 void SetNceEnabled(bool is_64bit);
 bool IsNceEnabled();
@@ -135,8 +135,9 @@ ENUM(FramePacingMode, Target_Auto, Target_30, Target_60, Target_90, Target_120);
 ENUM(VSyncMode, Immediate, Mailbox, Fifo, FifoRelaxed);
 ENUM(VramUsageMode, Conservative, Aggressive);
 ENUM(RendererBackend, OpenGL_GLSL, Vulkan, Null, OpenGL_GLASM, OpenGL_SPIRV);
-ENUM(GpuAccuracy, Low, Medium, High);
+ENUM(GpuAccuracy, Low, High);
 ENUM(DmaAccuracy, Default, Unsafe, Safe);
+ENUM(GpuFenceBehavior, Default, Immediate, Balanced, Accurate, Strict);
 ENUM(CpuBackend, Dynarmic, Nce);
 ENUM(CpuAccuracy, Auto, Accurate, Unsafe, Paranoid, Debugging);
 ENUM(CpuClock, Off, Boost, Fast)
@@ -140,7 +140,7 @@ void ProgramMetadata::LoadManual(bool is_64_bit, ProgramAddressSpaceType address
 }

 bool ProgramMetadata::Is64BitProgram() const {
-    return npdm_header.has_64_bit_instructions;
+    return bool(npdm_header.has_64_bit_instructions);
 }

 ProgramAddressSpaceType ProgramMetadata::GetAddressSpaceType() const {
@@ -50,7 +50,7 @@ IAudioIn::IAudioIn(Core::System& system_, Manager& manager, size_t session_id,
 }

 IAudioIn::~IAudioIn() {
-    impl->Free();
+    impl->Free(system);
    service_context.CloseEvent(event);
    process->Close(system.Kernel());
 }
@@ -1,3 +1,6 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
 // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@@ -65,7 +68,7 @@ Result IAudioInManager::OpenAudioInAuto(
 Result IAudioInManager::ListAudioInsAutoFiltered(
    OutArray<AudioDeviceName, BufferAttr_HipcAutoSelect> out_audio_ins, Out<u32> out_count) {
    LOG_DEBUG(Service_Audio, "called");
-    *out_count = impl->GetDeviceNames(out_audio_ins, true);
+    *out_count = impl->GetDeviceNames(system, out_audio_ins, true);
    R_SUCCEED();
 }

@@ -90,8 +93,8 @@ Result IAudioInManager::OpenAudioInProtocolSpecified(

    size_t new_session_id{};

-    R_TRY(impl->LinkToManager());
-    R_TRY(impl->AcquireSessionId(new_session_id));
+    R_TRY(impl->LinkToManager(system));
+    R_TRY(impl->AcquireSessionId(system, new_session_id));

    LOG_DEBUG(Service_Audio, "Opening new AudioIn, session_id={}, free sessions={}", new_session_id,
              impl->num_free_sessions);
@@ -46,7 +46,7 @@ IAudioOut::IAudioOut(Core::System& system_, Manager& manager, size_t session_id,
 }

 IAudioOut::~IAudioOut() {
-    impl->Free();
+    impl->Free(system);
    service_context.CloseEvent(event);
    process->Close(system.Kernel());
 }
@@ -77,8 +77,8 @@ Result IAudioOutManager::OpenAudioOutAuto(
    }

    size_t new_session_id{};
-    R_TRY(impl->LinkToManager());
-    R_TRY(impl->AcquireSessionId(new_session_id));
+    R_TRY(impl->LinkToManager(system));
+    R_TRY(impl->AcquireSessionId(system, new_session_id));

    const auto device_name = Common::StringFromBuffer(name[0].name);
    LOG_DEBUG(Service_Audio, "Opening new AudioOut, sessionid={}, free sessions={}", new_session_id,
@@ -1662,17 +1662,17 @@ bool EmulatedController::IsControllerFullkey(bool use_temporary_value) const {
 bool EmulatedController::IsControllerSupported(bool use_temporary_value) const {
    const auto type = is_configuring.load() && use_temporary_value ? tmp_npad_type.load() : npad_type.load();
    switch (type) {
-    case NpadStyleIndex::Fullkey: return supported_style_tag.fullkey;
-    case NpadStyleIndex::Handheld: return supported_style_tag.handheld;
-    case NpadStyleIndex::JoyconDual: return supported_style_tag.joycon_dual;
-    case NpadStyleIndex::JoyconLeft: return supported_style_tag.joycon_left;
-    case NpadStyleIndex::JoyconRight: return supported_style_tag.joycon_right;
-    case NpadStyleIndex::GameCube: return supported_style_tag.gamecube;
-    case NpadStyleIndex::Pokeball: return supported_style_tag.palma;
-    case NpadStyleIndex::NES: return supported_style_tag.lark;
-    case NpadStyleIndex::SNES: return supported_style_tag.lucia;
-    case NpadStyleIndex::N64: return supported_style_tag.lagoon;
-    case NpadStyleIndex::SegaGenesis: return supported_style_tag.lager;
+    case NpadStyleIndex::Fullkey:     return bool(supported_style_tag.fullkey);
+    case NpadStyleIndex::Handheld:    return bool(supported_style_tag.handheld);
+    case NpadStyleIndex::JoyconDual:  return bool(supported_style_tag.joycon_dual);
+    case NpadStyleIndex::JoyconLeft:  return bool(supported_style_tag.joycon_left);
+    case NpadStyleIndex::JoyconRight: return bool(supported_style_tag.joycon_right);
+    case NpadStyleIndex::GameCube:    return bool(supported_style_tag.gamecube);
+    case NpadStyleIndex::Pokeball:    return bool(supported_style_tag.palma);
+    case NpadStyleIndex::NES:         return bool(supported_style_tag.lark);
+    case NpadStyleIndex::SNES:        return bool(supported_style_tag.lucia);
+    case NpadStyleIndex::N64:         return bool(supported_style_tag.lagoon);
+    case NpadStyleIndex::SegaGenesis: return bool(supported_style_tag.lager);
    default: return false;
    }
 }
@@ -66,7 +66,7 @@ Result NpadAbstractSixAxisHandler::UpdateSixAxisState() {
            continue;
        }
        auto& npad_entry = data->shared_memory_format->npad.npad_entry[NpadIdTypeToIndex(npad_id)];
-        UpdateSixaxisInternalState(npad_entry, data->aruid, data->flag.enable_six_axis_sensor);
+        UpdateSixaxisInternalState(npad_entry, data->aruid, bool(data->flag.enable_six_axis_sensor));
    }
    return ResultSuccess;
 }
@@ -78,7 +78,7 @@ Result NpadAbstractSixAxisHandler::UpdateSixAxisState(u64 aruid) {
        return ResultSuccess;
    }
    auto& npad_entry = data->shared_memory_format->npad.npad_entry[NpadIdTypeToIndex(npad_id)];
-    UpdateSixaxisInternalState(npad_entry, data->aruid, data->flag.enable_six_axis_sensor);
+    UpdateSixaxisInternalState(npad_entry, data->aruid, bool(data->flag.enable_six_axis_sensor));
    return ResultSuccess;
 }

@@ -89,7 +89,7 @@ Result NpadAbstractSixAxisHandler::UpdateSixAxisState2(u64 aruid) {
        return ResultSuccess;
    }
    auto& npad_internal_state = aruid_data->shared_memory_format->npad.npad_entry[npad_index];
-    UpdateSixaxisInternalState(npad_internal_state, aruid, aruid_data->flag.enable_six_axis_sensor);
+    UpdateSixaxisInternalState(npad_internal_state, aruid, bool(aruid_data->flag.enable_six_axis_sensor));
    return ResultSuccess;
 }

@@ -24,7 +24,7 @@ void NPadData::SetNpadAnalogStickUseCenterClamp(bool is_enabled) {
 }

 bool NPadData::GetNpadAnalogStickUseCenterClamp() const {
-    return status.use_center_clamp;
+    return bool(status.use_center_clamp);
 }

 void NPadData::SetNpadSystemExtStateEnabled(bool is_enabled) {
@@ -32,7 +32,7 @@ void NPadData::SetNpadSystemExtStateEnabled(bool is_enabled) {
 }

 bool NPadData::GetNpadSystemExtState() const {
-    return status.system_ext_state;
+    return bool(status.system_ext_state);
 }

 Result NPadData::SetSupportedNpadIdType(std::span<const Core::HID::NpadIdType> list) {
@@ -42,18 +42,14 @@ Result NPadData::SetSupportedNpadIdType(std::span<const Core::HID::NpadIdType> l
    }

    supported_npad_id_types_count = list.size();
-    memcpy(supported_npad_id_types.data(), list.data(),
-           list.size() * sizeof(Core::HID::NpadIdType));
-
+    std::memcpy(supported_npad_id_types.data(), list.data(), list.size() * sizeof(Core::HID::NpadIdType));
    return ResultSuccess;
 }

 std::size_t NPadData::GetSupportedNpadIdType(std::span<Core::HID::NpadIdType> out_list) const {
    std::size_t out_size = (std::min)(supported_npad_id_types_count, out_list.size());

-    memcpy(out_list.data(), supported_npad_id_types.data(),
-           out_size * sizeof(Core::HID::NpadIdType));
-
+    std::memcpy(out_list.data(), supported_npad_id_types.data(), out_size * sizeof(Core::HID::NpadIdType));
    return out_size;
 }

@@ -154,27 +150,27 @@ bool NPadData::IsNpadStyleIndexSupported(Core::HID::NpadStyleIndex style_index)
    Core::HID::NpadStyleTag style = {supported_npad_style_set};
    switch (style_index) {
    case Core::HID::NpadStyleIndex::Fullkey:
-        return style.fullkey;
+        return bool(style.fullkey);
    case Core::HID::NpadStyleIndex::Handheld:
-        return style.handheld;
+        return bool(style.handheld);
    case Core::HID::NpadStyleIndex::JoyconDual:
-        return style.joycon_dual;
+        return bool(style.joycon_dual);
    case Core::HID::NpadStyleIndex::JoyconLeft:
-        return style.joycon_left;
+        return bool(style.joycon_left);
    case Core::HID::NpadStyleIndex::JoyconRight:
-        return style.joycon_right;
+        return bool(style.joycon_right);
    case Core::HID::NpadStyleIndex::GameCube:
-        return style.gamecube;
+        return bool(style.gamecube);
    case Core::HID::NpadStyleIndex::Pokeball:
-        return style.palma;
+        return bool(style.palma);
    case Core::HID::NpadStyleIndex::NES:
-        return style.lark;
+        return bool(style.lark);
    case Core::HID::NpadStyleIndex::SNES:
-        return style.lucia;
+        return bool(style.lucia);
    case Core::HID::NpadStyleIndex::N64:
-        return style.lagoon;
+        return bool(style.lagoon);
    case Core::HID::NpadStyleIndex::SegaGenesis:
-        return style.lager;
+        return bool(style.lager);
    default:
        return false;
    }
@@ -185,7 +181,7 @@ void NPadData::SetLrAssignmentMode(bool is_enabled) {
 }

 bool NPadData::GetLrAssignmentMode() const {
-    return status.lr_assignment_mode;
+    return bool(status.lr_assignment_mode);
 }

 void NPadData::SetAssigningSingleOnSlSrPress(bool is_enabled) {
@@ -193,7 +189,7 @@ void NPadData::SetAssigningSingleOnSlSrPress(bool is_enabled) {
 }

 bool NPadData::GetAssigningSingleOnSlSrPress() const {
-    return status.assigning_single_on_sl_sr_press;
+    return bool(status.assigning_single_on_sl_sr_press);
 }

 void NPadData::SetHomeProtectionEnabled(bool is_enabled, Core::HID::NpadIdType npad_id) {
@@ -548,7 +548,7 @@ void TouchResource::OnTouchUpdate(s64 timestamp) {
            }

            auto& touch_shared = applet_data->shared_memory_format->touch_screen;
-            StorePreviousTouchState(previous_touch_state, data.finger_map, current_touch_state, applet_data->flag.enable_touchscreen);
+            StorePreviousTouchState(previous_touch_state, data.finger_map, current_touch_state, bool(applet_data->flag.enable_touchscreen));
            touch_shared.touch_screen_lifo.WriteNextEntry(current_touch_state);
        }
    }
@@ -193,9 +193,6 @@ std::unique_ptr<TranslationMap> InitializeTranslations(QObject* parent) {
    INSERT(Settings, skip_cpu_inner_invalidation, tr("Skip CPU Inner Invalidation"),
           tr("Skips certain cache invalidations during memory updates, reducing CPU usage and "
              "improving latency. This may cause soft-crashes."));
-    INSERT(Settings, antiflicker, tr("Anti-Flicker"),
-           tr("Forces GPU fence callbacks to wait for submitted GPU work.\n"
-              "Use with Fast GPU mode, to avoid flicker with lower performance impact."));
    INSERT(Settings, vsync_mode, tr("VSync Mode:"),
           tr("FIFO (VSync) does not drop frames or exhibit tearing but is limited by the screen "
              "refresh rate.\nFIFO Relaxed allows tearing as it recovers from a slow down.\n"
@@ -223,14 +220,14 @@ std::unique_ptr<TranslationMap> InitializeTranslations(QObject* parent) {
           tr("Controls the quality of texture rendering at oblique angles.\nSafe to set at 16x on "
              "most GPUs."));
    INSERT(Settings, gpu_accuracy, tr("GPU Mode:"),
-           tr("Controls the GPU emulation mode.\nMost games render fine with Fast or Balanced "
-              "modes, but Accurate is still "
+           tr("Controls the GPU emulation mode.\nMost games render fine with Fast, but Accurate is still "
              "required for some.\nParticles tend to only render correctly with Accurate mode."));
    INSERT(Settings, dma_accuracy, tr("DMA Accuracy:"),
-           tr("Controls the DMA precision accuracy. Safe precision fixes issues in some games but "
-              "may degrade performance."));
+           tr("Controls the DMA read mode.\nUnsafe is faster, while Safe is more stable and can fix issues in some games.\nDefault follows the GPU Accuracy setting."));
+    INSERT(Settings, gpu_fence_behavior, tr("GPU Fence Behavior:"),
+           tr("Controls the GPU fence synchronization behavior.\nImmediate is the fastest option, but can introduce some issues.\nBalanced offers better compatibility and may fix issues in some games.\nAccurate further improves compatibility at the cost of some performance.\nStrict is the slowest option, but can fix issues that require stricter synchronization.\nDefault follows the GPU Accuracy setting."));
    INSERT(Settings, enable_gpu_buffer_readback, tr("Enable GPU buffer readback"),
-           tr("Preserves GPU-modified buffer data by reading it back before uploads.\nSome games require this to render certain effects properly.\nMay cause issues if the hardware cannot handle the additional workload."));
+           tr("Preserves GPU-modified data by reading it back before uploading.\nSome games require this to render certain effects properly."));
    INSERT(Settings, use_asynchronous_shaders, tr("Enable asynchronous shader compilation"),
           tr("May reduce shader stutter."));
    INSERT(Settings, fast_gpu_time, tr("Fast GPU Time"),
@@ -430,7 +427,6 @@ std::unique_ptr<ComboboxTranslationMap> ComboboxEnumeration(QObject* parent) {
    translations->insert({Settings::EnumMetadata<Settings::GpuAccuracy>::Index(),
                          {
                              PAIR(GpuAccuracy, Low, tr("Fast")),
-                              PAIR(GpuAccuracy, Medium, tr("Balanced")),
                              PAIR(GpuAccuracy, High, tr("Accurate")),
                          }});
    translations->insert({Settings::EnumMetadata<Settings::DmaAccuracy>::Index(),
@@ -439,6 +435,14 @@ std::unique_ptr<ComboboxTranslationMap> ComboboxEnumeration(QObject* parent) {
                              PAIR(DmaAccuracy, Unsafe, tr("Unsafe (fast)")),
                              PAIR(DmaAccuracy, Safe, tr("Safe (stable)")),
                          }});
+    translations->insert({Settings::EnumMetadata<Settings::GpuFenceBehavior>::Index(),
+                          {
+                              PAIR(GpuFenceBehavior, Default, tr("Default")),
+                              PAIR(GpuFenceBehavior, Immediate, tr("Immediate")),
+                              PAIR(GpuFenceBehavior, Balanced, tr("Balanced")),
+                              PAIR(GpuFenceBehavior, Accurate, tr("Accurate")),
+                              PAIR(GpuFenceBehavior, Strict, tr("Strict")),
+                          }});
    translations->insert(
        {Settings::EnumMetadata<Settings::CpuAccuracy>::Index(),
         {
@@ -64,7 +64,6 @@ static const std::map<Settings::ConsoleMode, QString> use_docked_mode_texts_map

 static const std::map<Settings::GpuAccuracy, QString> gpu_accuracy_texts_map = {
    {Settings::GpuAccuracy::Low, QStringLiteral(QT_TRANSLATE_NOOP("MainWindow", "Fast"))},
-    {Settings::GpuAccuracy::Medium, QStringLiteral(QT_TRANSLATE_NOOP("MainWindow", "Balanced"))},
    {Settings::GpuAccuracy::High, QStringLiteral(QT_TRANSLATE_NOOP("MainWindow", "Accurate"))},
 };

@@ -223,9 +223,6 @@ struct Values {
    // perf overlay
    Setting<bool> show_perf_overlay{linkage, false, "show_perf_overlay", Category::UiGameList};

-    // Compatibility List
-    Setting<bool> show_compat{linkage, true, "show_compat", Category::UiGameList};
-
    // Size & File Types Column
    Setting<bool> show_size{linkage, true, "show_size", Category::UiGameList};
    Setting<bool> show_types{linkage, true, "show_types", Category::UiGameList};
@@ -52,7 +52,7 @@ void GameListModel::PopulateAsync(QVector<UISettings::GameDir>& game_dirs) {
    current_worker.reset();
    removeRows(0, rowCount());

-    current_worker = std::make_unique<GameListWorker>(vfs, provider, game_dirs, compatibility_list,
+    current_worker = std::make_unique<GameListWorker>(vfs, provider, game_dirs,
                                                      play_time_manager, system);

    connect(current_worker.get(), &GameListWorker::DataAvailable, this, &GameListModel::WorkerEvent,
@@ -157,50 +157,6 @@ void GameListModel::RemoveFavorite(u64 program_id) {
    }
 }

-void GameListModel::LoadCompatibilityList() {
-    QFile compat_list{QStringLiteral(":compatibility_list/compatibility_list.json")};
-
-    if (!compat_list.open(QFile::ReadOnly | QFile::Text)) {
-        LOG_ERROR(Frontend, "Unable to open game compatibility list");
-        return;
-    }
-
-    if (compat_list.size() == 0) {
-        LOG_WARNING(Frontend, "Game compatibility list is empty");
-        return;
-    }
-
-    const QByteArray content = compat_list.readAll();
-    if (content.isEmpty()) {
-        LOG_ERROR(Frontend, "Unable to completely read game compatibility list");
-        return;
-    }
-
-    const QJsonDocument json = QJsonDocument::fromJson(content);
-    const QJsonArray arr = json.array();
-
-    for (const QJsonValue& value : arr) {
-        const QJsonObject game = value.toObject();
-        const QString compatibility_key = QStringLiteral("compatibility");
-
-        if (!game.contains(compatibility_key) || !game[compatibility_key].isDouble()) {
-            continue;
-        }
-
-        const int compatibility = game[compatibility_key].toInt();
-        const QString directory = game[QStringLiteral("directory")].toString();
-        const QJsonArray ids = game[QStringLiteral("releases")].toArray();
-
-        for (const QJsonValue& id_ref : ids) {
-            const QJsonObject id_object = id_ref.toObject();
-            const QString id = id_object[QStringLiteral("id")].toString();
-
-            compatibility_list.emplace(id.toUpper().toStdString(),
-                                       std::make_pair(QString::number(compatibility), directory));
-        }
-    }
-}
-
 void GameListModel::Repopulate() {
    current_worker.reset();
    QtCommon::system->GetFileSystemController().CreateFactories(*QtCommon::vfs);
@@ -236,7 +192,6 @@ void GameListModel::ResetExternalWatcher() {

 void GameListModel::RetranslateUI() {
    setHeaderData(COLUMN_NAME, Qt::Horizontal, tr("Name"));
-    setHeaderData(COLUMN_COMPATIBILITY, Qt::Horizontal, tr("Compatibility"));
    setHeaderData(COLUMN_ADD_ONS, Qt::Horizontal, tr("Add-ons"));
    setHeaderData(COLUMN_FILE_TYPE, Qt::Horizontal, tr("File type"));
    setHeaderData(COLUMN_SIZE, Qt::Horizontal, tr("Size"));
@@ -247,10 +202,6 @@ QFileSystemWatcher* GameListModel::GetWatcher() const {
    return watcher;
 }

-const CompatibilityList& GameListModel::GetCompatibilityList() const {
-    return compatibility_list;
-}
-
 void GameListModel::SetFlat(bool flat) {
    m_flat = flat;
 }
@@ -12,7 +12,6 @@
 #include "common/common_types.h"
 #include "frontend_common/play_time_manager.h"
 #include "qt_common/config/uisettings.h"
-#include "yuzu/compatibility_list.h"

 namespace Core {
 class System;
@@ -37,7 +36,6 @@ public:
        COLUMN_SIZE,
        COLUMN_PLAY_TIME,
        COLUMN_ADD_ONS,
-        COLUMN_COMPATIBILITY,
        COLUMN_COUNT,
    };

@@ -62,14 +60,10 @@ public:
    void RefreshExternalContent();
    void ResetExternalWatcher();

-    void LoadCompatibilityList();
-
    void RetranslateUI();

    QFileSystemWatcher* GetWatcher() const;

-    const CompatibilityList& GetCompatibilityList() const;
-
    void SetFlat(bool flat);

 signals:
@@ -89,7 +83,6 @@ private:

    std::shared_ptr<FileSys::VfsFilesystem> vfs;
    FileSys::ManualContentProvider* provider;
-    CompatibilityList compatibility_list;
    const PlayTime::PlayTimeManager& play_time_manager;
    Core::System& system;

@@ -33,7 +33,6 @@
 #include "qt_common/qt_common.h"

 #include "qt_common/game_list/game_list_p.h"
-#include "yuzu/compatibility_list.h"

 #include "qt_common/game_list/model.h"
 #include "qt_common/game_list/worker.h"
@@ -203,14 +202,8 @@ QString FormatPatchNameVersions(const FileSys::PatchManager& patch_manager,
 QList<QStandardItem*> MakeGameListEntry(const std::string& path, const std::string& name,
                                        const std::size_t size, const std::vector<u8>& icon,
                                        Loader::AppLoader& loader, u64 program_id,
-                                        const CompatibilityList& compatibility_list,
                                        const PlayTime::PlayTimeManager& play_time_manager,
                                        const FileSys::PatchManager& patch) {
-    auto const it = FindMatchingCompatibilityEntry(compatibility_list, program_id);
-    // The game list uses 99 as compatibility number for untested games
-    QString compatibility =
-        it != compatibility_list.end() ? it->second.first : QStringLiteral("99");
-
    auto const file_type = loader.GetFileType();
    auto const file_type_string = QString::fromStdString(Loader::GetFileTypeString(file_type));

@@ -227,7 +220,6 @@ QList<QStandardItem*> MakeGameListEntry(const std::string& path, const std::stri
        new GameListItemSize(size),
        new GameListItemPlayTime(play_time),
        new GameListItem(patch_versions),
-        new GameListItemCompat(compatibility),
    };
 }
 } // Anonymous namespace
@@ -235,11 +227,10 @@ QList<QStandardItem*> MakeGameListEntry(const std::string& path, const std::stri
 GameListWorker::GameListWorker(FileSys::VirtualFilesystem vfs_,
                               FileSys::ManualContentProvider* provider_,
                               QVector<UISettings::GameDir>& game_dirs_,
-                               const CompatibilityList& compatibility_list_,
                               const PlayTime::PlayTimeManager& play_time_manager_,
                               Core::System& system_)
    : vfs{std::move(vfs_)}, provider{provider_}, game_dirs{game_dirs_},
-      compatibility_list{compatibility_list_}, play_time_manager{play_time_manager_},
+      play_time_manager{play_time_manager_},
      system{system_} {
    // We want the game list to manage our lifetime.
    setAutoDelete(false);
@@ -335,7 +326,7 @@ void GameListWorker::AddTitlesToGameList(GameListDir* parent_dir) {
        }

        auto entry = MakeGameListEntry(file->GetFullPath(), name, file->GetSize(), icon, *loader,
-                                       program_id, compatibility_list, play_time_manager, patch);
+                                       program_id, play_time_manager, patch);
        RecordEvent([=](GameListModel* model) { model->AddEntry(entry, parent_dir); });
    }
 }
@@ -405,7 +396,7 @@ void GameListWorker::ScanFileSystem(ScanTarget target, const std::string& dir_pa

                    auto entry = MakeGameListEntry(
                        physical_name, name, Common::FS::GetSize(physical_name), icon, *app_loader,
-                        id, compatibility_list, play_time_manager, patch);
+                        id, play_time_manager, patch);

                    RecordEvent([=](GameListModel* model) { model->AddEntry(entry, parent_dir); });
                };
@@ -20,7 +20,6 @@
 #include "core/file_sys/registered_cache.h"
 #include "frontend_common/play_time_manager.h"
 #include "qt_common/config/uisettings.h"
-#include "yuzu/compatibility_list.h"

 namespace Core {
 class System;
@@ -46,7 +45,6 @@ public:
    explicit GameListWorker(std::shared_ptr<FileSys::VfsFilesystem> vfs_,
                            FileSys::ManualContentProvider* provider_,
                            QVector<UISettings::GameDir>& game_dirs_,
-                            const CompatibilityList& compatibility_list_,
                            const PlayTime::PlayTimeManager& play_time_manager_,
                            Core::System& system_);
    ~GameListWorker() override;
@@ -85,7 +83,6 @@ private:
    std::shared_ptr<FileSys::VfsFilesystem> vfs;
    FileSys::ManualContentProvider* provider;
    QVector<UISettings::GameDir>& game_dirs;
-    const CompatibilityList& compatibility_list;
    const PlayTime::PlayTimeManager& play_time_manager;

    QStringList watch_list;
@@ -465,12 +465,22 @@ void SetupCapabilities(const Profile& profile, const Info& info, EmitContext& ct
    ctx.AddCapability(spv::Capability::ImageGatherExtended);
    ctx.AddCapability(spv::Capability::ImageQuery);
    ctx.AddCapability(spv::Capability::SampledBuffer);
-    // TODO: this usage needs to be tracked properly
-    if (ctx.profile.support_sampled_image_array_nonuniform_indexing) {
-        if (ctx.profile.supported_spirv < 0x00010400)
+    if (!ctx.non_uniform_ids.empty()) {
+        if (ctx.profile.supported_spirv < 0x00010500)
            ctx.AddExtension("SPV_EXT_descriptor_indexing");
        ctx.AddCapability(spv::Capability::ShaderNonUniform);
-        ctx.AddCapability(spv::Capability::SampledImageArrayNonUniformIndexing);
+        if (ctx.uses_nonuniform_sampled_image) {
+            ctx.AddCapability(spv::Capability::SampledImageArrayNonUniformIndexing);
+        }
+        if (ctx.uses_nonuniform_storage_image) {
+            ctx.AddCapability(spv::Capability::StorageImageArrayNonUniformIndexing);
+        }
+        if (ctx.uses_nonuniform_uniform_texel_buffer) {
+            ctx.AddCapability(spv::Capability::UniformTexelBufferArrayNonUniformIndexing);
+        }
+        if (ctx.uses_nonuniform_storage_texel_buffer) {
+            ctx.AddCapability(spv::Capability::StorageTexelBufferArrayNonUniformIndexing);
+        }
    }
 }

@@ -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

@@ -15,7 +18,7 @@ Id SharedPointer(EmitContext& ctx, Id offset, u32 index_offset = 0) {
    if (index_offset > 0) {
        index = ctx.OpIAdd(ctx.U32[1], index, ctx.Const(index_offset));
    }
-    return ctx.profile.support_explicit_workgroup_layout
+    return ctx.uses_explicit_workgroup_layout
               ? ctx.OpAccessChain(ctx.shared_u32, ctx.shared_memory_u32, ctx.u32_zero_value, index)
               : ctx.OpAccessChain(ctx.shared_u32, ctx.shared_memory_u32, index);
 }
@@ -155,7 +158,7 @@ Id EmitSharedAtomicExchange32(EmitContext& ctx, Id offset, Id value) {
 }

 Id EmitSharedAtomicExchange64(EmitContext& ctx, Id offset, Id value) {
-    if (ctx.profile.support_int64_atomics && ctx.profile.support_explicit_workgroup_layout) {
+    if (ctx.profile.support_shared_int64_atomics && ctx.uses_explicit_workgroup_layout) {
        const Id shift_id{ctx.Const(3U)};
        const Id index{ctx.OpShiftRightArithmetic(ctx.U32[1], offset, shift_id)};
        const Id pointer{
@@ -624,12 +624,14 @@ Id EmitRenderArea(EmitContext& ctx) {
 }

 Id EmitLoadLocal(EmitContext& ctx, Id word_offset) {
-    const Id pointer{ctx.OpAccessChain(ctx.private_u32, ctx.local_memory, word_offset)};
+    const Id pointer{
+        ctx.OpAccessChain(ctx.private_u32, ctx.local_memory, word_offset, ctx.Const(0U))};
    return ctx.OpLoad(ctx.U32[1], pointer);
 }

 void EmitWriteLocal(EmitContext& ctx, Id word_offset, Id value) {
-    const Id pointer{ctx.OpAccessChain(ctx.private_u32, ctx.local_memory, word_offset)};
+    const Id pointer{
+        ctx.OpAccessChain(ctx.private_u32, ctx.local_memory, word_offset, ctx.Const(0U))};
    ctx.OpStore(pointer, value);
 }

@@ -15,8 +15,56 @@
 namespace Shader::Backend::SPIRV {
 namespace {

-[[nodiscard]] bool IsNonUniformDescriptor(EmitContext& ctx, const IR::Value& index) noexcept {
-    return ctx.profile.support_sampled_image_array_nonuniform_indexing && !index.IsImmediate();
+enum class NonUniformKind {
+    SampledImage,
+    StorageImage,
+    UniformTexelBuffer,
+    StorageTexelBuffer,
+};
+
+[[nodiscard]] bool IsNonUniformSupported(const Profile& profile, NonUniformKind kind) noexcept {
+    switch (kind) {
+    case NonUniformKind::SampledImage:
+        return profile.support_sampled_image_array_nonuniform_indexing;
+    case NonUniformKind::StorageImage:
+        return profile.support_storage_image_array_nonuniform_indexing;
+    case NonUniformKind::UniformTexelBuffer:
+        return profile.support_uniform_texel_buffer_array_nonuniform_indexing;
+    case NonUniformKind::StorageTexelBuffer:
+        return profile.support_storage_texel_buffer_array_nonuniform_indexing;
+    }
+    return false;
+}
+
+void DecorateNonUniform(EmitContext& ctx, Id object) {
+    if (ctx.non_uniform_ids.contains(object.value)) {
+        return;
+    }
+    ctx.Decorate(object, spv::Decoration::NonUniform);
+    ctx.non_uniform_ids.insert(object.value);
+}
+
+[[nodiscard]] bool MarkNonUniform(EmitContext& ctx, Id idx, const IR::Value& index,
+                                  NonUniformKind kind) {
+    if (index.IsImmediate() || !IsNonUniformSupported(ctx.profile, kind)) {
+        return false;
+    }
+    DecorateNonUniform(ctx, idx);
+    switch (kind) {
+    case NonUniformKind::SampledImage:
+        ctx.uses_nonuniform_sampled_image = true;
+        break;
+    case NonUniformKind::StorageImage:
+        ctx.uses_nonuniform_storage_image = true;
+        break;
+    case NonUniformKind::UniformTexelBuffer:
+        ctx.uses_nonuniform_uniform_texel_buffer = true;
+        break;
+    case NonUniformKind::StorageTexelBuffer:
+        ctx.uses_nonuniform_storage_texel_buffer = true;
+        break;
+    }
+    return true;
 }

 class ImageOperands {
@@ -195,12 +243,13 @@ Id Texture(EmitContext& ctx, IR::TextureInstInfo info, [[maybe_unused]] const IR
    const TextureDefinition& def{ctx.textures.at(info.descriptor_index)};
    if (def.count > 1) {
        auto const idx = index.IsImmediate() ? ctx.Const(index.U32()) : ctx.Def(index);
-        if (!ctx.non_uniform_ids.contains(idx.value) && IsNonUniformDescriptor(ctx, index)) {
-            ctx.Decorate(idx, spv::Decoration::NonUniform);
-            ctx.non_uniform_ids.insert(idx.value);
-        }
+        const bool non_uniform{MarkNonUniform(ctx, idx, index, NonUniformKind::SampledImage)};
        const Id pointer{ctx.OpAccessChain(def.pointer_type, def.id, idx)};
        const Id object{ctx.OpLoad(def.sampled_type, pointer)};
+        if (non_uniform) {
+            DecorateNonUniform(ctx, pointer);
+            DecorateNonUniform(ctx, object);
+        }
        return object;
    } else {
        return ctx.OpLoad(def.sampled_type, def.id);
@@ -212,21 +261,30 @@ Id TextureImage(EmitContext& ctx, IR::TextureInstInfo info, const IR::Value& ind
        const TextureBufferDefinition& def{ctx.texture_buffers.at(info.descriptor_index)};
        if (def.count > 1) {
            const Id idx{index.IsImmediate() ? ctx.Const(index.U32()) : ctx.Def(index)};
+            const bool non_uniform{
+                MarkNonUniform(ctx, idx, index, NonUniformKind::UniformTexelBuffer)};
            const Id ptr{ctx.OpAccessChain(ctx.image_buffer_type, def.id, idx)};
-            return ctx.OpLoad(ctx.image_buffer_type, ptr);
+            const Id object{ctx.OpLoad(ctx.image_buffer_type, ptr)};
+            if (non_uniform) {
+                DecorateNonUniform(ctx, ptr);
+                DecorateNonUniform(ctx, object);
+            }
+            return object;
        }
        return ctx.OpLoad(ctx.image_buffer_type, def.id);
    } else {
        const TextureDefinition& def{ctx.textures.at(info.descriptor_index)};
        if (def.count > 1) {
            auto const idx = index.IsImmediate() ? ctx.Const(index.U32()) : ctx.Def(index);
-            if (!ctx.non_uniform_ids.contains(idx.value) && IsNonUniformDescriptor(ctx, index)) {
-                ctx.Decorate(idx, spv::Decoration::NonUniform);
-                ctx.non_uniform_ids.insert(idx.value);
-            }
+            const bool non_uniform{MarkNonUniform(ctx, idx, index, NonUniformKind::SampledImage)};
            const Id ptr = ctx.OpAccessChain(def.pointer_type, def.id, idx);
            const Id object = ctx.OpLoad(def.sampled_type, ptr);
            const Id image = ctx.OpImage(def.image_type, object);
+            if (non_uniform) {
+                DecorateNonUniform(ctx, ptr);
+                DecorateNonUniform(ctx, object);
+                DecorateNonUniform(ctx, image);
+            }
            return image;
        }
        return ctx.OpImage(def.image_type, ctx.OpLoad(def.sampled_type, def.id));
@@ -238,16 +296,29 @@ std::pair<Id, bool> Image(EmitContext& ctx, const IR::Value& index, IR::TextureI
        const ImageBufferDefinition def{ctx.image_buffers.at(info.descriptor_index)};
        if (def.count > 1) {
            const Id idx{index.IsImmediate() ? ctx.Const(index.U32()) : ctx.Def(index)};
+            const bool non_uniform{
+                MarkNonUniform(ctx, idx, index, NonUniformKind::StorageTexelBuffer)};
            const Id ptr{ctx.OpAccessChain(def.pointer_type, def.id, idx)};
-            return {ctx.OpLoad(def.image_type, ptr), def.is_integer};
+            const Id image{ctx.OpLoad(def.image_type, ptr)};
+            if (non_uniform) {
+                DecorateNonUniform(ctx, ptr);
+                DecorateNonUniform(ctx, image);
+            }
+            return {image, def.is_integer};
        }
        return {ctx.OpLoad(def.image_type, def.id), def.is_integer};
    } else {
        const ImageDefinition def{ctx.images.at(info.descriptor_index)};
        if (def.count > 1) {
            const Id idx{index.IsImmediate() ? ctx.Const(index.U32()) : ctx.Def(index)};
+            const bool non_uniform{MarkNonUniform(ctx, idx, index, NonUniformKind::StorageImage)};
            const Id ptr{ctx.OpAccessChain(def.pointer_type, def.id, idx)};
-            return {ctx.OpLoad(def.image_type, ptr), def.is_integer};
+            const Id image{ctx.OpLoad(def.image_type, ptr)};
+            if (non_uniform) {
+                DecorateNonUniform(ctx, ptr);
+                DecorateNonUniform(ctx, image);
+            }
+            return {image, def.is_integer};
        }
        return {ctx.OpLoad(def.image_type, def.id), def.is_integer};
    }
@@ -159,7 +159,7 @@ void EmitWriteGlobal128(EmitContext& ctx, Id address, Id value) {
 }

 Id EmitLoadStorageU8(EmitContext& ctx, const IR::Value& binding, const IR::Value& offset) {
-    if (ctx.profile.support_int8 && ctx.profile.support_uniform_and_storage_buffer_8bit &&
+    if (ctx.profile.support_int8 && ctx.profile.support_storage_buffer_8bit &&
        ctx.profile.support_descriptor_aliasing) {
        return ctx.OpUConvert(ctx.U32[1],
                              LoadStorage(ctx, binding, offset, ctx.U8, ctx.storage_types.U8,
@@ -171,7 +171,7 @@ Id EmitLoadStorageU8(EmitContext& ctx, const IR::Value& binding, const IR::Value
 }

 Id EmitLoadStorageS8(EmitContext& ctx, const IR::Value& binding, const IR::Value& offset) {
-    if (ctx.profile.support_int8 && ctx.profile.support_uniform_and_storage_buffer_8bit &&
+    if (ctx.profile.support_int8 && ctx.profile.support_storage_buffer_8bit &&
        ctx.profile.support_descriptor_aliasing) {
        return ctx.OpSConvert(ctx.U32[1],
                              LoadStorage(ctx, binding, offset, ctx.S8, ctx.storage_types.S8,
@@ -183,7 +183,7 @@ Id EmitLoadStorageS8(EmitContext& ctx, const IR::Value& binding, const IR::Value
 }

 Id EmitLoadStorageU16(EmitContext& ctx, const IR::Value& binding, const IR::Value& offset) {
-    if (ctx.profile.support_int16 && ctx.profile.support_uniform_and_storage_buffer_16bit &&
+    if (ctx.profile.support_int16 && ctx.profile.support_storage_buffer_16bit &&
        ctx.profile.support_descriptor_aliasing) {
        return ctx.OpUConvert(ctx.U32[1],
                              LoadStorage(ctx, binding, offset, ctx.U16, ctx.storage_types.U16,
@@ -195,7 +195,7 @@ Id EmitLoadStorageU16(EmitContext& ctx, const IR::Value& binding, const IR::Valu
 }

 Id EmitLoadStorageS16(EmitContext& ctx, const IR::Value& binding, const IR::Value& offset) {
-    if (ctx.profile.support_int16 && ctx.profile.support_uniform_and_storage_buffer_16bit &&
+    if (ctx.profile.support_int16 && ctx.profile.support_storage_buffer_16bit &&
        ctx.profile.support_descriptor_aliasing) {
        return ctx.OpSConvert(ctx.U32[1],
                              LoadStorage(ctx, binding, offset, ctx.S16, ctx.storage_types.S16,
@@ -234,7 +234,8 @@ Id EmitLoadStorage128(EmitContext& ctx, const IR::Value& binding, const IR::Valu

 void EmitWriteStorageU8(EmitContext& ctx, const IR::Value& binding, const IR::Value& offset,
                        Id value) {
-    if (ctx.profile.support_int8 && ctx.profile.support_uniform_and_storage_buffer_8bit) {
+    if (ctx.profile.support_int8 && ctx.profile.support_storage_buffer_8bit &&
+        ctx.profile.support_descriptor_aliasing) {
        WriteStorage(ctx, binding, offset, ctx.OpSConvert(ctx.U8, value), ctx.storage_types.U8,
                     sizeof(u8), &StorageDefinitions::U8);
    } else {
@@ -244,7 +245,8 @@ void EmitWriteStorageU8(EmitContext& ctx, const IR::Value& binding, const IR::Va

 void EmitWriteStorageS8(EmitContext& ctx, const IR::Value& binding, const IR::Value& offset,
                        Id value) {
-    if (ctx.profile.support_int8 && ctx.profile.support_uniform_and_storage_buffer_8bit) {
+    if (ctx.profile.support_int8 && ctx.profile.support_storage_buffer_8bit &&
+        ctx.profile.support_descriptor_aliasing) {
        WriteStorage(ctx, binding, offset, ctx.OpSConvert(ctx.S8, value), ctx.storage_types.S8,
                     sizeof(s8), &StorageDefinitions::S8);
    } else {
@@ -254,7 +256,8 @@ void EmitWriteStorageS8(EmitContext& ctx, const IR::Value& binding, const IR::Va

 void EmitWriteStorageU16(EmitContext& ctx, const IR::Value& binding, const IR::Value& offset,
                         Id value) {
-    if (ctx.profile.support_int16 && ctx.profile.support_uniform_and_storage_buffer_16bit) {
+    if (ctx.profile.support_int16 && ctx.profile.support_storage_buffer_16bit &&
+        ctx.profile.support_descriptor_aliasing) {
        WriteStorage(ctx, binding, offset, ctx.OpSConvert(ctx.U16, value), ctx.storage_types.U16,
                     sizeof(u16), &StorageDefinitions::U16);
    } else {
@@ -264,7 +267,8 @@ void EmitWriteStorageU16(EmitContext& ctx, const IR::Value& binding, const IR::V

 void EmitWriteStorageS16(EmitContext& ctx, const IR::Value& binding, const IR::Value& offset,
                         Id value) {
-    if (ctx.profile.support_int16 && ctx.profile.support_uniform_and_storage_buffer_16bit) {
+    if (ctx.profile.support_int16 && ctx.profile.support_storage_buffer_16bit &&
+        ctx.profile.support_descriptor_aliasing) {
        WriteStorage(ctx, binding, offset, ctx.OpSConvert(ctx.S16, value), ctx.storage_types.S16,
                     sizeof(s16), &StorageDefinitions::S16);
    } else {
@@ -31,7 +31,7 @@ std::pair<Id, Id> ExtractArgs(EmitContext& ctx, Id offset, u32 mask, u32 count)
 } // Anonymous namespace

 Id EmitLoadSharedU8(EmitContext& ctx, Id offset) {
-    if (ctx.profile.support_explicit_workgroup_layout) {
+    if (ctx.uses_explicit_workgroup_layout) {
        const Id pointer{
            ctx.OpAccessChain(ctx.shared_u8, ctx.shared_memory_u8, ctx.u32_zero_value, offset)};
        return ctx.OpUConvert(ctx.U32[1], ctx.OpLoad(ctx.U8, pointer));
@@ -42,7 +42,7 @@ Id EmitLoadSharedU8(EmitContext& ctx, Id offset) {
 }

 Id EmitLoadSharedS8(EmitContext& ctx, Id offset) {
-    if (ctx.profile.support_explicit_workgroup_layout) {
+    if (ctx.uses_explicit_workgroup_layout) {
        const Id pointer{
            ctx.OpAccessChain(ctx.shared_u8, ctx.shared_memory_u8, ctx.u32_zero_value, offset)};
        return ctx.OpSConvert(ctx.U32[1], ctx.OpLoad(ctx.U8, pointer));
@@ -53,7 +53,7 @@ Id EmitLoadSharedS8(EmitContext& ctx, Id offset) {
 }

 Id EmitLoadSharedU16(EmitContext& ctx, Id offset) {
-    if (ctx.profile.support_explicit_workgroup_layout) {
+    if (ctx.uses_explicit_workgroup_layout) {
        const Id pointer{Pointer(ctx, ctx.shared_u16, ctx.shared_memory_u16, offset, 1)};
        return ctx.OpUConvert(ctx.U32[1], ctx.OpLoad(ctx.U16, pointer));
    } else {
@@ -63,7 +63,7 @@ Id EmitLoadSharedU16(EmitContext& ctx, Id offset) {
 }

 Id EmitLoadSharedS16(EmitContext& ctx, Id offset) {
-    if (ctx.profile.support_explicit_workgroup_layout) {
+    if (ctx.uses_explicit_workgroup_layout) {
        const Id pointer{Pointer(ctx, ctx.shared_u16, ctx.shared_memory_u16, offset, 1)};
        return ctx.OpSConvert(ctx.U32[1], ctx.OpLoad(ctx.U16, pointer));
    } else {
@@ -73,7 +73,7 @@ Id EmitLoadSharedS16(EmitContext& ctx, Id offset) {
 }

 Id EmitLoadSharedU32(EmitContext& ctx, Id offset) {
-    if (ctx.profile.support_explicit_workgroup_layout) {
+    if (ctx.uses_explicit_workgroup_layout) {
        const Id pointer{Pointer(ctx, ctx.shared_u32, ctx.shared_memory_u32, offset, 2)};
        return ctx.OpLoad(ctx.U32[1], pointer);
    } else {
@@ -82,7 +82,7 @@ Id EmitLoadSharedU32(EmitContext& ctx, Id offset) {
 }

 Id EmitLoadSharedU64(EmitContext& ctx, Id offset) {
-    if (ctx.profile.support_explicit_workgroup_layout) {
+    if (ctx.uses_explicit_workgroup_layout) {
        const Id pointer{Pointer(ctx, ctx.shared_u32x2, ctx.shared_memory_u32x2, offset, 3)};
        return ctx.OpLoad(ctx.U32[2], pointer);
    } else {
@@ -97,7 +97,7 @@ Id EmitLoadSharedU64(EmitContext& ctx, Id offset) {
 }

 Id EmitLoadSharedU128(EmitContext& ctx, Id offset) {
-    if (ctx.profile.support_explicit_workgroup_layout) {
+    if (ctx.uses_explicit_workgroup_layout) {
        const Id pointer{Pointer(ctx, ctx.shared_u32x4, ctx.shared_memory_u32x4, offset, 4)};
        return ctx.OpLoad(ctx.U32[4], pointer);
    }
@@ -113,7 +113,7 @@ Id EmitLoadSharedU128(EmitContext& ctx, Id offset) {
 }

 void EmitWriteSharedU8(EmitContext& ctx, Id offset, Id value) {
-    if (ctx.profile.support_explicit_workgroup_layout) {
+    if (ctx.uses_explicit_workgroup_layout) {
        const Id pointer{
            ctx.OpAccessChain(ctx.shared_u8, ctx.shared_memory_u8, ctx.u32_zero_value, offset)};
        ctx.OpStore(pointer, ctx.OpUConvert(ctx.U8, value));
@@ -123,7 +123,7 @@ void EmitWriteSharedU8(EmitContext& ctx, Id offset, Id value) {
 }

 void EmitWriteSharedU16(EmitContext& ctx, Id offset, Id value) {
-    if (ctx.profile.support_explicit_workgroup_layout) {
+    if (ctx.uses_explicit_workgroup_layout) {
        const Id pointer{Pointer(ctx, ctx.shared_u16, ctx.shared_memory_u16, offset, 1)};
        ctx.OpStore(pointer, ctx.OpUConvert(ctx.U16, value));
    } else {
@@ -133,7 +133,7 @@ void EmitWriteSharedU16(EmitContext& ctx, Id offset, Id value) {

 void EmitWriteSharedU32(EmitContext& ctx, Id offset, Id value) {
    Id pointer{};
-    if (ctx.profile.support_explicit_workgroup_layout) {
+    if (ctx.uses_explicit_workgroup_layout) {
        pointer = Pointer(ctx, ctx.shared_u32, ctx.shared_memory_u32, offset, 2);
    } else {
        const Id shift{ctx.Const(2U)};
@@ -144,7 +144,7 @@ void EmitWriteSharedU32(EmitContext& ctx, Id offset, Id value) {
 }

 void EmitWriteSharedU64(EmitContext& ctx, Id offset, Id value) {
-    if (ctx.profile.support_explicit_workgroup_layout) {
+    if (ctx.uses_explicit_workgroup_layout) {
        const Id pointer{Pointer(ctx, ctx.shared_u32x2, ctx.shared_memory_u32x2, offset, 3)};
        ctx.OpStore(pointer, value);
        return;
@@ -159,7 +159,7 @@ void EmitWriteSharedU64(EmitContext& ctx, Id offset, Id value) {
 }

 void EmitWriteSharedU128(EmitContext& ctx, Id offset, Id value) {
-    if (ctx.profile.support_explicit_workgroup_layout) {
+    if (ctx.uses_explicit_workgroup_layout) {
        const Id pointer{Pointer(ctx, ctx.shared_u32x4, ctx.shared_memory_u32x4, offset, 4)};
        ctx.OpStore(pointer, value);
        return;
@@ -371,7 +371,7 @@ Id CasFunction(EmitContext& ctx, Operation operation, Id value_type) {
 Id CasLoop(EmitContext& ctx, Operation operation, Id array_pointer, Id element_pointer,
           Id value_type, Id memory_type, spv::Scope scope) {
    const bool is_shared{scope == spv::Scope::Workgroup};
-    const bool is_struct{!is_shared || ctx.profile.support_explicit_workgroup_layout};
+    const bool is_struct{!is_shared || ctx.uses_explicit_workgroup_layout};
    const Id cas_func{CasFunction(ctx, operation, value_type)};
    const Id zero{ctx.u32_zero_value};
    const Id scope_id{ctx.Const(static_cast<u32>(scope))};
@@ -591,7 +591,8 @@ void EmitContext::DefineLocalMemory(const IR::Program& program) {
        return;
    }
    const u32 num_elements{Common::DivCeil(program.local_memory_size, 4U)};
-    const Id type{TypeArray(U32[1], Const(num_elements))};
+    const Id element_type{TypeStruct(U32[1])};
+    const Id type{TypeArray(element_type, Const(num_elements))};
    const Id pointer{TypePointer(spv::StorageClass::Private, type)};
    local_memory = AddGlobalVariable(pointer, spv::StorageClass::Private);
    if (profile.supported_spirv >= 0x00010400) {
@@ -600,6 +601,10 @@ void EmitContext::DefineLocalMemory(const IR::Program& program) {
 }

 void EmitContext::DefineSharedMemory(const IR::Program& program) {
+    uses_explicit_workgroup_layout =
+        profile.support_explicit_workgroup_layout &&
+        (!program.info.uses_int8 || profile.support_workgroup_layout_8bit_access) &&
+        (!program.info.uses_int16 || profile.support_workgroup_layout_16bit_access);
    if (program.shared_memory_size == 0) {
        return;
    }
@@ -620,18 +625,18 @@ void EmitContext::DefineSharedMemory(const IR::Program& program) {

        return std::make_tuple(variable, element_pointer, pointer);
    }};
-    if (profile.support_explicit_workgroup_layout) {
+    if (uses_explicit_workgroup_layout) {
        AddExtension("SPV_KHR_workgroup_memory_explicit_layout");
        AddCapability(spv::Capability::WorkgroupMemoryExplicitLayoutKHR);
-        if (program.info.uses_int8) {
+        if (program.info.uses_int8 && profile.support_int8) {
            AddCapability(spv::Capability::WorkgroupMemoryExplicitLayout8BitAccessKHR);
            std::tie(shared_memory_u8, shared_u8, std::ignore) = make(U8, 1);
        }
-        if (program.info.uses_int16) {
+        if (program.info.uses_int16 && profile.support_int16) {
            AddCapability(spv::Capability::WorkgroupMemoryExplicitLayout16BitAccessKHR);
            std::tie(shared_memory_u16, shared_u16, std::ignore) = make(U16, 2);
        }
-        if (program.info.uses_int64) {
+        if (program.info.uses_int64 && profile.support_int64) {
            std::tie(shared_memory_u64, shared_u64, std::ignore) = make(U64, 8);
        }
        std::tie(shared_memory_u32, shared_u32, shared_memory_u32_type) = make(U32[1], 4);
@@ -1229,16 +1234,17 @@ void EmitContext::DefineStorageBuffers(const Info& info, u32& binding) {
    }
    AddExtension("SPV_KHR_storage_buffer_storage_class");

-    const IR::Type used_types{profile.support_descriptor_aliasing ? info.used_storage_buffer_types
-                                                                  : IR::Type::U32};
-    if (profile.support_int8 && profile.support_uniform_and_storage_buffer_8bit &&
+    IR::Type used_types{profile.support_descriptor_aliasing ? info.used_storage_buffer_types
+                                                            : IR::Type::U32};
+    used_types |= IR::Type::U32;
+    if (profile.support_int8 && profile.support_storage_buffer_8bit &&
        True(used_types & IR::Type::U8)) {
        DefineSsbos(*this, storage_types.U8, &StorageDefinitions::U8, info, binding, U8,
                    sizeof(u8));
        DefineSsbos(*this, storage_types.S8, &StorageDefinitions::S8, info, binding, S8,
                    sizeof(u8));
    }
-    if (profile.support_int16 && profile.support_uniform_and_storage_buffer_16bit &&
+    if (profile.support_int16 && profile.support_storage_buffer_16bit &&
        True(used_types & IR::Type::U16)) {
        DefineSsbos(*this, storage_types.U16, &StorageDefinitions::U16, info, binding, U16,
                    sizeof(u16));
@@ -311,6 +311,7 @@ public:

    Id local_memory{};

+    bool uses_explicit_workgroup_layout{};
    Id shared_memory_u8{};
    Id shared_memory_u16{};
    Id shared_memory_u32{};
@@ -371,6 +372,11 @@ public:
    // Sirit::Id doesn't play nice with *::set<>
    ankerl::unordered_dense::set<u32> non_uniform_ids;

+    bool uses_nonuniform_sampled_image{};
+    bool uses_nonuniform_storage_image{};
+    bool uses_nonuniform_uniform_texel_buffer{};
+    bool uses_nonuniform_storage_texel_buffer{};
+
 private:
    void DefineCommonTypes(const Info& info);
    void DefineCommonConstants();
@@ -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

@@ -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

@@ -181,6 +184,72 @@ void ShiftRightArithmetic64To32(IR::Block& block, IR::Inst& inst) {
    inst.ReplaceUsesWith(ir.CompositeConstruct(ret_lo, ret_hi));
 }

+void IAbs64To32(IR::Block& block, IR::Inst& inst) {
+    IR::IREmitter ir(block, IR::Block::InstructionList::s_iterator_to(inst));
+    const auto [lo, hi]{Unpack(ir, inst.Arg(0))};
+
+    const IR::U32 neg_lo{ir.IAdd(ir.BitwiseNot(lo), ir.Imm32(1))};
+    const IR::U32 carry{IR::U32{ir.Select(ir.GetCarryFromOp(neg_lo), ir.Imm32(1u), ir.Imm32(0u))}};
+    const IR::U32 neg_hi{ir.IAdd(ir.BitwiseNot(hi), carry)};
+
+    const IR::U1 is_negative{ir.INotEqual(ir.BitwiseAnd(hi, ir.Imm32(0x80000000u)), ir.Imm32(0u))};
+    const IR::U32 ret_lo{IR::U32{ir.Select(is_negative, neg_lo, lo)}};
+    const IR::U32 ret_hi{IR::U32{ir.Select(is_negative, neg_hi, hi)}};
+    inst.ReplaceUsesWith(ir.CompositeConstruct(ret_lo, ret_hi));
+}
+
+void SelectU64To32(IR::Block& block, IR::Inst& inst) {
+    IR::IREmitter ir(block, IR::Block::InstructionList::s_iterator_to(inst));
+    const IR::U1 condition{inst.Arg(0)};
+    const auto [true_lo, true_hi]{Unpack(ir, inst.Arg(1))};
+    const auto [false_lo, false_hi]{Unpack(ir, inst.Arg(2))};
+
+    const IR::U32 ret_lo{IR::U32{ir.Select(condition, true_lo, false_lo)}};
+    const IR::U32 ret_hi{IR::U32{ir.Select(condition, true_hi, false_hi)}};
+    inst.ReplaceUsesWith(ir.CompositeConstruct(ret_lo, ret_hi));
+}
+
+void UndefU64To32(IR::Block& block, IR::Inst& inst) {
+    IR::IREmitter ir(block, IR::Block::InstructionList::s_iterator_to(inst));
+    inst.ReplaceUsesWith(ir.CompositeConstruct(ir.Imm32(0u), ir.Imm32(0u)));
+}
+
+void ConvertU64U32To32(IR::Block& block, IR::Inst& inst) {
+    IR::IREmitter ir(block, IR::Block::InstructionList::s_iterator_to(inst));
+    inst.ReplaceUsesWith(ir.CompositeConstruct(IR::U32{inst.Arg(0)}, ir.Imm32(0u)));
+}
+
+void ConvertU32U64To32(IR::Block& block, IR::Inst& inst) {
+    IR::IREmitter ir(block, IR::Block::InstructionList::s_iterator_to(inst));
+    inst.ReplaceUsesWith(Unpack(ir, inst.Arg(0)).first);
+}
+
+void IntToFloat64To32(IR::Block& block, IR::Inst& inst, bool is_signed, size_t dest_bitsize) {
+    IR::IREmitter ir(block, IR::Block::InstructionList::s_iterator_to(inst));
+    const auto [lo, hi]{Unpack(ir, inst.Arg(0))};
+    const IR::F32 low{ir.ConvertUToF(32, 32, lo)};
+    const IR::F32 high{is_signed ? IR::F32{ir.ConvertSToF(32, 32, hi)}
+                                 : IR::F32{ir.ConvertUToF(32, 32, hi)}};
+    const IR::F32 combined{ir.FPFma(high, ir.Imm32(4294967296.0f), low)};
+    if (dest_bitsize == 32) {
+        inst.ReplaceUsesWith(combined);
+    } else {
+        inst.ReplaceUsesWith(ir.FPConvert(dest_bitsize, combined));
+    }
+}
+
+void FloatToInt64To32(IR::Block& block, IR::Inst& inst, bool is_signed, size_t src_bitsize) {
+    IR::IREmitter ir(block, IR::Block::InstructionList::s_iterator_to(inst));
+    const IR::F32 value{src_bitsize == 32 ? IR::F32{inst.Arg(0)}
+                                          : IR::F32{ir.FPConvert(32, IR::F16F32F64{inst.Arg(0)})}};
+    const IR::F32 high_f{ir.FPFloor(ir.FPMul(value, ir.Imm32(1.0f / 4294967296.0f)))};
+    const IR::U32 hi{is_signed ? IR::U32{ir.ConvertFToS(32, high_f)}
+                               : IR::U32{ir.ConvertFToU(32, high_f)}};
+    const IR::F32 low_f{ir.FPFma(high_f, ir.FPNeg(ir.Imm32(4294967296.0f)), value)};
+    const IR::U32 lo{IR::U32{ir.ConvertFToU(32, low_f)}};
+    inst.ReplaceUsesWith(ir.CompositeConstruct(lo, hi));
+}
+
 void Lower(IR::Block& block, IR::Inst& inst) {
    switch (inst.GetOpcode()) {
    case IR::Opcode::PackUint2x32:
@@ -218,6 +287,62 @@ void Lower(IR::Block& block, IR::Inst& inst) {
        return inst.ReplaceOpcode(IR::Opcode::GlobalAtomicXor32x2);
    case IR::Opcode::GlobalAtomicExchange64:
        return inst.ReplaceOpcode(IR::Opcode::GlobalAtomicExchange32x2);
+    case IR::Opcode::StorageAtomicIAdd64:
+        return inst.ReplaceOpcode(IR::Opcode::StorageAtomicIAdd32x2);
+    case IR::Opcode::StorageAtomicSMin64:
+        return inst.ReplaceOpcode(IR::Opcode::StorageAtomicSMin32x2);
+    case IR::Opcode::StorageAtomicUMin64:
+        return inst.ReplaceOpcode(IR::Opcode::StorageAtomicUMin32x2);
+    case IR::Opcode::StorageAtomicSMax64:
+        return inst.ReplaceOpcode(IR::Opcode::StorageAtomicSMax32x2);
+    case IR::Opcode::StorageAtomicUMax64:
+        return inst.ReplaceOpcode(IR::Opcode::StorageAtomicUMax32x2);
+    case IR::Opcode::StorageAtomicAnd64:
+        return inst.ReplaceOpcode(IR::Opcode::StorageAtomicAnd32x2);
+    case IR::Opcode::StorageAtomicOr64:
+        return inst.ReplaceOpcode(IR::Opcode::StorageAtomicOr32x2);
+    case IR::Opcode::StorageAtomicXor64:
+        return inst.ReplaceOpcode(IR::Opcode::StorageAtomicXor32x2);
+    case IR::Opcode::StorageAtomicExchange64:
+        return inst.ReplaceOpcode(IR::Opcode::StorageAtomicExchange32x2);
+    case IR::Opcode::BitCastU64F64:
+        return inst.ReplaceOpcode(IR::Opcode::UnpackDouble2x32);
+    case IR::Opcode::BitCastF64U64:
+        return inst.ReplaceOpcode(IR::Opcode::PackDouble2x32);
+    case IR::Opcode::UndefU64:
+        return UndefU64To32(block, inst);
+    case IR::Opcode::SelectU64:
+        return SelectU64To32(block, inst);
+    case IR::Opcode::IAbs64:
+        return IAbs64To32(block, inst);
+    case IR::Opcode::ConvertU64U32:
+        return ConvertU64U32To32(block, inst);
+    case IR::Opcode::ConvertU32U64:
+        return ConvertU32U64To32(block, inst);
+    case IR::Opcode::ConvertS64F16:
+        return FloatToInt64To32(block, inst, true, 16);
+    case IR::Opcode::ConvertS64F32:
+        return FloatToInt64To32(block, inst, true, 32);
+    case IR::Opcode::ConvertS64F64:
+        return FloatToInt64To32(block, inst, true, 64);
+    case IR::Opcode::ConvertU64F16:
+        return FloatToInt64To32(block, inst, false, 16);
+    case IR::Opcode::ConvertU64F32:
+        return FloatToInt64To32(block, inst, false, 32);
+    case IR::Opcode::ConvertU64F64:
+        return FloatToInt64To32(block, inst, false, 64);
+    case IR::Opcode::ConvertF16S64:
+        return IntToFloat64To32(block, inst, true, 16);
+    case IR::Opcode::ConvertF32S64:
+        return IntToFloat64To32(block, inst, true, 32);
+    case IR::Opcode::ConvertF64S64:
+        return IntToFloat64To32(block, inst, true, 64);
+    case IR::Opcode::ConvertF16U64:
+        return IntToFloat64To32(block, inst, false, 16);
+    case IR::Opcode::ConvertF32U64:
+        return IntToFloat64To32(block, inst, false, 32);
+    case IR::Opcode::ConvertF64U64:
+        return IntToFloat64To32(block, inst, false, 64);
    default:
        break;
    }
@@ -18,8 +18,10 @@ struct Profile {
    bool support_descriptor_aliasing{};
    bool support_int8{};
    bool support_uniform_and_storage_buffer_8bit{};
+    bool support_storage_buffer_8bit{};
    bool support_int16{};
    bool support_uniform_and_storage_buffer_16bit{};
+    bool support_storage_buffer_16bit{};
    bool support_int64{};
    bool support_vertex_instance_id{};
    bool support_float_controls{};
@@ -33,6 +35,8 @@ struct Profile {
    bool support_fp32_signed_zero_nan_preserve{};
    bool support_fp64_signed_zero_nan_preserve{};
    bool support_explicit_workgroup_layout{};
+    bool support_workgroup_layout_8bit_access{};
+    bool support_workgroup_layout_16bit_access{};
    bool support_vote{};
    u32 supported_subgroup_stages{0x7F};
    bool support_viewport_index_layer_non_geometry{};
@@ -40,6 +44,7 @@ struct Profile {
    bool support_typeless_image_loads{};
    bool support_demote_to_helper_invocation{};
    bool support_int64_atomics{};
+    bool support_shared_int64_atomics{};
    bool support_derivative_control{};
    bool support_geometry_shader_passthrough{};
    bool support_native_ndc{};
@@ -54,6 +59,9 @@ struct Profile {
    bool support_multi_viewport{};
    bool support_geometry_streams{};
    bool support_sampled_image_array_nonuniform_indexing{};
+    bool support_storage_image_array_nonuniform_indexing{};
+    bool support_uniform_texel_buffer_array_nonuniform_indexing{};
+    bool support_storage_texel_buffer_array_nonuniform_indexing{};

    bool warp_size_potentially_larger_than_guest{};

@@ -121,12 +121,21 @@ public:
        return size_bytes;
    }

+    u64 getWriteTick() const noexcept {
+        return write_tick;
+    }
+
+    void setWriteTick(u64 write_tick_) {
+        write_tick = write_tick_;
+    }
+
 private:
    VAddr cpu_addr = 0;
    BufferFlagBits flags{};
    int stream_score = 0;
    size_t lru_id = SIZE_MAX;
    size_t size_bytes = 0;
+    u64 write_tick = 0;
 };

 } // namespace VideoCommon
@@ -1430,6 +1430,10 @@ void BufferCache<P>::UpdateComputeTextureBuffers() {

 template <class P>
 void BufferCache<P>::MarkWrittenBuffer(BufferId buffer_id, DAddr device_addr, u32 size) {
+    if constexpr (!IS_OPENGL) {
+        Buffer& buffer = slot_buffers[buffer_id];
+        buffer.setWriteTick(runtime.CurrentTick());
+    }
    memory_tracker.MarkRegionAsGpuModified(device_addr, size);
    gpu_modified_ranges.Add(device_addr, size);
    uncommitted_gpu_modified_ranges.Add(device_addr, size);
@@ -1442,16 +1446,32 @@ BufferId BufferCache<P>::FindBuffer(DAddr device_addr, u32 size) {
    }
    const u64 page = device_addr >> CACHING_PAGEBITS;
    const BufferId buffer_id = page_table[page];
-    if (!buffer_id) {
-        return CreateBuffer(device_addr, size);
-    }
-    const Buffer& buffer = slot_buffers[buffer_id];
-    if (buffer.IsInBounds(device_addr, size)) {
-        return buffer_id;
+    if (buffer_id) {
+        Buffer& buffer = slot_buffers[buffer_id];
+        WaitForGpuFenceIfNeeded(buffer);
+        if (buffer.IsInBounds(device_addr, size)) {
+            return buffer_id;
+        }
    }
    return CreateBuffer(device_addr, size);
 }

+template <class P>
+void BufferCache<P>::WaitForGpuFenceIfNeeded(Buffer& buffer) {
+    if constexpr (!IS_OPENGL) {
+        const bool gpu_fence_accurate = Settings::IsGPUFenceBehaviorAccurate();
+        const bool gpu_fence_strict = Settings::IsGPUFenceBehaviorStrict();
+        if (gpu_fence_accurate || gpu_fence_strict) {
+            const u64 gpu_tick_delay = gpu_fence_strict ? 0 : 3;
+            const u64 buffer_tick = buffer.getWriteTick();
+            const u64 gpu_tick = runtime.KnownGpuTick();
+            if (buffer_tick > gpu_tick + gpu_tick_delay) {
+                runtime.Wait(buffer_tick);
+            }
+        }
+    }
+}
+
 template <class P>
 typename BufferCache<P>::OverlapResult BufferCache<P>::ResolveOverlaps(DAddr device_addr,
                                                                       u32 wanted_size) {
@@ -1634,17 +1654,6 @@ bool BufferCache<P>::SynchronizeBuffer(Buffer& buffer, DAddr device_addr, u32 si
    if (total_size_bytes == 0) {
        return true;
    }
-    if (Settings::values.enable_gpu_buffer_readback.GetValue()) {
-        u64 min_offset = (std::numeric_limits<u64>::max)();
-        u64 max_offset = 0;
-        for (const auto& copy : upload_copies) {
-            min_offset = (std::min)(min_offset, copy.dst_offset);
-            max_offset = (std::max)(max_offset, copy.dst_offset + copy.size);
-        }
-        const DAddr sync_addr = buffer.CpuAddr() + min_offset;
-        const u64 sync_size = max_offset - min_offset;
-        DownloadBufferMemory(buffer, sync_addr, sync_size);
-    }
    const std::span<BufferCopy> copies_span(upload_copies.data(), upload_copies.size());
    UploadMemory(buffer, total_size_bytes, largest_copy, copies_span);
    any_buffer_uploaded = true;
@@ -1679,6 +1688,9 @@ void BufferCache<P>::ImmediateUploadMemory([[maybe_unused]] Buffer& buffer,
                if (immediate_buffer.empty()) {
                    immediate_buffer = ImmediateBuffer(largest_copy);
                }
+                if (Settings::values.enable_gpu_buffer_readback.GetValue()) {
+                    DownloadBufferMemory(buffer, device_addr, copy.size);
+                }
                device_memory.ReadBlockUnsafe(device_addr, immediate_buffer.data(), copy.size);
                upload_span = immediate_buffer.subspan(0, copy.size);
            }
@@ -1697,6 +1709,9 @@ void BufferCache<P>::MappedUploadMemory([[maybe_unused]] Buffer& buffer,
        for (BufferCopy& copy : copies) {
            u8* const src_pointer = staging_pointer.data() + copy.src_offset;
            const DAddr device_addr = buffer.CpuAddr() + copy.dst_offset;
+            if (Settings::values.enable_gpu_buffer_readback.GetValue()) {
+                DownloadBufferMemory(buffer, device_addr, copy.size);
+            }
            device_memory.ReadBlockUnsafe(device_addr, src_pointer, copy.size);
            // Apply the staging offset
            copy.src_offset += upload_staging.offset;
@@ -416,6 +416,8 @@ private:

    [[nodiscard]] BufferId FindBuffer(DAddr device_addr, u32 size);

+    void WaitForGpuFenceIfNeeded(Buffer& buffer);
+
    [[nodiscard]] OverlapResult ResolveOverlaps(DAddr device_addr, u32 wanted_size);

    void JoinOverlap(BufferId new_buffer_id, BufferId overlap_id, bool accumulate_stream_score);
@@ -78,7 +78,8 @@ bool DmaPusher::Step() {
    }

    if (header.size > 0) {
-        if (Settings::IsDMALevelDefault() ? (Settings::IsGPULevelMedium() || Settings::IsGPULevelHigh()) : Settings::IsDMALevelSafe()) {
+        const bool use_safe = Settings::IsDMALevelDefault() ? Settings::IsGPULevelHigh() : Settings::IsDMALevelSafe();
+        if (use_safe) {
            Tegra::Memory::GpuGuestMemory<Tegra::CommandHeader, Tegra::Memory::GuestMemoryFlags::SafeRead>headers(memory_manager, dma_state.dma_get, header.size, &command_headers);
            ProcessCommands(headers);
        } else {
@@ -72,16 +72,13 @@ public:
    }

    void SignalFence(std::function<void()>&& func) {
+        const bool delay_fence = Settings::IsGPUFenceBehaviorDefault() ? Settings::IsGPULevelHigh() : Settings::IsGPUFenceBehaviorBalanced() || Settings::IsGPUFenceBehaviorAccurate() || Settings::IsGPUFenceBehaviorStrict();
+        const bool should_flush = ShouldFlush();
        if constexpr (!can_async_check) {
            TryReleasePendingFences<false>();
        }
-        const bool should_flush = ShouldFlush();
-        const bool antiflicker_toggled = Settings::values.antiflicker.GetValue();
-        const bool delay_fence = Settings::IsGPULevelHigh() ||
-                                 (Settings::IsGPULevelMedium() && should_flush) ||
-                                 antiflicker_toggled;
        CommitAsyncFlushes();
-        TFence new_fence = CreateFence(!should_flush && !antiflicker_toggled);
+        TFence new_fence = CreateFence(!should_flush);
        if constexpr (can_async_check) {
            guard.lock();
        }
@@ -17,6 +17,9 @@ set(SHADER_FILES
    ${CMAKE_CURRENT_SOURCE_DIR}/astc_decoder.comp
    ${CMAKE_CURRENT_SOURCE_DIR}/blit_color_float.frag
    ${CMAKE_CURRENT_SOURCE_DIR}/block_linear_unswizzle_2d.comp
+    ${CMAKE_CURRENT_SOURCE_DIR}/blit_color_msaa.frag
+    ${CMAKE_CURRENT_SOURCE_DIR}/blit_depth_msaa.frag
+    ${CMAKE_CURRENT_SOURCE_DIR}/blit_depth_stencil_msaa.frag
    ${CMAKE_CURRENT_SOURCE_DIR}/block_linear_unswizzle_3d.comp
    ${CMAKE_CURRENT_SOURCE_DIR}/block_linear_unswizzle_3d_bcn.comp
    ${CMAKE_CURRENT_SOURCE_DIR}/convert_abgr8_to_d24s8.frag
@@ -26,7 +29,9 @@ set(SHADER_FILES
    ${CMAKE_CURRENT_SOURCE_DIR}/convert_depth_to_float.frag
    ${CMAKE_CURRENT_SOURCE_DIR}/convert_float_to_depth.frag
    ${CMAKE_CURRENT_SOURCE_DIR}/convert_msaa_to_non_msaa.comp
+    ${CMAKE_CURRENT_SOURCE_DIR}/convert_msaa_to_non_msaa.frag
    ${CMAKE_CURRENT_SOURCE_DIR}/convert_non_msaa_to_msaa.comp
+    ${CMAKE_CURRENT_SOURCE_DIR}/convert_non_msaa_to_msaa.frag
    ${CMAKE_CURRENT_SOURCE_DIR}/convert_s8d24_to_abgr8.frag
    ${CMAKE_CURRENT_SOURCE_DIR}/full_screen_triangle.vert
    ${CMAKE_CURRENT_SOURCE_DIR}/fxaa.frag
@@ -0,0 +1,13 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#version 450 core
+
+layout(binding = 0) uniform sampler2DMS tex;
+
+layout(location = 0) in vec2 texcoord;
+layout(location = 0) out vec4 color;
+
+void main() {
+    color = texelFetch(tex, ivec2(texcoord), gl_SampleID);
+}
@@ -0,0 +1,12 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#version 450 core
+
+layout(binding = 0) uniform sampler2DMS depth_tex;
+
+layout(location = 0) in vec2 texcoord;
+
+void main() {
+    gl_FragDepth = texelFetch(depth_tex, ivec2(texcoord), 0).r;
+}
@@ -0,0 +1,15 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#version 450 core
+#extension GL_ARB_shader_stencil_export : require
+
+layout(binding = 0) uniform sampler2DMS depth_tex;
+layout(binding = 1) uniform usampler2DMS stencil_tex;
+
+layout(location = 0) in vec2 texcoord;
+
+void main() {
+    gl_FragDepth = texelFetch(depth_tex, ivec2(texcoord), 0).r;
+    gl_FragStencilRefARB = int(texelFetch(stencil_tex, ivec2(texcoord), 0).r);
+}
@@ -0,0 +1,22 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#version 450 core
+
+layout(binding = 0) uniform sampler2DMS msaa_in;
+
+layout(push_constant) uniform PushConstants {
+    ivec2 dst_offset;
+    ivec2 src_offset;
+    ivec2 scale;
+};
+
+layout(location = 0) out vec4 frag_color;
+
+void main() {
+    const ivec2 coord = ivec2(gl_FragCoord.xy) - dst_offset + src_offset;
+    const ivec2 msaa_coord = coord / scale;
+    const ivec2 sample_offset = coord % scale;
+    const int sample_id = sample_offset.x + scale.x * sample_offset.y;
+    frag_color = texelFetch(msaa_in, msaa_coord, sample_id);
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
lizzie	fdb415fbdd	fix span shit	2026-07-21 11:29:26 +02:00
lizzie	b8c6085e5a	[audio_core] remove dangling Core::System& references Signed-off-by: lizzie <lizzie@eden-emu.dev>	2026-07-21 11:29:26 +02:00
lizzie	89004124a5	[video_core] use bool params for read/writes and cascade them thru the calltree (#4001 ) should make codegen a tad bit better and reduce icache pressure for what is otherwise a glorified memcpy Signed-off-by: lizzie <lizzie@eden-emu.dev> Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4001 Reviewed-by: Maufeat <sahyno1996@gmail.com> Reviewed-by: CamilleLaVey <camillelavey99@gmail.com> Reviewed-by: MaranBr <maranbr@eden-emu.dev>	2026-07-18 21:01:58 +02:00
CamilleLaVey	eb9280dedf	[vulkan] 4th Vulkan Global Maintenance (#4212 ) The approach on this PR moves around refactoring/ updating residual work; main issue was the whole logic behind msaa upload/download images with the constant image copy per pass required; which was gated via shaderStorageImageMultisample, which is not available on all the platforms supported including Android, making them to rely into a more heavier approach to convert msaa image copy into a non msaa image copy, not only losing precision in the conversion, but also creating bugs around the resolve of the image itself, if the supported path had to copy 2 times the same image to be actually presentable, when the fallback was enabled 3 copies were performed, not only decreasing the performance but also increasing race conditions due to the certain capabilities processed in this chain (storage_views). In order to resolve them more naturally, the constant copies were removed from the now "common" path along establishing a proper color resolve for Android and actually making them more direct. Yet this opened a new pack of outdated handling on our current backend; since we now pass msaa images more directly (whenever a game request a msaa type of image/ which seems to be not common + each fragment resolves images on how it's actually required, adding missing depth/stencil), how we often load and store them becomes a critical issue, since our current configuration renderpass/framebuffer forces to always load and load clear whenever a new attachment it's passing through the renderpass, making this really heavier on memory bandwidth limited devices as SteamDeck and others that doesn't rely on the inmediate rendering mode (Tilers vs iGPU); to prevent over allocating data, I had to re-structure part of the current renderpass and framebuffer to actually reuse part of the data/ attachments called, with flags as DON'T_CARE, simplifying partially on how we actually call attachments including their barriers and conditions (occlusion, etc), the DON'T_CARE it's specifically useful to not only prevent calling new loads (which is a flush and heavier on tiler devices) and not only reusing the actual data store, which works on the future time, this saves memory bandwidth and gives space to actually avoid the constant pressure on SYSMEM/GMEM shader resolver path. This maintenance also improved the current removal features logic on QCOM drivers, closing gaps between implementations on descriptors (VK_EXT_indexing_descriptor), adjusting the whole WMEL to avoid being so stricter if certain capabilities are missing to actually use this feature, leading to test and play more on how QCOM drivers are actually behaving; meanwhile the main objective is to open path for a robust and bigger implementation in the future, the changes made here also contains small bug fixes on SPIR-V logic, adding missing cases to resolve shaders (FP64 -> FP16), adding more robustness on how narrow features are actually being used and how to wired them whenever they're not available, meanwhile there are still some issues in regards on how Tegra vs Adreno can preserve unorms at FP32 and FP16, leaving better understanding on base for what VK_EXT_shader_float_controls is actually doing most of the times (flushes NaN's and Denorms equally). Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4212	2026-07-16 20:56:00 +02:00
Eden CI	8b8034a2a0	[dist, android] Update translations from Transifex for Jul 14 (#4205 ) Automatic translation update for Jul 14 Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4205	2026-07-14 16:04:34 +02:00
lizzie	9a0e6b3c28	[msvc] fix error with new <T>bitfields (#4196 ) fixes MSVC build errors Signed-off-by: lizzie <lizzie@eden-emu.dev> Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4196 Reviewed-by: CamilleLaVey <camillelavey99@gmail.com>	2026-07-13 21:12:13 +02:00
MaranBr	defb8bf2e2	[video_core] Fix crash using RenderDoc (#4188 ) This fixes a crash issue when RenderDoc is attached. Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4188 Reviewed-by: CamilleLaVey <camillelavey99@gmail.com>	2026-07-12 20:25:36 +02:00
lizzie	6295d23581	[qt] remove stale compat list setting (#4202 ) if we are REALLY going thru for removing the entire game compat list subsystem, we ought to remove the setting itself I kept this PR separate because we MAY want to introduce emuready compatibility, so keeping the setting will keep compatibility with older setting files from users... Signed-off-by: lizzie <lizzie@eden-emu.dev> Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4202 Reviewed-by: MaranBr <maranbr@eden-emu.dev> Reviewed-by: CamilleLaVey <camillelavey99@gmail.com>	2026-07-12 20:24:35 +02:00
lizzie	7f85c6e282	[qt] nuke game compat list (again) (#4201 ) we have no use for it it's dead code most of the time users just complain about how the list isn't updated ok so what if we update it? great now its more noise added to the git, awesome even if we constantly update it, we introduce new breakage that makes keeping track of things extremely difficult either we integrate with emuready (would violate self containment principles) or we integrate with emuready in a similar fashion to eden news outlet (where we cache the list with some TTL of like 60 mins or whatever) that would be better respecting of "self containment" but would probably require having a quick way to update the list additively, probably filtered to the user's device instead of a global thing, and i dont think emuready has that granularity nor we have the "connect this to that" for the api stuffs another (which is what i propose here) is throw everything out of the window until someone can come up with something better Signed-off-by: lizzie <lizzie@eden-emu.dev> Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4201 Reviewed-by: Maufeat <sahyno1996@gmail.com> Reviewed-by: CamilleLaVey <camillelavey99@gmail.com>	2026-07-12 09:32:11 +02:00
Eden CI	39b2c79985	[dist, android] Update translations from Transifex for Jul 11 (#4200 ) Automatic translation update for Jul 11 Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4200	2026-07-12 02:50:58 +02:00
MaranBr	a27d35463e	[video_core] Improve synchronization and refactor buffer cache timing logic (#4182 ) This simplifies the GPU accuracy setting by removing the intermediate Balanced mode and setting High as the default on desktop platforms. It introduces a dedicated setting for GPU fence behavior, allowing the synchronization policy to be configured independently of GPU accuracy. The Vulkan buffer cache now tracks GPU recording timeline ticks and waits only when necessary, reducing unnecessary synchronization while maintaining correctness for hard-to-trace graphical bugs. GPU buffer readback has also been refined to synchronize only the affected upload regions when needed, and default DMA behavior has been updated to align with the new GPU accuracy model. ### TL;DR The fix for particles freezing and unfreezing in mid-air in `Super Mario Odyssey` has been improved, resulting in less of a performance hit. This game requires the new `Enable GPU Buffer Readback` option to be enabled to fix this issue. The vertex explosions that occurred in `Super Mario Bros. Wonder`, especially in World 4, have been completely eliminated. You can now enjoy a smooth experience without graphical glitches exploding across the screen. This game requires the new `GPU Fence Behavior` option to be set to `Strict` to fully fix this issue. The flickering issue inside certain Shrines in `The Legend of Zelda: Tears of the Kingdom` has also been fixed. For now, this game requires the new `GPU Fence Behavior` option to be set to `Accurate` to fully fix this issue. These options are intended to fix graphical bugs in games that require better synchronization behavior between CPU and GPU, so other games may be affected as well. Co-authored-by: xbzk <xbzk@eden-emu.dev> Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4182 Reviewed-by: Lizzie <lizzie@eden-emu.dev>	2026-07-10 05:25:12 +02:00
John	5606edd1a6	[Vulkan] Regression Fix - Return BindVertexBuffer2EXT old path (#4199 ) Fixes Triangle SMO Smoke Regression Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4199	2026-07-10 05:00:49 +02:00
crueter	cd003e5ec9	[cmake] Fix CPMUtil on Windows by avoiding a temp dir (#4195 ) Signed-off-by: crueter <crueter@eden-emu.dev> Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4195 Reviewed-by: MaranBr <maranbr@eden-emu.dev> Reviewed-by: CamilleLaVey <camillelavey99@gmail.com>	2026-07-10 01:21:17 +02:00