fix le crash

fx
coalesce
2026-08-15 13:16:43 +00:00 · 2026-04-28 00:52:15 +00:00 · 2026-04-28 00:52:15 +00:00 · 2026-04-28 00:52:15 +00:00 · 2026-04-28 00:52:15 +00:00
138 changed files with 15405 additions and 17739 deletions
@@ -268,6 +268,11 @@ if (NOT EXISTS ${PROJECT_BINARY_DIR}/${compat_json})
    file(WRITE ${PROJECT_BINARY_DIR}/${compat_json} "")
 endif()

+if (YUZU_LEGACY)
+    message(WARNING "Making legacy build. Performance may suffer.")
+    add_compile_definitions(YUZU_LEGACY)
+endif()
+
 if (ARCHITECTURE_arm64 AND (ANDROID OR PLATFORM_LINUX))
    set(HAS_NCE 1)
    add_compile_definitions(HAS_NCE=1)
@@ -419,10 +424,10 @@ if (zstd_ADDED)
    add_library(zstd::libzstd ALIAS libzstd_static)
 endif()

-# nlohmann
-AddJsonPackage(nlohmann)
-
 if (NOT YUZU_STATIC_ROOM)
+    # nlohmann
+    AddJsonPackage(nlohmann)
+
    # zlib
    AddJsonPackage(zlib)

@@ -444,11 +449,6 @@ if (NOT YUZU_STATIC_ROOM)
    if (NOT TARGET Opus::opus)
        add_library(Opus::opus ALIAS opus)
    endif()
-
-    if (APPLE)
-        # KosmicKrisp
-        AddJsonPackage(kosmickrisp)
-    endif()
 endif()

 if(NOT TARGET Boost::headers)
@@ -485,7 +485,7 @@ endfunction()
 # =============================================

 if (APPLE)
-    foreach(fw Carbon Metal Cocoa IOKit CoreVideo CoreMedia Security)
+    foreach(fw Carbon Metal Cocoa IOKit CoreVideo CoreMedia)
        find_library(${fw}_LIBRARY ${fw} REQUIRED)
        list(APPEND PLATFORM_LIBRARIES ${${fw}_LIBRARY})
    endforeach()
@@ -33,11 +33,9 @@ endif()
 set(GIT_DESC ${BUILD_VERSION})

 # Generate cpp with Git revision from template
+# Also if this is a CI build, add the build name (ie: Nightly, Canary) to the scm_rev file as well

-# TODO(crueter): Stable releases feed.
-set(BUILD_AUTO_UPDATE_STABLE_REPO "eden-emu/eden")
-set(BUILD_AUTO_UPDATE_STABLE_API "git.eden-emu.dev")
-set(BUILD_AUTO_UPDATE_STABLE_API_PATH "/api/v1/repos/")
+# Auto-updater metadata! Must somewhat mirror GitHub/Forgejo API endpoint

 set(BUILD_AUTO_UPDATE_API_PATH "/latest/release.json")
 if (NIGHTLY_BUILD)
@@ -114,14 +114,5 @@
            "QUAZIP_INSTALL OFF",
            "QUAZIP_ENABLE_QTEXTCODEC OFF"
        ]
-    },
-    "kosmickrisp": {
-        "package": "KosmicKrisp",
-        "repo": "crueter-ci/KosmicKrisp",
-        "hash": "4709fb3735ed40048cab9a64abed9a661517dada92b6e8928d578e947fdd6af21b3da4887822f4c3ad3055c6641f9a63243e10e2dd2bba00379618dcc0cda4be",
-        "git_version": "26.0.6",
-        "tag": "v%VERSION%",
-        "artifact": "KosmicKrisp-%VERSION%.tar.zst",
-        "bundled": true
    }
 }
@@ -389,3 +389,17 @@ if (ANDROID)

    add_library(oboe::oboe ALIAS oboe)
 endif()
+
+if (APPLE)
+    # moltenvk
+    if (NOT YUZU_USE_BUNDLED_MOLTENVK)
+        find_library(MOLTENVK_LIBRARY MoltenVK)
+    endif()
+
+    # TODO: kosmickrisp?
+    if (NOT MOLTENVK_LIBRARY OR YUZU_USE_BUNDLED_MOLTENVK)
+        AddJsonPackage(moltenvk)
+
+        set(MOLTENVK_LIBRARY "${moltenvk_SOURCE_DIR}/MoltenVK/dylib/macOS/libMoltenVK.dylib" CACHE STRING "" FORCE)
+    endif()
+endif()
@@ -174,6 +174,14 @@
        "bundled": true,
        "skip_updates": "true"
    },
+    "moltenvk": {
+        "repo": "V380-Ori/Ryujinx.MoltenVK",
+        "tag": "v%VERSION%-ryujinx",
+        "git_version": "1.4.1",
+        "artifact": "MoltenVK-macOS.tar",
+        "hash": "5695b36ca5775819a71791557fcb40a4a5ee4495be6b8442e0b666d0c436bec02aae68cc6210183f7a5c986bdbec0e117aecfad5396e496e9c2fd5c89133a347",
+        "bundled": true
+    },
    "gamemode": {
        "repo": "FeralInteractive/gamemode",
        "sha": "ce6fe122f3",
@@ -25,16 +25,6 @@ if (NIGHTLY_BUILD)
    add_compile_definitions(NIGHTLY_BUILD)
 endif()

-if (YUZU_LEGACY)
-    message(WARNING "Making legacy build. Performance may suffer.")
-    add_compile_definitions(YUZU_LEGACY)
-endif()
-
-if (GENSHIN_SPOOF)
-    message(WARNING "Making Genshin spoof build")
-    add_compile_definitions(GENSHIN_SPOOF)
-endif()
-
 # Set compilation flags
 if (MSVC AND NOT CXX_CLANG)
    set(CMAKE_CONFIGURATION_TYPES Debug Release CACHE STRING "" FORCE)
@@ -203,12 +203,6 @@ android {
            resValue("string", "app_name_suffixed", "Eden Optimized")
            applicationId = "com.miHoYo.Yuanshen"

-            externalNativeBuild {
-                cmake {
-                    arguments.add("-DGENSHIN_SPOOF=ON")
-                }
-            }
-
            ndk {
                abiFilters += listOf("arm64-v8a")
            }
@@ -33,19 +33,6 @@ import org.yuzu.yuzu_emu.applets.web.WebBrowser
 * with the native side of the Yuzu code.
 */
 object NativeLibrary {
-    @Keep
-    data class UpdateResult(
-        var tag: String = "",
-        var title: String = "",
-        var body: String = "",
-        var url: String = "",
-        var assets: MutableList<String> = mutableListOf()
-    ) {
-        fun addAsset(asset: String) {
-            assets.add(asset)
-        }
-    }
-
    @JvmField
    var sEmulationActivity = WeakReference<EmulationActivity?>(null)

@@ -253,7 +240,17 @@ object NativeLibrary {
    /**
     * Checks for available updates.
     */
-    external fun checkForUpdate(): UpdateResult?
+    external fun checkForUpdate(): Array<String>?
+
+    /**
+     * Return the URL to the release page
+     */
+    external fun getUpdateUrl(version: String): String
+
+    /**
+     * Return the URL to download the APK for the given version
+     */
+    external fun getUpdateApkUrl(tag: String, artifact: String, packageId: String): String

    /**
     * Returns whether the update checker is enabled through CMAKE options.
@@ -175,25 +175,25 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
            val latestVersion = NativeLibrary.checkForUpdate()
            if (latestVersion != null) {
                runOnUiThread {
-                    showUpdateDialog(latestVersion)
+                    val tag: String = latestVersion[0]
+                    val name: String = latestVersion[1]
+                    showUpdateDialog(tag, name)
                }
            }
        }.start()
    }

-    // TODO(crueter): body, "View on Forgejo" button
-    private fun showUpdateDialog(release: NativeLibrary.UpdateResult) {
+    private fun showUpdateDialog(tag: String, name: String) {
        MaterialAlertDialogBuilder(this)
            .setTitle(R.string.update_available)
-            .setMessage(getString(R.string.update_available_description, release.title))
+            .setMessage(getString(R.string.update_available_description, name))
            .setPositiveButton(android.R.string.ok) { _, _ ->
-                val assets = release.assets
-
-                if (assets.isEmpty()) {
-                    openLink(release.url)
-                } else {
-                    downloadAndInstallUpdate(release)
+                var artifact = tag
+                // Nightly builds have a slightly different format
+                if (NativeLibrary.isNightlyBuild()) {
+                    artifact = tag.substringAfter('.', tag)
                }
+                downloadAndInstallUpdate(tag, artifact)
            }
            .setNeutralButton(R.string.cancel) { dialog, _ ->
                dialog.dismiss()
@@ -206,23 +206,17 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
            .show()
    }

-    private fun openLink(link: String) {
-        val intent = Intent(Intent.ACTION_VIEW, link.toUri())
-        startActivity(intent)
-    }
-
-    private fun downloadAndInstallUpdate(release: NativeLibrary.UpdateResult) {
+    private fun downloadAndInstallUpdate(version: String, artifact: String) {
        CoroutineScope(Dispatchers.IO).launch {
            val packageId = applicationContext.packageName
-            val asset = release.assets[0]
-            val artifact = asset.split("/").last()
+            val apkUrl = NativeLibrary.getUpdateApkUrl(version, artifact, packageId)
            val apkFile = File(cacheDir, "update-$artifact.apk")

            withContext(Dispatchers.Main) {
                showDownloadProgressDialog()
            }

-            val downloader = APKDownloader(asset, apkFile)
+            val downloader = APKDownloader(apkUrl, apkFile)
            downloader.download(
                onProgress = { progress ->
                    runOnUiThread {
@@ -254,7 +248,7 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
                        } else {
                            Toast.makeText(
                                this@MainActivity,
-                                getString(R.string.update_download_failed) + "\n\nURL: $asset",
+                                getString(R.string.update_download_failed) + "\n\nURL: $apkUrl",
                                Toast.LENGTH_LONG
                            ).show()
                        }
@@ -283,7 +277,7 @@ class MainActivity : AppCompatActivity(), ThemeProvider {

    private fun updateDownloadProgress(progress: Int) {
        progressBar?.progress = progress
-        progressMessage?.text = getString(R.string.percent, progress)
+        progressMessage?.text = "$progress%"
    }

    private fun dismissDownloadProgressDialog() {
@@ -1699,76 +1699,76 @@ JNIEXPORT jboolean JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_isNightlyBuild(
 #ifdef ENABLE_UPDATE_CHECKER


-JNIEXPORT jobject JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_checkForUpdate(
+JNIEXPORT jobjectArray JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_checkForUpdate(
        JNIEnv* env,
        jobject obj) {
-    std::optional<Common::Net::Release> release = UpdateChecker::GetUpdate();
+    std::optional<UpdateChecker::Update> release = UpdateChecker::GetUpdate();
    if (!release) return nullptr;

    const std::string tag = release->tag;
-    const std::string title = release->title;
-    const std::string body = release->body;
-    const std::string url = release->html_url;
+    const std::string name = release->name;

-    // Android *should* only ever define a single asset.
-    // If not, something has gone wrong, but the Kotlin side can handle it.
-    const auto assets = release->GetPlatformAssets();
+    jobjectArray result = env->NewObjectArray(2, env->FindClass("java/lang/String"), nullptr);

-    jclass updateResultClass = env->FindClass("org/yuzu/yuzu_emu/NativeLibrary$UpdateResult");
-    if (!updateResultClass) {
-        LOG_ERROR(Frontend, "Could not find UpdateResult class");
-        return nullptr;
-    }
-
-    jmethodID updateResultCtor = env->GetMethodID(updateResultClass, "<init>", "()V");
-
-    if (!updateResultCtor) {
-        LOG_ERROR(Frontend, "Could not find UpdateResult ctor");
-        env->DeleteLocalRef(updateResultClass);
-        return nullptr;
-    }
-
-    jmethodID setTag = env->GetMethodID(updateResultClass, "setTag", "(Ljava/lang/String;)V");
-    jmethodID setTitle = env->GetMethodID(updateResultClass, "setTitle", "(Ljava/lang/String;)V");
-    jmethodID setBody = env->GetMethodID(updateResultClass, "setBody", "(Ljava/lang/String;)V");
-    jmethodID setUrl = env->GetMethodID(updateResultClass, "setUrl", "(Ljava/lang/String;)V");
-    jmethodID addAsset = env->GetMethodID(updateResultClass, "addAsset", "(Ljava/lang/String;)V");
-
-    jobject updateResult = env->NewObject(updateResultClass, updateResultCtor);
-
-    LOG_DEBUG(Frontend, "Tag: {}", tag);
-    LOG_DEBUG(Frontend, "Title: {}", title);
-    LOG_DEBUG(Frontend, "Body: {}", body);
-    LOG_DEBUG(Frontend, "Url: {}", url);
-
-    const auto jtag = env->NewStringUTF(tag.c_str());
-    const auto jtitle = env->NewStringUTF(title.c_str());
-    const auto jbody = env->NewStringUTF(body.c_str());
-    const auto jurl = env->NewStringUTF(url.c_str());
-
-    env->CallVoidMethod(updateResult, setTag, jtag);
-    env->CallVoidMethod(updateResult, setTitle, jtitle);
-    env->CallVoidMethod(updateResult, setBody, jbody);
-    env->CallVoidMethod(updateResult, setUrl, jurl);
-
-    // TODO(crueter): Handling for multiple assets?
-    // Maybe another data class x(
-    for (const Common::Net::Asset &a : assets) {
-        const auto jaurl = env->NewStringUTF(a.path.c_str());
-        env->CallVoidMethod(updateResult, addAsset, jaurl);
-        env->DeleteLocalRef(jaurl);
-    }
+    const jstring jtag = env->NewStringUTF(tag.c_str());
+    const jstring jname = env->NewStringUTF(name.c_str());

+    env->SetObjectArrayElement(result, 0, jtag);
+    env->SetObjectArrayElement(result, 1, jname);
    env->DeleteLocalRef(jtag);
-    env->DeleteLocalRef(jtitle);
-    env->DeleteLocalRef(jbody);
-    env->DeleteLocalRef(jurl);
+    env->DeleteLocalRef(jname);

-    env->DeleteLocalRef(updateResultClass);
-
-    return updateResult;
+    return result;
 }

+JNIEXPORT jstring JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_getUpdateUrl(
+        JNIEnv* env,
+        jobject obj,
+        jstring version) {
+    const char* version_str = env->GetStringUTFChars(version, nullptr);
+    const std::string url = fmt::format("{}/{}",
+        std::string{Common::g_build_auto_update_api},
+        version_str);
+    env->ReleaseStringUTFChars(version, version_str);
+    return env->NewStringUTF(url.c_str());
+}
+
+JNIEXPORT jstring JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_getUpdateApkUrl(
+        JNIEnv* env,
+        jobject obj,
+        jstring tag,
+        jstring artifact,
+        jstring packageId) {
+    const char* version_str = env->GetStringUTFChars(tag, nullptr);
+    const char* artifact_str = env->GetStringUTFChars(artifact, nullptr);
+    const char* package_id_str = env->GetStringUTFChars(packageId, nullptr);
+
+    std::string variant;
+    std::string package_id(package_id_str);
+
+    if (package_id.find("dev.legacy.eden_emulator") != std::string::npos) {
+        variant = "legacy";
+    } else if (package_id.find("com.miHoYo.Yuanshen") != std::string::npos) {
+        variant = "optimized";
+    } else {
+#ifdef ARCHITECTURE_arm64
+        variant = "standard";
+#else
+        variant = "chromeos";
+#endif
+    }
+
+    const std::string apk_filename = fmt::format("Eden-Android-{}-{}.apk", artifact_str, variant);
+
+    const std::string url = fmt::format("https://{}/{}/{}",
+        std::string{Common::g_build_auto_update_api},
+        version_str, apk_filename);
+
+    env->ReleaseStringUTFChars(tag, version_str);
+    env->ReleaseStringUTFChars(artifact, artifact_str);
+    env->ReleaseStringUTFChars(packageId, package_id_str);
+    return env->NewStringUTF(url.c_str());
+}
 #endif

 JNIEXPORT jstring JNICALL Java_org_yuzu_yuzu_1emu_NativeLibrary_getBuildVersion(
@@ -1159,6 +1159,5 @@
    <string name="license_fidelityfx_fsr_description">تحسين الجودة بدرجة عالية من AMD</string>
    <string name="external_content">محتوى خارجي</string>
    <string name="add_folders">إضافة مجلد</string>
-    <string name="percent">%1$d%%</string>

 </resources>
@@ -767,7 +767,7 @@
    <string name="version">Versión</string>
    <string name="copy_details">Copiar detalles</string>
    <string name="add_ons">Complementos</string>
-    <string name="add_ons_description">Alternar mods, actualizaciones y contenido descargable</string>
+    <string name="add_ons_description">Activa/desactiva mods, actualizaciones y contenidos descargables</string>
    <string name="playtime">Tiempo jugado:</string>
    <string name="reset_playtime">Borrar tiempo de juego</string>
    <string name="reset_playtime_description">Restablecer el tiempo de juego actual a 0 segundos</string>
@@ -1153,6 +1153,5 @@
    <string name="license_fidelityfx_fsr_description">Upscaling de alta calidad de AMD</string>
    <string name="external_content">Contenido externo</string>
    <string name="add_folders">Añadir carpeta</string>
-    <string name="percent">%1$d%%</string>

 </resources>
@@ -413,9 +413,7 @@
    <string name="frame_limit_slider">Limiter le pourcentage de vitesse</string>
    <string name="frame_limit_slider_description">Spécifier le pourcentage pour limiter la vitesse d\'émulation. 100% correspond à la vitesse normale. Des valeurs plus élevées ou plus basses augmenteront ou diminueront la limite de vitesse.</string>
    <string name="turbo_speed_limit">Vitesse turbo</string>
-    <string name="turbo_speed_limit_description">Lorsque le mode Turbo est activé, l\'émulation s\'exécute à cette vitesse.</string>
    <string name="slow_speed_limit">Vitesse lente</string>
-    <string name="slow_speed_limit_description">Lorsque le mode Lent est activé, l\'émulation s\'exécute à cette vitesse.</string>
    <string name="cpu_backend">Backend du CPU</string>
    <string name="cpu_accuracy">Précision du CPU</string>
    <string name="value_with_units">%1$s%2$s</string>
@@ -489,8 +489,6 @@
    <string name="enable_buffer_history">Включить историю буфера</string>
    <string name="enable_buffer_history_description">Позволяет обращаться к предыдущим состояниям буфера. Эта опция может повысить качество рендеринга и стабильность производительности в некоторых играх.</string>
    <string name="use_optimized_vertex_buffers">Оптимизированные вершинные буферы</string>
-    <string name="use_optimized_vertex_buffers_description">Включает оптимизированную привязку вершинного буфера для повышения производительности. Требует Mesa Turnip 26.0+ / QCOM драйверы. Приводит к вылету на старых версиях Turnip.</string>
-
    <string name="hacks">Хаки</string>

    <string name="fast_gpu_time">Быстрое время ГПУ</string>
@@ -498,9 +496,6 @@
    <string name="skip_cpu_inner_invalidation">Пропустить внутреннюю инвалидацию ЦП</string>
    <string name="skip_cpu_inner_invalidation_description">Пропускает некоторые инвалидации кэша на стороне ЦП при обновлениях памяти, уменьшая нагрузку на процессор и повышая производительность. Может вызывать сбои в некоторых играх.</string>
    <string name="fix_bloom_effects">Исправить эффекты размытия</string>
-    <string name="fix_bloom_effects_description">Частично убирает размытие в LA/EOW (Adreno A6XX - A7XX/ Turnip), полностью отключает его в Burnout. Внимание: может вызывать графические артефакты в других играх.</string>
-    <string name="emulate_bgr565">Эмулировать BGR565</string>
-    <string name="emulate_bgr565_description">Исправляет проблемы с инвертированными цветами в играх, а также со странными артефактами или некорректными тенями.</string>
    <string name="renderer_asynchronous_shaders">Использовать асинхронные шейдеры</string>
    <string name="renderer_asynchronous_shaders_description">Компилирует шейдеры асинхронно. Это может уменьшить подтормаживания, но также может вызвать графические артефакты.</string>
    <string name="gpu_unswizzle_settings">Настройки распаковки текстур (Unswizzle)</string>
@@ -1155,4 +1150,5 @@
    <string name="license_fidelityfx_fsr_description">Высококачественное масштабирование от AMD</string>
    <string name="external_content">Дополнительный контент</string>
    <string name="add_folders">Добавить папку</string>
-    </resources>
+
+</resources>
@@ -1155,6 +1155,5 @@
    <string name="license_fidelityfx_fsr_description">Високоякісне масштабування від AMD</string>
    <string name="external_content">Зовнішній вміст</string>
    <string name="add_folders">Додати теку</string>
-    <string name="percent">%1$d%%</string>

 </resources>
@@ -483,8 +483,6 @@
    <string name="enable_buffer_history">启用缓冲区历史</string>
    <string name="enable_buffer_history_description">启用对先前缓冲区状态的访问。此选项可在某些游戏中提升渲染质量并保持性能的一致性。</string>
    <string name="use_optimized_vertex_buffers">优化顶点缓冲区</string>
-    <string name="use_optimized_vertex_buffers_description">启用经过优化的顶点缓冲区绑定以提升性能。需要 Mesa 26.0 及以上版本的 Turnip 或 QCOM 驱动程序。若使用较旧版本的 Turnip 驱动则会导致崩溃。</string>
-
    <string name="hacks">Hacks</string>

    <string name="fast_gpu_time">GPU 超频频率</string>
@@ -492,9 +490,6 @@
    <string name="skip_cpu_inner_invalidation">跳过CPU内部无效化</string>
    <string name="skip_cpu_inner_invalidation_description">在内存更新期间跳过某些CPU端缓存无效化，减少CPU使用率并提高其性能。可能会导致某些游戏出现故障或崩溃。</string>
    <string name="fix_bloom_effects">修复 Bloom 效果</string>
-    <string name="fix_bloom_effects_description">减少《塞尔达传说：智慧的再现》（Adreno A6XX - A7XX/ Turnip）中的 bloom 模糊，并移除《Burnout》中的 bloom 效果。警告：可能会导致在其他游戏中出现图形异常。</string>
-    <string name="emulate_bgr565">模拟 BGR565</string>
-    <string name="emulate_bgr565_description">修复了游戏中的颜色反转以及出现的异常画面瑕疵或奇怪阴影问题</string>
    <string name="renderer_asynchronous_shaders">使用异步着色器</string>
    <string name="renderer_asynchronous_shaders_description">异步编译着色器。这可能会减少卡顿，但也可能会导致图形错误。</string>
    <string name="gpu_unswizzle_settings">GPU 还原设置</string>
@@ -1149,6 +1144,5 @@
    <string name="license_fidelityfx_fsr_description">AMD 的高品质画面增强技术</string>
    <string name="external_content">外部内容</string>
    <string name="add_folders">添加文件夹</string>
-    <string name="percent">%1$d%%</string>

 </resources>
@@ -1783,6 +1783,5 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

    <string name="external_content">External Content</string>
    <string name="add_folders">Add Folder</string>
-    <string name="percent">%1$d%%</string>

 </resources>
@@ -147,8 +147,7 @@ add_library(
    zstd_compression.h
    fs/ryujinx_compat.h fs/ryujinx_compat.cpp
    fs/symlink.h fs/symlink.cpp
-    httplib.h
-    net/net.h net/net.cpp)
+    httplib.h)

 if(WIN32)
    target_sources(common PRIVATE windows/timer_resolution.cpp
@@ -246,7 +245,7 @@ else()
    target_link_libraries(common PUBLIC Boost::headers)
 endif()

-target_link_libraries(common PUBLIC Boost::filesystem Boost::context httplib::httplib nlohmann_json::nlohmann_json)
+target_link_libraries(common PUBLIC Boost::filesystem Boost::context httplib::httplib)

 if (lz4_ADDED)
    target_include_directories(common PRIVATE ${lz4_SOURCE_DIR}/lib)
@@ -1,287 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#include <optional>
-#include <boost/algorithm/string/classification.hpp>
-#include <boost/algorithm/string/replace.hpp>
-#include <boost/algorithm/string/split.hpp>
-
-#include <fmt/format.h>
-#include "common/scm_rev.h"
-#include "net.h"
-
-#include "common/logging.h"
-
-#include "common/httplib.h"
-
-#ifdef YUZU_BUNDLED_OPENSSL
-#include <openssl/cert.h>
-#endif
-
-#define QT_TR_NOOP(x) x
-
-namespace Common::Net {
-
-std::vector<Asset> Release::GetPlatformAssets() const {
-    // TODO(crueter): Need better handling for this as a whole.
-#ifdef NIGHTLY_BUILD
-    std::vector<std::string> result;
-    boost::algorithm::split(result, tag, boost::is_any_of("."));
-    if (result.size() != 2)
-        return {};
-    const auto ref = result.at(1);
-#else
-    const auto ref = tag;
-#endif
-
-    std::vector<Asset> found_assets;
-
-    // FIXME: This is mildly inefficient.
-    // Finds assets based on a hierarchy of regex search strings.
-    const auto find_asset = [&found_assets, ref, this](const std::string& name,
-                                                       const std::vector<std::string>& suffixes) {
-        for (const std::string& asset : assets) {
-            for (const auto& suffix : suffixes) {
-                if (asset.ends_with(suffix)) {
-                    const std::string_view asset_sv = asset;
-                    const size_t pos = asset_sv.find_last_of('/');
-                    const std::string_view filename =
-                        (pos != std::string_view::npos) ? asset_sv.substr(pos + 1) : asset_sv;
-
-                    found_assets.emplace_back(Asset{
-                        .name = name,
-                        .url = host,
-                        .path = asset,
-                        .filename = std::string{filename},
-                    });
-                    return;
-                }
-            }
-        }
-    };
-
-#ifdef _WIN32
-#ifdef ARCHITECTURE_x86_64
-    find_asset("Standard", {"amd64-msvc-standard.exe", "amd64-msvc-standard.zip", "mingw-amd64-gcc-standard.exe", "mingw-amd64-gcc-standard.zip"});
-    find_asset("PGO", {"mingw-amd64-clang-pgo.exe", "mingw-amd64-clang-pgo.zip"});
-#elif defined(ARCHITECTURE_arm64)
-    find_asset("Standard", {"mingw-arm64-clang-standard.exe", "mingw-arm64-clang-standard.zip"});
-    find_asset("PGO", {"mingw-arm64-clang-pgo.exe", "mingw-arm64-clang-pgo.zip"});
-#endif
-#elif defined(__APPLE__)
-#ifdef ARCHITECTURE_arm64
-    find_asset("Standard", {".dmg", ".tar.gz"});
-#endif
-#elif defined(__ANDROID__)
-#ifdef ARCHITECTURE_x86_64
-    find_asset("Standard", {"chromeos.apk"});
-#elif defined(ARCHITECTURE_arm64)
-#ifdef YUZU_LEGACY
-    find_asset("Standard", {"legacy.apk"});
-#elif defined(GENSHIN_SPOOF)
-    find_asset("Standard", {"optimized.apk"});
-#else
-    find_asset("Standard", {"standard.apk"});
-#endif
-#endif
-#endif
-    return found_assets;
-}
-
-static inline u64 ParseIsoTimestamp(const std::string& iso) {
-    if (iso.empty())
-        return 0;
-
-    std::string buf = iso;
-    if (buf.back() == 'Z')
-        buf.pop_back();
-
-    std::tm tm{};
-    std::istringstream ss(buf);
-    ss >> std::get_time(&tm, "%Y-%m-%dT%H:%M:%S");
-    if (ss.fail())
-        return 0;
-
-#ifdef _WIN32
-    return static_cast<u64>(_mkgmtime(&tm));
-#else
-    return static_cast<u64>(timegm(&tm));
-#endif
-}
-
-std::optional<Release> Release::FromJson(const nlohmann::json& json, const std::string& host,
-                                         const std::string& repo) {
-    Release rel;
-    if (!json.is_object())
-        return std::nullopt;
-
-    rel.tag = json.value("tag_name", std::string{});
-    if (rel.tag.empty())
-        return std::nullopt;
-
-    rel.title = json.value("name", rel.tag);
-    rel.id = json.value("id", std::hash<std::string>{}(rel.title));
-
-    rel.published = ParseIsoTimestamp(json.value("published_at", std::string{}));
-    rel.prerelease = json.value("prerelease", false);
-
-    auto body = json.value("body", rel.title);
-    boost::replace_all(body, "\\r", "");
-    boost::replace_all(body, "\\n", "\n");
-    rel.body = body;
-
-    rel.host = host;
-
-    const auto release_base =
-        fmt::format("{}/{}/releases", Common::g_build_auto_update_website, repo);
-    const auto fallback_html = fmt::format("{}/tag/{}", release_base, rel.tag);
-    rel.html_url = json.value("html_url", fallback_html);
-
-    // This is our own "fake" API.
-    if (json.contains("base")) {
-        const auto base = json.value("base", fmt::format("https://{}", Common::g_build_auto_update_api));
-        rel.base_download_url = fmt::format("{}/{}", base, rel.tag);
-
-        // Assets are easy :)
-        rel.assets = json.value("assets", std::vector<std::string>{});
-    } else {
-        const auto base_download_url = fmt::format("/{}/releases/download/{}", repo, rel.tag);
-
-        rel.base_download_url = base_download_url;
-
-        // assets are a bit more complex here. :(
-        std::vector<std::string> assets;
-        const nlohmann::json& arr = json["assets"];
-        for (const auto &obj : arr) {
-            const auto url = obj.value("browser_download_url", std::string{});
-            assets.emplace_back(url);
-        }
-
-        rel.assets = assets;
-    }
-
-    return rel;
-}
-
-std::optional<Release> Release::FromJson(const std::string_view& json, const std::string& host,
-                                         const std::string& repo) {
-    try {
-        return FromJson(nlohmann::json::parse(json), host, repo);
-    } catch (std::exception& e) {
-        LOG_WARNING(Common, "Failed to parse JSON: {}", e.what());
-    }
-
-    return {};
-}
-
-std::vector<Release> Release::ListFromJson(const nlohmann::json& json, const std::string& host,
-                                           const std::string& repo) {
-    if (!json.is_array())
-        return {};
-
-    std::vector<Release> releases;
-    for (const auto& obj : json) {
-        auto rel = Release::FromJson(obj, host, repo);
-        if (rel)
-            releases.emplace_back(rel.value());
-    }
-    return releases;
-}
-
-std::vector<Release> Release::ListFromJson(const std::string_view& json, const std::string& host,
-                                           const std::string& repo) {
-    try {
-        return ListFromJson(nlohmann::json::parse(json), host, repo);
-    } catch (std::exception& e) {
-        LOG_WARNING(Common, "Failed to parse JSON: {}", e.what());
-    }
-
-    return {};
-}
-
-std::optional<std::string> MakeRequest(const std::string& url, const std::string& path) {
-    try {
-        constexpr std::size_t timeout_seconds = 15;
-
-        std::unique_ptr<httplib::Client> client = std::make_unique<httplib::Client>(url);
-        client->set_connection_timeout(timeout_seconds);
-        client->set_read_timeout(timeout_seconds);
-        client->set_write_timeout(timeout_seconds);
-
-#ifdef YUZU_BUNDLED_OPENSSL
-        client->load_ca_cert_store(kCert, sizeof(kCert));
-#endif
-
-        if (client == nullptr) {
-            LOG_ERROR(Common, "Invalid URL {}{}", url, path);
-            return {};
-        }
-
-        httplib::Request request{
-            .method = "GET",
-            .path = path,
-        };
-
-        client->set_follow_location(true);
-        httplib::Result result = client->send(request);
-
-        if (!result) {
-            LOG_ERROR(Common, "GET to {}{} returned null", url, path);
-            return {};
-        }
-
-        const auto& response = result.value();
-        if (response.status >= 400) {
-            LOG_ERROR(Common, "GET to {}{} returned error status code: {}", url, path,
-                      response.status);
-            return {};
-        }
-        if (!response.headers.contains("content-type")) {
-            LOG_ERROR(Common, "GET to {}{} returned no content", url, path);
-            return {};
-        }
-
-        return response.body;
-    } catch (std::exception& e) {
-        LOG_ERROR(Common, "GET to {}{} failed during update check: {}", url, path, e.what());
-        return std::nullopt;
-    }
-}
-
-std::vector<Release> GetReleases() {
-    const auto body = GetReleasesBody();
-
-    if (!body) {
-        LOG_WARNING(Common, "Failed to get stable releases");
-        return {};
-    }
-
-    const std::string_view body_str = body.value();
-    const auto url = fmt::format("https://{}", Common::g_build_auto_update_stable_api);
-    return Release::ListFromJson(body_str, url, Common::g_build_auto_update_stable_repo);
-}
-
-std::optional<Release> GetLatestRelease() {
-    const auto releases_path =  Common::g_build_auto_update_api_path;
-    const auto url = fmt::format("https://{}", Common::g_build_auto_update_api);
-
-    const auto body = MakeRequest(url, releases_path);
-    if (!body) {
-        LOG_WARNING(Common, "Failed to get latest release");
-        return std::nullopt;
-    }
-
-    const std::string_view body_str = body.value();
-    return Release::FromJson(body_str, url, Common::g_build_auto_update_repo);
-}
-
-std::optional<std::string> GetReleasesBody() {
-    const auto releases_path =
-        fmt::format("/{}/{}/releases", Common::g_build_auto_update_stable_api_path,
-                    Common::g_build_auto_update_stable_repo);
-    const auto url = fmt::format("https://{}", Common::g_build_auto_update_stable_api);
-
-    return MakeRequest(url, releases_path);
-}
-
-} // namespace Common::Net
@@ -1,56 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
-#pragma once
-
-#include <optional>
-#include <string>
-#include <vector>
-#include <nlohmann/json.hpp>
-#include "common/common_types.h"
-
-namespace Common::Net {
-
-typedef struct {
-    std::string name;
-    std::string url;
-    std::string path;
-    std::string filename;
-} Asset;
-
-typedef struct Release {
-    std::string title;
-    std::string body;
-    std::string tag;
-    std::string base_download_url;
-    std::string html_url;
-    std::string host;
-
-    std::vector<std::string> assets;
-
-    u64 id;
-    u64 published;
-    bool prerelease;
-
-    // Get the relevant list of assets for the current platform.
-    std::vector<Asset> GetPlatformAssets() const;
-
-    static std::optional<Release> FromJson(const nlohmann::json& json, const std::string &host, const std::string& repo);
-    static std::optional<Release> FromJson(const std::string_view& json, const std::string &host, const std::string& repo);
-    static std::vector<Release> ListFromJson(const nlohmann::json &json, const std::string &host, const std::string &repo);
-    static std::vector<Release> ListFromJson(const std::string_view &json, const std::string &host, const std::string &repo);
-} Release;
-
-// Make a request via httplib, and return the response body if applicable.
-std::optional<std::string> MakeRequest(const std::string &url, const std::string &path);
-
-// Get all of the latest stable releases.
-std::vector<Release> GetReleases();
-
-// Get all of the latest stable releases as text.
-std::optional<std::string> GetReleasesBody();
-
-// Get the latest release of the current channel.
-std::optional<Release> GetLatestRelease();
-
-}
@@ -22,9 +22,6 @@
 #define BUILD_AUTO_UPDATE_API "@BUILD_AUTO_UPDATE_API@"
 #define BUILD_AUTO_UPDATE_API_PATH "@BUILD_AUTO_UPDATE_API_PATH@"
 #define BUILD_AUTO_UPDATE_REPO "@BUILD_AUTO_UPDATE_REPO@"
-#define BUILD_AUTO_UPDATE_STABLE_API "@BUILD_AUTO_UPDATE_STABLE_API@"
-#define BUILD_AUTO_UPDATE_STABLE_API_PATH "@BUILD_AUTO_UPDATE_STABLE_API_PATH@"
-#define BUILD_AUTO_UPDATE_STABLE_REPO "@BUILD_AUTO_UPDATE_STABLE_REPO@"
 #define IS_NIGHTLY_BUILD @IS_NIGHTLY_BUILD@

 namespace Common {
@@ -48,8 +45,5 @@ constexpr const char g_build_auto_update_website[] = BUILD_AUTO_UPDATE_WEBSITE;
 constexpr const char g_build_auto_update_api[] = BUILD_AUTO_UPDATE_API;
 constexpr const char g_build_auto_update_api_path[] = BUILD_AUTO_UPDATE_API_PATH;
 constexpr const char g_build_auto_update_repo[] = BUILD_AUTO_UPDATE_REPO;
-constexpr const char g_build_auto_update_stable_api[] = BUILD_AUTO_UPDATE_STABLE_API;
-constexpr const char g_build_auto_update_stable_api_path[] = BUILD_AUTO_UPDATE_STABLE_API_PATH;
-constexpr const char g_build_auto_update_stable_repo[] = BUILD_AUTO_UPDATE_STABLE_REPO;

 } // namespace Common
@@ -28,8 +28,5 @@ extern const char g_build_auto_update_website[];
 extern const char g_build_auto_update_api[];
 extern const char g_build_auto_update_api_path[];
 extern const char g_build_auto_update_repo[];
-extern const char g_build_auto_update_stable_api[];
-extern const char g_build_auto_update_stable_api_path[];
-extern const char g_build_auto_update_stable_repo[];

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

 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
@@ -109,7 +109,7 @@ Result AesCtrCounterExtendedStorage::GetEntryList(Entry* out_entries, s32* out_e
    R_UNLESS(out_entries != nullptr || entry_count == 0, ResultNullptrArgument);

    // Check that our range is valid.
-    BucketTree::Offsets table_offsets{};
+    BucketTree::Offsets table_offsets;
    R_TRY(m_table.GetOffsets(std::addressof(table_offsets)));

    R_UNLESS(table_offsets.IsInclude(offset, size), ResultOutOfRange);
@@ -167,7 +167,7 @@ size_t AesCtrCounterExtendedStorage::Read(u8* buffer, size_t size, size_t offset
    ASSERT(Common::IsAligned(offset, BlockSize));
    ASSERT(Common::IsAligned(size, BlockSize));

-    BucketTree::Offsets table_offsets{};
+    BucketTree::Offsets table_offsets;
    ASSERT(R_SUCCEEDED(m_table.GetOffsets(std::addressof(table_offsets))));

    ASSERT(table_offsets.IsInclude(offset, size));
@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@@ -92,7 +89,7 @@ public:
    virtual size_t Read(u8* buffer, size_t size, size_t offset) const override;

    virtual size_t GetSize() const override {
-        BucketTree::Offsets offsets{};
+        BucketTree::Offsets offsets;
        ASSERT(R_SUCCEEDED(m_table.GetOffsets(std::addressof(offsets))));

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

 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
@@ -270,7 +270,7 @@ Result BucketTree::Find(Visitor* visitor, s64 virtual_address) {
    R_UNLESS(virtual_address >= 0, ResultInvalidOffset);
    R_UNLESS(!this->IsEmpty(), ResultOutOfRange);

-    BucketTree::Offsets offsets{};
+    BucketTree::Offsets offsets;
    R_TRY(this->GetOffsets(std::addressof(offsets)));

    R_TRY(visitor->Initialize(this, offsets));
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
@@ -125,7 +125,7 @@ private:
            }

            // Get the table offsets.
-            BucketTree::Offsets table_offsets{};
+            BucketTree::Offsets table_offsets;
            R_TRY(m_table.GetOffsets(std::addressof(table_offsets)));

            // Validate arguments.
@@ -177,7 +177,7 @@ private:
            ASSERT(out != nullptr);

            // Get our table offsets.
-            BucketTree::Offsets offsets{};
+            BucketTree::Offsets offsets;
            R_TRY(m_table.GetOffsets(std::addressof(offsets)));

            // Set the output.
@@ -195,7 +195,7 @@ private:
            R_SUCCEED_IF(size == 0);

            // Get the table offsets.
-            BucketTree::Offsets table_offsets{};
+            BucketTree::Offsets table_offsets;
            R_TRY(m_table.GetOffsets(std::addressof(table_offsets)));

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

@@ -55,7 +52,7 @@ Result IndirectStorage::GetEntryList(Entry* out_entries, s32* out_entry_count, s
    R_UNLESS(out_entries != nullptr || entry_count == 0, ResultNullptrArgument);

    // Check that our range is valid.
-    BucketTree::Offsets table_offsets{};
+    BucketTree::Offsets table_offsets;
    R_TRY(m_table.GetOffsets(std::addressof(table_offsets)));

    R_UNLESS(table_offsets.IsInclude(offset, size), ResultOutOfRange);
@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@@ -167,7 +164,7 @@ Result IndirectStorage::OperatePerEntry(s64 offset, s64 size, F func) {
    R_SUCCEED_IF(size == 0);

    // Get the table offsets.
-    BucketTree::Offsets table_offsets{};
+    BucketTree::Offsets table_offsets;
    R_TRY(m_table.GetOffsets(std::addressof(table_offsets)));

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

@@ -21,7 +18,7 @@ size_t SparseStorage::Read(u8* buffer, size_t size, size_t offset) const {
    SparseStorage* self = const_cast<SparseStorage*>(this);

    if (self->GetEntryTable().IsEmpty()) {
-        BucketTree::Offsets table_offsets{};
+        BucketTree::Offsets table_offsets;
        ASSERT(R_SUCCEEDED(self->GetEntryTable().GetOffsets(std::addressof(table_offsets))));
        ASSERT(table_offsets.IsInclude(offset, size));

@@ -268,7 +268,6 @@ Result KPageTableBase::InitializeForProcess(Svc::CreateProcessFlag as_type, bool
    // Set other basic fields.
    m_enable_aslr = enable_aslr;
    m_enable_device_address_space_merge = enable_das_merge;
-    m_allowed_exec_device_mapping = false;
    m_address_space_start = start;
    m_address_space_end = end;
    m_is_kernel = false;
@@ -223,7 +223,6 @@ private:
    bool m_is_kernel{};
    bool m_enable_aslr{};
    bool m_enable_device_address_space_merge{};
-    bool m_allowed_exec_device_mapping{};
    KMemoryBlockSlabManager* m_memory_block_slab_manager{};
    KBlockInfoManager* m_block_info_manager{};
    KResourceLimit* m_resource_limit{};
@@ -256,10 +255,6 @@ public:
        return m_enable_aslr;
    }

-    void AllowDeviceMappingOfExecPages() {
-        m_allowed_exec_device_mapping = true;
-    }
-
    bool Contains(KProcessAddress addr) const {
        return m_address_space_start <= addr && addr <= m_address_space_end - 1;
    }
@@ -341,11 +341,6 @@ Result KProcess::Initialize(const Svc::CreateProcessParameter& params, const KPa
    // Initialize capabilities.
    R_TRY(m_capabilities.InitializeForKip(caps, std::addressof(m_page_table)));

-    // Enable mapping device pages as executable on legacy processes.
-    if (m_capabilities.GetIntendedKernelMajorVersion() < 26) {
-        m_page_table.AllowDeviceMappingOfExecPages();
-    }
-
    // Initialize the process id.
    m_process_id = m_kernel.CreateNewUserProcessID();
    ASSERT(InitialProcessIdMin <= m_process_id);
@@ -442,11 +437,6 @@ Result KProcess::Initialize(const Svc::CreateProcessParameter& params,
    // Initialize capabilities.
    R_TRY(m_capabilities.InitializeForUser(user_caps, std::addressof(m_page_table)));

-    // Enable mapping device pages as executable on legacy processes.
-    if (m_capabilities.GetIntendedKernelMajorVersion() < 26) {
-        m_page_table.AllowDeviceMappingOfExecPages();
-    }
-
    // Initialize the process id.
    m_process_id = m_kernel.CreateNewUserProcessID();
    ASSERT(ProcessIdMin <= m_process_id);
@@ -999,9 +989,6 @@ Result KProcess::Run(s32 priority, size_t stack_size) {
    main_thread->GetContext().r[0] = 0;
    main_thread->GetContext().r[1] = thread_handle;

-    // Pass the thread handle to the thread local region.
-    this->GetMemory().Write32(GetInteger(main_thread->GetTlsAddress()) + 0x110, thread_handle);
-
    // Update our state.
    this->ChangeState((state == State::Created) ? State::Running : State::RunningAttached);
    ON_RESULT_FAILURE_2 {
@@ -33,10 +33,6 @@ public:
        m_page_table.Finalize();
    }

-    void AllowDeviceMappingOfExecPages() {
-        m_page_table.AllowDeviceMappingOfExecPages();
-    }
-
    [[nodiscard]] Core::Memory::Memory& GetMemory() noexcept { return m_page_table.GetMemory(); }
    [[nodiscard]] Core::Memory::Memory const& GetMemory() const noexcept { return m_page_table.GetMemory(); }
    [[nodiscard]] Common::PageTable& GetImpl() noexcept { return m_page_table.GetImpl(); }
@@ -76,13 +76,11 @@ namespace Kernel {
            std::atomic_uint16_t interrupt_flag;
            std::atomic_uint8_t cache_maintenance_flag;
            std::atomic_int64_t thread_cpu_time;
-            std::atomic_uint32_t current_thread_handle;
        };
        static_assert(offsetof(ThreadLocalRegion, disable_count) == 0x100);
        static_assert(offsetof(ThreadLocalRegion, interrupt_flag) == 0x102);
        static_assert(offsetof(ThreadLocalRegion, cache_maintenance_flag) == 0x104);
        static_assert(offsetof(ThreadLocalRegion, thread_cpu_time) == 0x108);
-        static_assert(offsetof(ThreadLocalRegion, current_thread_handle) == 0x110);

        class ThreadQueueImplForKThreadSleep final : public KThreadQueueWithoutEndWait {
        public:
@@ -130,24 +128,24 @@ namespace Kernel {

        // Next, assert things based on the type.
        switch (type) {
-        case ThreadType::Main:
-            ASSERT(arg == 0);
-            [[fallthrough]];
-        case ThreadType::User:
-            ASSERT(((owner == nullptr) ||
-                    (owner->GetCoreMask() | (1ULL << virt_core)) == owner->GetCoreMask()));
-            ASSERT(((owner == nullptr) || (prio > Svc::LowestThreadPriority) ||
-                    (owner->GetPriorityMask() | (1ULL << prio)) == owner->GetPriorityMask()));
-            break;
-        case ThreadType::HighPriority:
-        case ThreadType::Dummy:
-            break;
-        case ThreadType::Kernel:
-            UNIMPLEMENTED();
-            break;
-        default:
-            ASSERT_MSG(false, "KThread::Initialize: Unknown ThreadType {}", static_cast<u32>(type));
-            break;
+            case ThreadType::Main:
+                ASSERT(arg == 0);
+                [[fallthrough]];
+            case ThreadType::User:
+                ASSERT(((owner == nullptr) ||
+                        (owner->GetCoreMask() | (1ULL << virt_core)) == owner->GetCoreMask()));
+                ASSERT(((owner == nullptr) || (prio > Svc::LowestThreadPriority) ||
+                        (owner->GetPriorityMask() | (1ULL << prio)) == owner->GetPriorityMask()));
+                break;
+            case ThreadType::HighPriority:
+            case ThreadType::Dummy:
+                break;
+            case ThreadType::Kernel:
+                UNIMPLEMENTED();
+                break;
+            default:
+                ASSERT_MSG(false, "KThread::Initialize: Unknown ThreadType {}", static_cast<u32>(type));
+                break;
        }
        m_thread_type = type;

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

 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
@@ -75,12 +75,7 @@ Result CreateThread(Core::System& system, Handle* out_handle, u64 entry_point, u
    KThread::Register(kernel, thread);

    // Add the thread to the handle table.
-    R_TRY(process.GetHandleTable().Add(out_handle, thread));
-
-    // Pass the thread handle to the thread local region.
-    process.GetMemory().Write32(GetInteger(thread->GetTlsAddress()) + 0x110, *out_handle);
-
-    R_SUCCEED();
+    R_RETURN(process.GetHandleTable().Add(out_handle, thread));
 }

 /// Starts the thread for the provided handle
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
@@ -53,8 +53,8 @@ constexpr inline u32 RequiredKernelVersion =

 // This is the highest SVC version supported, to be updated on new kernel releases.
 // NOTE: Official kernel versions have SVC major = SDK major + 4, SVC minor = SDK minor.
-constexpr inline u32 SupportedKernelMajorVersion = ConvertToSvcMajorVersion(22);
-constexpr inline u32 SupportedKernelMinorVersion = ConvertToSvcMinorVersion(2);
+constexpr inline u32 SupportedKernelMajorVersion = ConvertToSvcMajorVersion(20);
+constexpr inline u32 SupportedKernelMinorVersion = ConvertToSvcMinorVersion(5);
 constexpr inline u32 SupportedKernelVersion =
    EncodeKernelVersion(SupportedKernelMajorVersion, SupportedKernelMinorVersion);

@@ -1155,14 +1155,6 @@ void Module::Interface::StoreSaveDataThumbnailSystem(HLERequestContext& ctx) {
    StoreSaveDataThumbnail(ctx, uuid, tid);
 }

-void Module::Interface::GetPinCodeLength(HLERequestContext& ctx) {
-    LOG_WARNING(Service_ACC, "(STUBBED) called");
-
-    IPC::ResponseBuilder rb{ctx, 3};
-    rb.Push(ResultSuccess);
-    rb.Push<u32>(0);
-}
-
 void Module::Interface::StoreSaveDataThumbnail(HLERequestContext& ctx, const Common::UUID& uuid,
                                               const u64 tid) {
    IPC::ResponseBuilder rb{ctx, 2};
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
@@ -48,7 +48,6 @@ public:
        void StoreSaveDataThumbnailApplication(HLERequestContext& ctx);
        void GetBaasAccountManagerForSystemService(HLERequestContext& ctx);
        void StoreSaveDataThumbnailSystem(HLERequestContext& ctx);
-        void GetPinCodeLength(HLERequestContext& ctx);

    private:
        Result InitializeApplicationInfoBase();
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
@@ -60,7 +60,7 @@ ACC_SU::ACC_SU(std::shared_ptr<Module> module_, std::shared_ptr<ProfileManager>
        {291, nullptr, "ProxyProcedureForFloatingRegistrationWithNintendoAccount"},
        {299, nullptr, "SuspendBackgroundDaemon"},
        {400, nullptr, "SetPinCode"}, // 18.0.0+
-        {401, &ACC_SU::GetPinCodeLength, "GetPinCodeLength"}, // 18.0.0+
+        {401, nullptr, "GetPinCodeLength"}, // 18.0.0+
        {402, nullptr, "GetPinCode"}, // 18.0.0+
        {410, nullptr, "GetPinCodeErrorCount"}, // 18.0.0+
        {411, nullptr, "ResetPinCodeErrorCount"}, // 18.0.0+
@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@@ -43,7 +40,7 @@ ACC_U1::ACC_U1(std::shared_ptr<Module> module_, std::shared_ptr<ProfileManager>
        {152, nullptr, "LoadSignedDeviceIdentifierCacheForNintendoAccount"},
        {190, nullptr, "GetUserLastOpenedApplication"},
        {191, nullptr, "ActivateOpenContextHolder"},
-        {401, &ACC_U1::GetPinCodeLength, "GetPinCodeLength"}, // 18.0.0+
+        {401, nullptr, "GetPinCodeLength"}, // 18.0.0+
        {402, nullptr, "GetPinCode"}, // 18.0.0+
        {997, nullptr, "DebugInvalidateTokenCacheForUser"},
        {998, nullptr, "DebugSetUserStateClose"},
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
@@ -92,7 +92,7 @@ Result IApplicationCreator::CreateSystemApplication(
    std::unique_ptr<Loader::AppLoader> loader;

    auto process =
-        CreateProcess(system, application_id, 1, 22);
+        CreateProcess(system, application_id, 1, 21);
    R_UNLESS(process != nullptr, ResultUnknown);

    const auto applet = std::make_shared<Applet>(system, std::move(process), true);
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
@@ -75,8 +75,7 @@ ICommonStateGetter::ICommonStateGetter(Core::System& system_, std::shared_ptr<Ap
        {502, nullptr, "IsSleepEnabled"},
        {503, nullptr, "IsDisablingSleepSuppressed"},
        {600, nullptr, "Unknown600"}, //20.0.0+
-        {610, D<&ICommonStateGetter::Unknown610>, "Unknown610"}, //21.0.0+
-        {611, D<&ICommonStateGetter::Unknown611>, "Unknown611"}, //22.0.0+
+        {610, nullptr, "Unknown610"}, //21.0.0+
        {900, D<&ICommonStateGetter::SetRequestExitToLibraryAppletAtExecuteNextProgramEnabled>, "SetRequestExitToLibraryAppletAtExecuteNextProgramEnabled"}, //11.0.0+
        {910, nullptr, "GetLaunchRequiredTick"}, //17.0.0+
        {1000, nullptr, "BeginVrMode3d"}, //19.0.0+
@@ -363,14 +362,4 @@ Result ICommonStateGetter::SetHandlingHomeButtonShortPressedEnabled(bool enabled
    R_SUCCEED();
 }

-Result ICommonStateGetter::Unknown610() {
-    LOG_WARNING(Service_AM, "(STUBBED) called");
-    R_SUCCEED();
-}
-
-Result ICommonStateGetter::Unknown611() {
-    LOG_WARNING(Service_AM, "(STUBBED) called");
-    R_SUCCEED();
-}
-
 } // namespace Service::AM
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
@@ -63,8 +63,6 @@ private:
    Result SetRequestExitToLibraryAppletAtExecuteNextProgramEnabled();
    Result PushToGeneralChannel(SharedPointer<IStorage> storage); // cmd 20
    Result SetHandlingHomeButtonShortPressedEnabled(bool enabled);
-    Result Unknown610();
-    Result Unknown611();

    void SetCpuBoostMode(HLERequestContext& ctx);

@@ -78,7 +78,6 @@ ILibraryAppletAccessor::ILibraryAppletAccessor(Core::System& system_,
        {120, nullptr, "GetLibraryAppletInfo"},
        {150, nullptr, "RequestForAppletToGetForeground"},
        {160, D<&ILibraryAppletAccessor::GetIndirectLayerConsumerHandle>, "GetIndirectLayerConsumerHandle"}, //2.0.0+
-        {170, D<&ILibraryAppletAccessor::Unknown170>, "Unknown170"}, //22.0.0+
    };
    // clang-format on

@@ -218,12 +217,6 @@ Result ILibraryAppletAccessor::GetIndirectLayerConsumerHandle(Out<u64> out_handl
    R_SUCCEED();
 }

-Result ILibraryAppletAccessor::Unknown170(OutCopyHandle<Kernel::KReadableEvent> out_event) {
-    LOG_WARNING(Service_AM, "(STUBBED) called");
-    *out_event = m_applet->unknown_event.GetHandle();
-    R_SUCCEED();
-}
-
 void ILibraryAppletAccessor::FrontendExecute() {
    if (m_applet->frontend) {
        m_applet->frontend->Initialize();
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
@@ -37,7 +37,6 @@ private:
    Result GetPopOutDataEvent(OutCopyHandle<Kernel::KReadableEvent> out_event);
    Result GetPopInteractiveOutDataEvent(OutCopyHandle<Kernel::KReadableEvent> out_event);
    Result GetIndirectLayerConsumerHandle(Out<u64> out_handle);
-    Result Unknown170(OutCopyHandle<Kernel::KReadableEvent> out_event);

    void FrontendExecute();
    void FrontendExecuteInteractive();
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
@@ -118,10 +118,9 @@ std::shared_ptr<ILibraryAppletAccessor> CreateGuestApplet(Core::System& system,
        Firmware1900 = 19,
        Firmware2000 = 20,
        Firmware2100 = 21,
-        Firmware2200 = 22,
    };

-    auto process = CreateProcess(system, program_id, Firmware1400, Firmware2200);
+    auto process = CreateProcess(system, program_id, Firmware1400, Firmware2100);
    if (!process) {
        // Couldn't initialize the guest process
        return {};
@@ -1,8 +1,6 @@
 // SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

-#include "common/net/net.h"
-#include "common/scm_rev.h"
 #include "core/hle/service/bcat/news/builtin_news.h"
 #include "core/hle/service/bcat/news/msgpack.h"
 #include "core/hle/service/bcat/news/news_storage.h"
@@ -24,8 +22,10 @@
 #include <filesystem>
 #include <fstream>
 #include <future>
+#include <iomanip>
 #include <mutex>
 #include <optional>
+#include <sstream>
 #include <thread>

 #ifdef YUZU_BUNDLED_OPENSSL
@@ -35,6 +35,9 @@
 namespace Service::News {
 namespace {

+// TODO(crueter): COMPILE DEFINITION
+constexpr const char* GitHubAPI_EdenReleases = "/api/v1/repos/eden-emu/eden/releases";
+
 // Cached logo data
 std::vector<u8> default_logo_small;
 std::vector<u8> default_logo_large;
@@ -63,6 +66,24 @@ u32 HashToNewsId(std::string_view key) {
    return static_cast<u32>(std::hash<std::string_view>{}(key) & 0x7FFFFFFF);
 }

+u64 ParseIsoTimestamp(const std::string& iso) {
+    if (iso.empty()) return 0;
+
+    std::string buf = iso;
+    if (buf.back() == 'Z') buf.pop_back();
+
+    std::tm tm{};
+    std::istringstream ss(buf);
+    ss >> std::get_time(&tm, "%Y-%m-%dT%H:%M:%S");
+    if (ss.fail()) return 0;
+
+#ifdef _WIN32
+    return static_cast<u64>(_mkgmtime(&tm));
+#else
+    return static_cast<u64>(timegm(&tm));
+#endif
+}
+
 std::vector<u8> TryLoadFromDisk(const std::filesystem::path& path) {
    if (!std::filesystem::exists(path)) return {};

@@ -79,9 +100,8 @@ std::vector<u8> TryLoadFromDisk(const std::filesystem::path& path) {
    return data;
 }

-// TODO(crueter): Migrate to use Common::Net
 std::vector<u8> DownloadImage(const std::string& url_path, const std::filesystem::path& cache_path) {
-    LOG_DEBUG(Service_BCAT, "Downloading image: https://eden-emu.dev{}", url_path);
+    LOG_INFO(Service_BCAT, "Downloading image: https://eden-emu.dev{}", url_path);
    try {
        httplib::Client cli("https://eden-emu.dev");
        cli.set_follow_location(true);
@@ -206,6 +226,67 @@ void WriteCachedJson(std::string_view json) {
    (void)Common::FS::WriteStringToFile(path, Common::FS::FileType::TextFile, json);
 }

+std::optional<std::string> DownloadReleasesJson() {
+    try {
+#ifdef YUZU_BUNDLED_OPENSSL
+        const auto url = "https://git.eden-emu.dev";
+#else
+        const auto url = "git.eden-emu.dev";
+#endif
+
+        // TODO(crueter): This is duplicated between frontend and here.
+        constexpr auto path = GitHubAPI_EdenReleases;
+
+        constexpr std::size_t timeout_seconds = 15;
+
+        std::unique_ptr<httplib::Client> client = std::make_unique<httplib::Client>(url);
+        client->set_connection_timeout(timeout_seconds);
+        client->set_read_timeout(timeout_seconds);
+        client->set_write_timeout(timeout_seconds);
+
+#ifdef YUZU_BUNDLED_OPENSSL
+        client->load_ca_cert_store(kCert, sizeof(kCert));
+#endif
+
+        if (client == nullptr) {
+            LOG_ERROR(Service_BCAT, "Invalid URL {}{}", url, path);
+            return {};
+        }
+
+        httplib::Request request{
+            .method = "GET",
+            .path = path,
+        };
+
+        client->set_follow_location(true);
+        httplib::Result result = client->send(request);
+
+        if (!result) {
+            LOG_ERROR(Service_BCAT, "GET to {}{} returned null", url, path);
+            return {};
+        } else if (result->status < 400) {
+            return result->body;
+        }
+
+        if (result->status >= 400) {
+            LOG_ERROR(Service_BCAT,
+                      "GET to {}{} returned error status code: {}",
+                      url,
+                      path,
+                      result->status);
+            return {};
+        }
+
+        if (!result->headers.contains("content-type")) {
+            LOG_ERROR(Service_BCAT, "GET to {}{} returned no content", url, path);
+            return {};
+        }
+    } catch (...) {
+        LOG_WARNING(Service_BCAT, " failed to download releases");
+    }
+    return std::nullopt;
+}
+
 // idk but News App does not render Markdown or HTML, so remove some formatting.
 std::string SanitizeMarkdown(std::string_view markdown) {
    std::string result;
@@ -261,7 +342,9 @@ std::string SanitizeMarkdown(std::string_view markdown) {
    return text;
 }

-std::string FormatBody(std::string body, const std::string_view &title) {
+std::string FormatBody(const nlohmann::json& release, std::string_view title) {
+    std::string body = release.value("body", std::string{});
+
    if (body.empty()) {
        return std::string(title);
    }
@@ -292,32 +375,52 @@ std::string FormatBody(std::string body, const std::string_view &title) {
    return body;
 }

-void ImportReleases(const std::vector<Common::Net::Release> &releases) {
+void ImportReleases(std::string_view json_text) {
+    nlohmann::json root;
+    try {
+        root = nlohmann::json::parse(json_text);
+    } catch (...) {
+        LOG_WARNING(Service_BCAT, "failed to parse JSON");
+        return;
+    }
+
+    if (!root.is_array()) return;
+
    std::vector<u32> news_ids;
-    for (const auto& rel : releases) {
-        const u32 news_id = u32(rel.id & 0x7FFFFFFF);
+    for (const auto& rel : root) {
+        if (!rel.is_object()) continue;
+        std::string title = rel.value("name", rel.value("tag_name", std::string{}));
+        if (title.empty()) continue;
+
+        const u64 release_id = rel.value("id", 0);
+        const u32 news_id = release_id ? static_cast<u32>(release_id & 0x7FFFFFFF) : HashToNewsId(title);
        news_ids.push_back(news_id);
    }

    PreloadNewsImages(news_ids);

-    for (const auto& rel : releases) {
-        const std::string title = rel.title;
-        const std::string body = rel.body;
-        const std::string html_url = rel.html_url;
+    for (const auto& rel : root) {
+        if (!rel.is_object()) continue;

-        const u32 news_id = u32(rel.id & 0x7FFFFFFF);
-        const u64 published = rel.published;
+        std::string title = rel.value("name", rel.value("tag_name", std::string{}));
+        if (title.empty()) continue;
+
+        const u64 release_id = rel.value("id", 0);
+        const u32 news_id = release_id ? static_cast<u32>(release_id & 0x7FFFFFFF) : HashToNewsId(title);
+        const u64 published = ParseIsoTimestamp(rel.value("published_at", std::string{}));
        const u64 pickup_limit = published + 600000000;
-        const u32 priority = rel.prerelease ? 1500 : 2500;
+        const u32 priority = rel.value("prerelease", false) ? 1500 : 2500;

-        std::string author = "Eden";
+        std::string author = "eden";
+        if (rel.contains("author") && rel["author"].is_object()) {
+            author = rel["author"].value("login", "eden");
+        }

-        auto payload = BuildMsgpack(title, FormatBody(body, title), title, published,
+        auto payload = BuildMsgpack(title, FormatBody(rel, title), title, published,
                                    pickup_limit, priority, {"en"}, author, {},
-                                    html_url, news_id);
+                                    rel.value("html_url", std::string{}), news_id);

-        const std::string news_id_str = fmt::format("LA{:020}", rel.id);
+        const std::string news_id_str = fmt::format("LA{:020}", news_id);

        GithubNewsMeta meta{
            .news_id = news_id_str,
@@ -462,21 +565,15 @@ void EnsureBuiltinNewsLoaded() {
        LoadDefaultLogos();

        if (const auto cached = ReadCachedJson()) {
-            const std::string_view body = cached.value();
-            const auto releases = Common::Net::Release::ListFromJson(body, Common::g_build_auto_update_stable_api, Common::g_build_auto_update_stable_repo);
-            ImportReleases(releases);
-
-            LOG_INFO(Service_BCAT, "news: {} entries loaded from cache", NewsStorage::Instance().ListAll().size());
+            ImportReleases(*cached);
+            LOG_DEBUG(Service_BCAT, "news: {} entries loaded from cache", NewsStorage::Instance().ListAll().size());
        }

        std::thread([] {
-            if (const auto fresh = Common::Net::GetReleasesBody()) {
-                const std::string_view body = fresh.value();
-                WriteCachedJson(body);
-                const auto releases = Common::Net::Release::ListFromJson(body, Common::g_build_auto_update_stable_api, Common::g_build_auto_update_stable_repo);
-                ImportReleases(releases);
-
-                LOG_INFO(Service_BCAT, "news: {} entries updated from Forgejo", NewsStorage::Instance().ListAll().size());
+            if (const auto fresh = DownloadReleasesJson()) {
+                WriteCachedJson(*fresh);
+                ImportReleases(*fresh);
+                LOG_DEBUG(Service_BCAT, "news: {} entries updated from Forgejo", NewsStorage::Instance().ListAll().size());
            }
        }).detach();
    });
@@ -89,7 +89,7 @@ void NvMap::UnmapHandle(Handle& handle_description) {

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

 #include "common/alignment.h"
 #include "common/assert.h"
-#include "common/common_types.h"
 #include "common/logging.h"
 #include "core/core.h"
 #include "core/hle/service/nvdrv/core/container.h"
@@ -131,12 +130,12 @@ NvResult nvhost_as_gpu::AllocAsEx(IoctlAllocAsEx& params) {

    const auto start_pages{static_cast<u32>(vm.va_range_start >> VM::PAGE_SIZE_BITS)};
    const auto end_pages{static_cast<u32>(vm.va_range_split >> VM::PAGE_SIZE_BITS)};
-    vm.small_page_allocator.emplace(start_pages, end_pages);
+    vm.small_page_allocator = std::make_shared<VM::Allocator>(start_pages, end_pages);

    const auto start_big_pages{static_cast<u32>(vm.va_range_split >> vm.big_page_size_bits)};
    const auto end_big_pages{
        static_cast<u32>((vm.va_range_end - vm.va_range_split) >> vm.big_page_size_bits)};
-    vm.big_page_allocator.emplace(start_big_pages, end_big_pages);
+    vm.big_page_allocator = std::make_unique<VM::Allocator>(start_big_pages, end_big_pages);

    gmmu = std::make_shared<Tegra::MemoryManager>(system, max_big_page_bits, vm.va_range_split,
                                                  vm.big_page_size_bits, VM::PAGE_SIZE_BITS);
@@ -189,8 +188,8 @@ NvResult nvhost_as_gpu::AllocateSpace(IoctlAllocSpace& params) {
    }

    allocation_map[params.offset] = {
-        .mappings{},
        .size = size,
+        .mappings{},
        .page_size = params.page_size,
        .sparse = (params.flags & MappingFlags::Sparse) != MappingFlags::None,
        .big_pages = params.page_size != VM::YUZU_PAGESIZE,
@@ -199,57 +198,72 @@ NvResult nvhost_as_gpu::AllocateSpace(IoctlAllocSpace& params) {
    return NvResult::Success;
 }

-bool nvhost_as_gpu::FreeMappingLocked(u64 offset) noexcept {
-    if (auto const it = mapping_map.find(offset); it != mapping_map.end()) {
-        auto const mapping = it->second;
-        if (!mapping.fixed) {
-            auto& allocator{mapping.big_page ? *vm.big_page_allocator : *vm.small_page_allocator};
-            u32 page_size_bits{mapping.big_page ? vm.big_page_size_bits : VM::PAGE_SIZE_BITS};
-            u32 page_size{mapping.big_page ? vm.big_page_size : VM::YUZU_PAGESIZE};
-            u64 aligned_size{Common::AlignUp(mapping.size, page_size)};
-            allocator.Free(u32(mapping.offset >> page_size_bits), u32(aligned_size >> page_size_bits));
-        }
-        nvmap.UnpinHandle(mapping.handle);
-        // Sparse mappings shouldn't be fully unmapped, just returned to their sparse state
-        // Only FreeSpace can unmap them fully
-        if (mapping.sparse_alloc) {
-            gmmu->MapSparse(offset, mapping.size, mapping.big_page);
-        } else {
-            gmmu->Unmap(offset, mapping.size);
-        }
-        mapping_map.erase(offset);
-        return true;
+void nvhost_as_gpu::FreeMappingLocked(u64 offset) {
+    auto mapping{mapping_map.at(offset)};
+
+    if (!mapping->fixed) {
+        auto& allocator{mapping->big_page ? *vm.big_page_allocator : *vm.small_page_allocator};
+        u32 page_size_bits{mapping->big_page ? vm.big_page_size_bits : VM::PAGE_SIZE_BITS};
+        u32 page_size{mapping->big_page ? vm.big_page_size : VM::YUZU_PAGESIZE};
+        u64 aligned_size{Common::AlignUp(mapping->size, page_size)};
+
+        allocator.Free(static_cast<u32>(mapping->offset >> page_size_bits),
+                       static_cast<u32>(aligned_size >> page_size_bits));
    }
-    return false;
+
+    nvmap.UnpinHandle(mapping->handle);
+
+    // Sparse mappings shouldn't be fully unmapped, just returned to their sparse state
+    // Only FreeSpace can unmap them fully
+    if (mapping->sparse_alloc) {
+        gmmu->MapSparse(offset, mapping->size, mapping->big_page);
+    } else {
+        gmmu->Unmap(offset, mapping->size);
+    }
+
+    mapping_map.erase(offset);
 }

 NvResult nvhost_as_gpu::FreeSpace(IoctlFreeSpace& params) {
-    LOG_DEBUG(Service_NVDRV, "called, offset={:X}, pages={:X}, page_size={:X}", params.offset, params.pages, params.page_size);
+    LOG_DEBUG(Service_NVDRV, "called, offset={:X}, pages={:X}, page_size={:X}", params.offset,
+              params.pages, params.page_size);
+
    std::scoped_lock lock(mutex);
+
    if (!vm.initialised) {
        return NvResult::BadValue;
    }
-    if (auto const it = allocation_map.find(params.offset); it != allocation_map.end()) {
-        auto const allocation = it->second;
-        if (allocation.page_size != params.page_size || allocation.size != (u64(params.pages) * params.page_size))
-            return NvResult::BadValue;

-        for (const auto mapping_offset : allocation.mappings)
-            if (!FreeMappingLocked(mapping_offset))
-                return NvResult::BadValue;
+    try {
+        auto allocation{allocation_map[params.offset]};
+
+        if (allocation.page_size != params.page_size ||
+            allocation.size != (static_cast<u64>(params.pages) * params.page_size)) {
+            return NvResult::BadValue;
+        }
+
+        for (const auto& mapping : allocation.mappings) {
+            FreeMappingLocked(mapping->offset);
+        }

        // Unset sparse flag if required
-        if (allocation.sparse)
+        if (allocation.sparse) {
            gmmu->Unmap(params.offset, allocation.size);
+        }

-        auto& allocator{params.page_size == VM::YUZU_PAGESIZE ? *vm.small_page_allocator : *vm.big_page_allocator};
-        u32 page_size_bits{params.page_size == VM::YUZU_PAGESIZE ? VM::PAGE_SIZE_BITS : vm.big_page_size_bits};
+        auto& allocator{params.page_size == VM::YUZU_PAGESIZE ? *vm.small_page_allocator
+                                                              : *vm.big_page_allocator};
+        u32 page_size_bits{params.page_size == VM::YUZU_PAGESIZE ? VM::PAGE_SIZE_BITS
+                                                                 : vm.big_page_size_bits};

-        allocator.Free(u32(params.offset >> page_size_bits), u32(allocation.size >> page_size_bits));
+        allocator.Free(static_cast<u32>(params.offset >> page_size_bits),
+                       static_cast<u32>(allocation.size >> page_size_bits));
        allocation_map.erase(params.offset);
-        return NvResult::Success;
+    } catch (const std::out_of_range&) {
+        return NvResult::BadValue;
    }
-    return NvResult::BadValue;
+
+    return NvResult::Success;
 }

 NvResult nvhost_as_gpu::Remap(std::span<IoctlRemapEntry> entries) {
@@ -313,18 +327,26 @@ NvResult nvhost_as_gpu::MapBufferEx(IoctlMapBufferEx& params) {

    // Remaps a subregion of an existing mapping to a different PA
    if ((params.flags & MappingFlags::Remap) != MappingFlags::None) {
-        if (auto const it = mapping_map.find(params.offset); it != mapping_map.end()) {
-            auto const mapping = it->second;
-            if (mapping.size < params.mapping_size) {
-                LOG_WARNING(Service_NVDRV, "Cannot remap a partially mapped GPU address space region: {:#X}", params.offset);
+        try {
+            auto mapping{mapping_map.at(params.offset)};
+
+            if (mapping->size < params.mapping_size) {
+                LOG_WARNING(Service_NVDRV,
+                            "Cannot remap a partially mapped GPU address space region: {:#X}",
+                            params.offset);
                return NvResult::BadValue;
            }
-            u64 gpu_address = u64(params.offset + params.buffer_offset);
-            VAddr device_address{mapping.ptr + params.buffer_offset};
-            gmmu->Map(gpu_address, device_address, params.mapping_size, Tegra::PTEKind(params.kind), mapping.big_page);
+
+            u64 gpu_address{static_cast<u64>(params.offset + params.buffer_offset)};
+            VAddr device_address{mapping->ptr + params.buffer_offset};
+
+            gmmu->Map(gpu_address, device_address, params.mapping_size,
+                      static_cast<Tegra::PTEKind>(params.kind), mapping->big_page);
+
            return NvResult::Success;
-        } else {
-            LOG_WARNING(Service_NVDRV, "Cannot remap an unmapped GPU address space region: {:#X}", params.offset);
+        } catch (const std::out_of_range&) {
+            LOG_WARNING(Service_NVDRV, "Cannot remap an unmapped GPU address space region: {:#X}",
+                        params.offset);
            return NvResult::BadValue;
        }
    }
@@ -334,7 +356,8 @@ NvResult nvhost_as_gpu::MapBufferEx(IoctlMapBufferEx& params) {
        return NvResult::BadValue;
    }

-    DAddr device_address = DAddr(nvmap.PinHandle(params.handle, false) + params.buffer_offset);
+    DAddr device_address{
+        static_cast<DAddr>(nvmap.PinHandle(params.handle, false) + params.buffer_offset)};
    u64 size{params.mapping_size ? params.mapping_size : handle->orig_size};

    bool big_page{[&]() {
@@ -358,22 +381,32 @@ NvResult nvhost_as_gpu::MapBufferEx(IoctlMapBufferEx& params) {
        }

        const bool use_big_pages = alloc->second.big_pages && big_page;
-        gmmu->Map(params.offset, device_address, size, static_cast<Tegra::PTEKind>(params.kind), use_big_pages);
+        gmmu->Map(params.offset, device_address, size, static_cast<Tegra::PTEKind>(params.kind),
+                  use_big_pages);

-        alloc->second.mappings.push_back(params.offset);
-        mapping_map.insert_or_assign(params.offset, Mapping(params.handle, device_address, params.offset, size, true, use_big_pages, alloc->second.sparse));
+        auto mapping{std::make_shared<Mapping>(params.handle, device_address, params.offset, size,
+                                               true, use_big_pages, alloc->second.sparse)};
+        alloc->second.mappings.push_back(mapping);
+        mapping_map[params.offset] = mapping;
    } else {
        auto& allocator{big_page ? *vm.big_page_allocator : *vm.small_page_allocator};
        u32 page_size{big_page ? vm.big_page_size : VM::YUZU_PAGESIZE};
        u32 page_size_bits{big_page ? vm.big_page_size_bits : VM::PAGE_SIZE_BITS};

-        params.offset = u64(allocator.Allocate(u32(Common::AlignUp(size, page_size) >> page_size_bits))) << page_size_bits;
+        params.offset = static_cast<u64>(allocator.Allocate(
+                            static_cast<u32>(Common::AlignUp(size, page_size) >> page_size_bits)))
+                        << page_size_bits;
        if (!params.offset) {
            ASSERT_MSG(false, "Failed to allocate free space in the GPU AS!");
            return NvResult::InsufficientMemory;
        }
-        gmmu->Map(params.offset, device_address, Common::AlignUp(size, page_size), Tegra::PTEKind(params.kind), big_page);
-        mapping_map.insert_or_assign(params.offset, Mapping(params.handle, device_address, params.offset, size, false, big_page, false));
+
+        gmmu->Map(params.offset, device_address, Common::AlignUp(size, page_size),
+                  static_cast<Tegra::PTEKind>(params.kind), big_page);
+
+        auto mapping{std::make_shared<Mapping>(params.handle, device_address, params.offset, size,
+                                               false, big_page, false)};
+        mapping_map[params.offset] = mapping;
    }

    map_buffer_offsets.insert(params.offset);
@@ -382,30 +415,35 @@ NvResult nvhost_as_gpu::MapBufferEx(IoctlMapBufferEx& params) {
 }

 NvResult nvhost_as_gpu::UnmapBuffer(IoctlUnmapBuffer& params) {
-    std::scoped_lock lock(mutex);
-    if (auto const offset_it = map_buffer_offsets.find(params.offset); offset_it != map_buffer_offsets.end()) {
+    if (map_buffer_offsets.find(params.offset) != map_buffer_offsets.end()) {
        LOG_DEBUG(Service_NVDRV, "called, offset={:#X}", params.offset);
+
+        std::scoped_lock lock(mutex);
+
        if (!vm.initialised) {
            return NvResult::BadValue;
        }

-        auto const it = mapping_map.find(params.offset);
-        auto const mapping = it->second;
-        if (!mapping.fixed) {
-            auto& allocator{mapping.big_page ? *vm.big_page_allocator : *vm.small_page_allocator};
-            u32 page_size_bits{mapping.big_page ? vm.big_page_size_bits : VM::PAGE_SIZE_BITS};
-            allocator.Free(u32(mapping.offset >> page_size_bits), u32(mapping.size >> page_size_bits));
+        auto mapping{mapping_map.at(params.offset)};
+
+        if (!mapping->fixed) {
+            auto& allocator{mapping->big_page ? *vm.big_page_allocator : *vm.small_page_allocator};
+            u32 page_size_bits{mapping->big_page ? vm.big_page_size_bits : VM::PAGE_SIZE_BITS};
+
+            allocator.Free(static_cast<u32>(mapping->offset >> page_size_bits),
+                           static_cast<u32>(mapping->size >> page_size_bits));
        }

        // Sparse mappings shouldn't be fully unmapped, just returned to their sparse state
        // Only FreeSpace can unmap them fully
-        if (mapping.sparse_alloc) {
-            gmmu->MapSparse(params.offset, mapping.size, mapping.big_page);
+        if (mapping->sparse_alloc) {
+            gmmu->MapSparse(params.offset, mapping->size, mapping->big_page);
        } else {
-            gmmu->Unmap(params.offset, mapping.size);
+            gmmu->Unmap(params.offset, mapping->size);
        }

-        nvmap.UnpinHandle(mapping.handle);
+        nvmap.UnpinHandle(mapping->handle);
+
        mapping_map.erase(params.offset);
        map_buffer_offsets.erase(params.offset);
    }
@@ -440,7 +478,8 @@ void nvhost_as_gpu::GetVARegionsImpl(IoctlGetVaRegions& params) {
 }

 NvResult nvhost_as_gpu::GetVARegions1(IoctlGetVaRegions& params) {
-    LOG_DEBUG(Service_NVDRV, "called, buf_addr={:X}, buf_size={:X}", params.buf_addr, params.buf_size);
+    LOG_DEBUG(Service_NVDRV, "called, buf_addr={:X}, buf_size={:X}", params.buf_addr,
+              params.buf_size);

    std::scoped_lock lock(mutex);

@@ -157,7 +157,7 @@ private:
    NvResult GetVARegions1(IoctlGetVaRegions& params);
    NvResult GetVARegions3(IoctlGetVaRegions& params, std::span<VaRegion> regions);

-    [[nodiscard]] bool FreeMappingLocked(u64 offset) noexcept;
+    void FreeMappingLocked(u64 offset);

    Module& module;

@@ -165,36 +165,35 @@ private:
    NvCore::NvMap& nvmap;

    struct Mapping {
+        NvCore::NvMap::Handle::Id handle;
        DAddr ptr;
        u64 offset;
        u64 size;
-        NvCore::NvMap::Handle::Id handle;
-        bool fixed : 1;
-        bool big_page : 1; // Only valid if fixed == false
-        bool sparse_alloc : 1;
+        bool fixed;
+        bool big_page; // Only valid if fixed == false
+        bool sparse_alloc;

-        Mapping(NvCore::NvMap::Handle::Id handle_, DAddr ptr_, u64 offset_, u64 size_, bool fixed_, bool big_page_, bool sparse_alloc_)
-            : ptr(ptr_), offset(offset_), size(size_), handle(handle_)
-            , fixed(fixed_), big_page(big_page_), sparse_alloc(sparse_alloc_)
-        {}
+        Mapping(NvCore::NvMap::Handle::Id handle_, DAddr ptr_, u64 offset_, u64 size_, bool fixed_,
+                bool big_page_, bool sparse_alloc_)
+            : handle(handle_), ptr(ptr_), offset(offset_), size(size_), fixed(fixed_),
+              big_page(big_page_), sparse_alloc(sparse_alloc_) {}
    };

    struct Allocation {
-        std::vector<u64> mappings;
        u64 size;
+        std::list<std::shared_ptr<Mapping>> mappings;
        u32 page_size;
        bool sparse;
        bool big_pages;
    };

-    //!< This maps the base addresses of mapped buffers to their total sizes and
-    //!< mapping type, this is needed as what was originally a single buffer may
-    //!< have been split into multiple GPU side buffers with the remap flag.
-    std::map<u64, Mapping> mapping_map;
-    //!< Holds allocations created by AllocSpace from
-    //!< which fixed buffers can be mapped into
-    std::map<u64, Allocation> allocation_map;
-    std::mutex mutex; //!< Locks all AS operations
+    std::map<u64, std::shared_ptr<Mapping>>
+        mapping_map; //!< This maps the base addresses of mapped buffers to their total sizes and
+                     //!< mapping type, this is needed as what was originally a single buffer may
+                     //!< have been split into multiple GPU side buffers with the remap flag.
+    std::map<u64, Allocation> allocation_map; //!< Holds allocations created by AllocSpace from
+                                              //!< which fixed buffers can be mapped into
+    std::mutex mutex;                         //!< Locks all AS operations

    struct VM {
        static constexpr u32 YUZU_PAGESIZE{0x1000};
@@ -214,8 +213,9 @@ private:

        using Allocator = Common::FlatAllocator<u32, 0, 32>;

-        std::optional<Allocator> big_page_allocator;
-        std::optional<Allocator> small_page_allocator; //! Shared as this is also used by nvhost::GpuChannel
+        std::unique_ptr<Allocator> big_page_allocator;
+        std::shared_ptr<Allocator>
+            small_page_allocator; //! Shared as this is also used by nvhost::GpuChannel

        bool initialised{};
    } vm;
@@ -409,13 +409,6 @@ struct AccountNotificationSettings {
 static_assert(sizeof(AccountNotificationSettings) == 0x18,
              "AccountNotificationSettings is an invalid size");

-/// This is nn::settings::system::AccountUserSettings (stubbed)
-struct AccountUserSettings {
-    std::array<u8, 0x40> data;
-};
-static_assert(sizeof(AccountUserSettings) == 0x40,
-              "AccountUserSettings is an invalid size");
-
 /// This is nn::settings::factory::BatteryLot
 struct BatteryLot {
    std::array<char, 0x18> lot_number;
@@ -340,9 +340,9 @@ ISystemSettingsServer::ISystemSettingsServer(Core::System& system_)
        {306, nullptr, "GetPinCodeReregistrationGuideAccounts"}, //20.0.0+
        {307, nullptr, "SetPinCodeReregistrationGuideAccounts"}, //20.0.0+
        {315, C<&ISystemSettingsServer::GetHttpAuthConfigs>, "GetHttpAuthConfigs"}, //21.0.0+
-        {319, C<&ISystemSettingsServer::GetAccountUserSettings>, "GetAccountUserSettings"}, //21.0.0+
+        {319, nullptr, "GetAccountUserSettings"}, //21.0.0+
        {320, nullptr, "SetAccountUserSettings"}, //21.0.0+
-        {321, C<&ISystemSettingsServer::GetDefaultAccountUserSettings>, "GetDefaultAccountUserSettings"}, //21.0.0+
+        {321, nullptr, "GetDefaultAccountUserSettings"}, //21.0.0+
    };
    // clang-format on

@@ -1428,23 +1428,6 @@ Result ISystemSettingsServer::GetHttpAuthConfigs(Out<s32> out_count, OutBuffer<B
    R_SUCCEED();
 }

-Result ISystemSettingsServer::GetAccountUserSettings(
-    Out<u32> out_count,
-    OutLargeData<AccountUserSettings, BufferAttr_HipcMapAlias> out_settings) {
-    LOG_WARNING(Service_SET, "(STUBBED) called");
-
-    *out_count = 0;
-    *out_settings = {};
-    R_SUCCEED();
-}
-
-Result ISystemSettingsServer::GetDefaultAccountUserSettings(Out<AccountUserSettings> out_settings) {
-    LOG_WARNING(Service_SET, "(STUBBED) called");
-
-    *out_settings = {};
-    R_SUCCEED();
-}
-
 void ISystemSettingsServer::SetupSettings() {
    auto system_dir = Common::FS::GetEdenPath(Common::FS::EdenPath::NANDDir) / "system/save/8000000000000050";
    if (!LoadSettingsFile(system_dir, []() { return DefaultSystemSettings(); })) {
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 // SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
@@ -161,10 +161,6 @@ public:
    Result GetPanelCrcMode(Out<s32> out_panel_crc_mode);
    Result SetPanelCrcMode(s32 panel_crc_mode);
    Result GetHttpAuthConfigs(Out<s32> out_count, OutBuffer<BufferAttr_HipcMapAlias> out_configs);
-    Result GetAccountUserSettings(
-        Out<u32> out_count,
-        OutLargeData<AccountUserSettings, BufferAttr_HipcMapAlias> out_settings);
-    Result GetDefaultAccountUserSettings(Out<AccountUserSettings> out_settings);

 private:
    bool LoadSettingsFile(std::filesystem::path& path, auto&& default_func);
@@ -67,24 +67,22 @@ public:
    Result GetServicePort(Kernel::KClientPort** out_client_port, const std::string& name);

    template <std::derived_from<SessionRequestHandler> T>
-    std::shared_ptr<T> GetService(const std::string& name, bool block = false) const {
-        std::unique_lock l{lock};
-        auto it = registered_services.find(name);
-        if (it == registered_services.end() && !block) {
-            LOG_DEBUG(Service, "Can't find service: {}", name);
+    std::shared_ptr<T> GetService(const std::string& service_name, bool block = false) const {
+        auto service = registered_services.find(service_name);
+        if (service == registered_services.end() && !block) {
+            LOG_DEBUG(Service, "Can't find service: {}", service_name);
            return nullptr;
        } else if (block) {
            using namespace std::literals::chrono_literals;
-            while (it == registered_services.end()) {
-                l.unlock();
+            while (service == registered_services.end()) {
                Kernel::Svc::SleepThread(
                    kernel.System(),
                    std::chrono::duration_cast<std::chrono::nanoseconds>(100ms).count());
-                l.lock();
-                it = registered_services.find(name);
+                service = registered_services.find(service_name);
            }
        }
-        return std::static_pointer_cast<T>(it->second());
+
+        return std::static_pointer_cast<T>(service->second());
    }

    void InvokeControlRequest(HLERequestContext& context);
@@ -98,7 +96,7 @@ private:
    std::unique_ptr<Controller> controller_interface;

    /// Map of registered services, retrieved using GetServicePort.
-    mutable std::mutex lock;
+    std::mutex lock;
    ankerl::unordered_dense::map<std::string, SessionRequestHandlerFactory> registered_services;
    ankerl::unordered_dense::map<std::string, Kernel::KClientPort*> service_ports;

@@ -866,17 +866,10 @@ void EmitIR<IR::Opcode::VectorMaxS32>(oaknut::CodeGenerator& code, EmitContext&

 template<>
 void EmitIR<IR::Opcode::VectorMaxS64>(oaknut::CodeGenerator& code, EmitContext& ctx, IR::Inst* inst) {
-#ifdef __APPLE__
-    EmitThreeOp(code, ctx, inst, [&](auto& Qresult, auto& Qa, auto& Qb) {
-        code.CMGT(Qresult->D2(), Qa->D2(), Qb->D2());
-        code.BSL(Qresult->B16(), Qa->B16(), Qb->B16());
-    });
-#else
    (void)code;
    (void)ctx;
    (void)inst;
    UNREACHABLE();
-#endif
 }

 template<>
@@ -896,17 +889,10 @@ void EmitIR<IR::Opcode::VectorMaxU32>(oaknut::CodeGenerator& code, EmitContext&

 template<>
 void EmitIR<IR::Opcode::VectorMaxU64>(oaknut::CodeGenerator& code, EmitContext& ctx, IR::Inst* inst) {
-#ifdef __APPLE__
-    EmitThreeOp(code, ctx, inst, [&](auto& Qresult, auto& Qa, auto& Qb) {
-        code.CMHI(Qresult->D2(), Qa->D2(), Qb->D2());
-        code.BSL(Qresult->B16(), Qa->B16(), Qb->B16());
-    });
-#else
    (void)code;
    (void)ctx;
    (void)inst;
    UNREACHABLE();
-#endif
 }

 template<>
@@ -926,17 +912,10 @@ void EmitIR<IR::Opcode::VectorMinS32>(oaknut::CodeGenerator& code, EmitContext&

 template<>
 void EmitIR<IR::Opcode::VectorMinS64>(oaknut::CodeGenerator& code, EmitContext& ctx, IR::Inst* inst) {
-#ifdef __APPLE__
-    EmitThreeOp(code, ctx, inst, [&](auto& Qresult, auto& Qa, auto& Qb) {
-        code.CMGT(Qresult->D2(), Qb->D2(), Qa->D2());
-        code.BSL(Qresult->B16(), Qa->B16(), Qb->B16());
-    });
-#else
    (void)code;
    (void)ctx;
    (void)inst;
    UNREACHABLE();
-#endif
 }

 template<>
@@ -956,17 +935,10 @@ void EmitIR<IR::Opcode::VectorMinU32>(oaknut::CodeGenerator& code, EmitContext&

 template<>
 void EmitIR<IR::Opcode::VectorMinU64>(oaknut::CodeGenerator& code, EmitContext& ctx, IR::Inst* inst) {
-#ifdef __APPLE__
-    EmitThreeOp(code, ctx, inst, [&](auto& Qresult, auto& Qa, auto& Qb) {
-        code.CMHI(Qresult->D2(), Qb->D2(), Qa->D2());
-        code.BSL(Qresult->B16(), Qa->B16(), Qb->B16());
-    });
-#else
    (void)code;
    (void)ctx;
    (void)inst;
    UNREACHABLE();
-#endif
 }

 template<>
@@ -5,45 +5,146 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.

-#ifdef NIGHTLY_BUILD
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/split.hpp>
-#endif

 #include <fmt/format.h>
-#include "common/net/net.h"
+#include "common/logging.h"
 #include "common/scm_rev.h"
 #include "update_checker.h"

-#include "common/logging.h"
+#include "common/httplib.h"

-std::optional<Common::Net::Release> UpdateChecker::GetUpdate() {
-    const auto latest = Common::Net::GetLatestRelease();
-    if (!latest) return std::nullopt;
-
-    LOG_INFO(Frontend, "Received update {}", latest->title);
-
-#ifdef NIGHTLY_BUILD
-    std::vector<std::string> result;
-
-    boost::split(result, latest->tag, boost::is_any_of("."));
-    if (result.size() != 2)
-        return std::nullopt;
-
-    const std::string tag = result[1];
-
-    boost::split(result, std::string{Common::g_build_version}, boost::is_any_of("-"));
-    if (result.empty())
-        return std::nullopt;
-
-    const std::string build = result[0];
-#else
-    const std::string tag = latest->tag;
-    const std::string build = Common::g_build_version;
+#ifdef YUZU_BUNDLED_OPENSSL
+#include <openssl/cert.h>
 #endif

-    if (tag != build)
-        return latest;
+#include <nlohmann/json.hpp>
+#include <optional>
+#include <string>

+std::optional<std::string> UpdateChecker::GetResponse(std::string url, std::string path)
+{
+    try {
+        constexpr std::size_t timeout_seconds = 15;
+
+        std::unique_ptr<httplib::Client> client = std::make_unique<httplib::Client>(url);
+        client->set_connection_timeout(timeout_seconds);
+        client->set_read_timeout(timeout_seconds);
+        client->set_write_timeout(timeout_seconds);
+
+#ifdef YUZU_BUNDLED_OPENSSL
+        client->load_ca_cert_store(kCert, sizeof(kCert));
+#endif
+
+        if (client == nullptr) {
+            LOG_ERROR(Frontend, "Invalid URL {}{}", url, path);
+            return {};
+        }
+
+        httplib::Request request{
+            .method = "GET",
+            .path = path,
+        };
+
+        client->set_follow_location(true);
+        httplib::Result result = client->send(request);
+
+        if (!result) {
+            LOG_ERROR(Frontend, "GET to {}{} returned null", url, path);
+            return {};
+        }
+
+        const auto &response = result.value();
+        if (response.status >= 400) {
+            LOG_ERROR(Frontend,
+                      "GET to {}{} returned error status code: {}",
+                      url,
+                      path,
+                      response.status);
+            return {};
+        }
+        if (!response.headers.contains("content-type")) {
+            LOG_ERROR(Frontend, "GET to {}{} returned no content", url, path);
+            return {};
+        }
+
+        return response.body;
+    } catch (std::exception &e) {
+        LOG_ERROR(Frontend,
+                  "GET to {}{} failed during update check: {}",
+                  url,
+                  path,
+                  e.what());
+        return std::nullopt;
+    }
+}
+
+std::optional<UpdateChecker::Update> UpdateChecker::GetLatestRelease() {
+#ifdef YUZU_BUNDLED_OPENSSL
+    const auto update_check_url = fmt::format("https://{}", Common::g_build_auto_update_api);
+#else
+    const auto update_check_url = std::string{Common::g_build_auto_update_api};
+#endif
+
+    auto update_check_path = std::string{Common::g_build_auto_update_api_path};
+    try {
+        const auto response = UpdateChecker::GetResponse(update_check_url, update_check_path);
+
+        if (!response)
+            return {};
+
+        const std::string latest_tag = nlohmann::json::parse(response.value()).at("tag_name");
+        const std::string latest_name = nlohmann::json::parse(response.value()).at("name");
+
+        return Update{latest_tag, latest_name};
+    } catch (nlohmann::detail::out_of_range&) {
+        LOG_ERROR(Frontend,
+                  "Parsing JSON response from {}{} failed during update check: "
+                  "nlohmann::detail::out_of_range",
+                  update_check_url,
+                  update_check_path);
+        return {};
+    } catch (nlohmann::detail::type_error&) {
+        LOG_ERROR(Frontend,
+                  "Parsing JSON response from {}{} failed during update check: "
+                  "nlohmann::detail::type_error",
+                  update_check_url,
+                  update_check_path);
+        return {};
+    }
+}
+
+std::optional<UpdateChecker::Update> UpdateChecker::GetUpdate() {
+    const std::optional<UpdateChecker::Update> latest_release_tag =
+        UpdateChecker::GetLatestRelease();
+
+    if (!latest_release_tag)
+        goto empty;
+
+    {
+        std::string tag, build;
+        if (Common::g_is_nightly_build) {
+            std::vector<std::string> result;
+
+            boost::split(result, latest_release_tag->tag, boost::is_any_of("."));
+            if (result.size() != 2)
+                goto empty;
+            tag = result[1];
+
+            boost::split(result, std::string{Common::g_build_version}, boost::is_any_of("-"));
+            if (result.empty())
+                goto empty;
+            build = result[0];
+        } else {
+            tag = latest_release_tag->tag;
+            build = Common::g_build_version;
+        }
+
+        if (tag != build)
+            return latest_release_tag.value();
+    }
+
+empty:
    return std::nullopt;
 }
@@ -8,10 +8,16 @@
 #pragma once

 #include <optional>
-#include "common/net/net.h"
+#include <string>

 namespace UpdateChecker {

-std::optional<Common::Net::Release> GetUpdate();
+typedef struct {
+    std::string tag;
+    std::string name;
+} Update;

+std::optional<std::string> GetResponse(std::string url, std::string path);
+std::optional<Update> GetLatestRelease();
+std::optional<Update> GetUpdate();
 } // namespace UpdateChecker
@@ -14,38 +14,6 @@

 namespace Shader::Backend::SPIRV {
 namespace {
-class DescriptorIndex {
-public:
-    explicit DescriptorIndex(EmitContext& ctx, const IR::Value& index)
-        : id{index.IsImmediate() ? ctx.Const(index.U32()) : ctx.Def(index)},
-          is_non_uniform{ctx.profile.support_sampled_image_array_nonuniform_indexing &&
-                         !index.IsImmediate()} {
-        if (!is_non_uniform) {
-            return;
-        }
-        if (ctx.profile.supported_spirv < 0x00010400) {
-            ctx.AddExtension("SPV_EXT_descriptor_indexing");
-        }
-        ctx.AddCapability(spv::Capability::ShaderNonUniform);
-        ctx.AddCapability(spv::Capability::SampledImageArrayNonUniformIndexing);
-        Decorate(ctx, id);
-    }
-
-    Id Value() const {
-        return id;
-    }
-
-    void Decorate(EmitContext& ctx, Id object) const {
-        if (is_non_uniform) {
-            ctx.Decorate(object, spv::Decoration::NonUniform);
-        }
-    }
-
-private:
-    Id id;
-    bool is_non_uniform;
-};
-
 class ImageOperands {
 public:
    [[maybe_unused]] static constexpr bool ImageSampleOffsetAllowed = false;
@@ -221,12 +189,8 @@ private:
 Id Texture(EmitContext& ctx, IR::TextureInstInfo info, [[maybe_unused]] const IR::Value& index) {
    const TextureDefinition& def{ctx.textures.at(info.descriptor_index)};
    if (def.count > 1) {
-        const DescriptorIndex idx{ctx, index};
-        const Id pointer{ctx.OpAccessChain(def.pointer_type, def.id, idx.Value())};
-        idx.Decorate(ctx, pointer);
-        const Id object{ctx.OpLoad(def.sampled_type, pointer)};
-        idx.Decorate(ctx, object);
-        return object;
+        const Id pointer{ctx.OpAccessChain(def.pointer_type, def.id, ctx.Def(index))};
+        return ctx.OpLoad(def.sampled_type, pointer);
    } else {
        return ctx.OpLoad(def.sampled_type, def.id);
    }
@@ -244,14 +208,9 @@ Id TextureImage(EmitContext& ctx, IR::TextureInstInfo info, const IR::Value& ind
    } else {
        const TextureDefinition& def{ctx.textures.at(info.descriptor_index)};
        if (def.count > 1) {
-            const DescriptorIndex idx{ctx, index};
-            const Id ptr{ctx.OpAccessChain(def.pointer_type, def.id, idx.Value())};
-            idx.Decorate(ctx, ptr);
-            const Id object{ctx.OpLoad(def.sampled_type, ptr)};
-            idx.Decorate(ctx, object);
-            const Id image{ctx.OpImage(def.image_type, object)};
-            idx.Decorate(ctx, image);
-            return image;
+            const Id idx{index.IsImmediate() ? ctx.Const(index.U32()) : ctx.Def(index)};
+            const Id ptr{ctx.OpAccessChain(def.pointer_type, def.id, idx)};
+            return ctx.OpImage(def.image_type, ctx.OpLoad(def.sampled_type, ptr));
        }
        return ctx.OpImage(def.image_type, ctx.OpLoad(def.sampled_type, def.id));
    }
@@ -1,6 +1,3 @@
-// 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

@@ -20,9 +17,6 @@ struct HostTranslateInfo {
    bool support_snorm_render_buffer{};  ///< True when the device supports SNORM render buffers
    bool support_viewport_index_layer{}; ///< True when the device supports gl_Layer in VS
    u32 min_ssbo_alignment{};            ///< Minimum alignment supported by the device for SSBOs
-    u32 max_per_stage_descriptor_sampled_images{1024}; ///< maximum sampled descriptors per stage
-    u32 max_per_stage_resources{4096};                 ///< maximum resources per stage
-    u32 max_descriptor_set_sampled_images{1024};        ///< maximum sampled descriptors per set
    bool support_geometry_shader_passthrough{}; ///< True when the device supports geometry
                                                ///< passthrough shaders
    bool support_conditional_barrier{}; ///< True when the device supports barriers in conditional
@@ -30,73 +30,9 @@ struct TextureInst {

 using TextureInstVector = boost::container::small_vector<TextureInst, 24>;

-constexpr u32 DESCRIPTOR_SIZE = 8;
-constexpr u32 DESCRIPTOR_SIZE_SHIFT = static_cast<u32>(std::countr_zero(DESCRIPTOR_SIZE));
-constexpr u32 DYNAMIC_DESCRIPTOR_CBUF_BYTES = 16 * 1024;
-constexpr u32 MAX_DYNAMIC_DESCRIPTOR_COUNT = 1024;
-
-u32 DynamicDescriptorSizeShift(const IR::U32& dynamic_offset) {
-    const IR::Inst* const inst{dynamic_offset.InstRecursive()};
-    if (!inst || inst->GetOpcode() != IR::Opcode::ShiftLeftLogical32) {
-        return DESCRIPTOR_SIZE_SHIFT;
-    }
-    const IR::Value shift{inst->Arg(1)};
-    if (!shift.IsImmediate()) {
-        return DESCRIPTOR_SIZE_SHIFT;
-    }
-    const u32 size_shift{shift.U32()};
-    return size_shift >= DESCRIPTOR_SIZE_SHIFT && size_shift < 31 ? size_shift
-                                                                  : DESCRIPTOR_SIZE_SHIFT;
-}
-
-u32 DynamicDescriptorCount(u32 base_offset, u32 size_shift) {
-    if (size_shift >= 31 || base_offset >= DYNAMIC_DESCRIPTOR_CBUF_BYTES) {
-        return 1;
-    }
-    const u32 stride{1U << size_shift};
-    const u32 available{DYNAMIC_DESCRIPTOR_CBUF_BYTES - base_offset};
-    if (available < DESCRIPTOR_SIZE) {
-        return 1;
-    }
-    const u32 available_count{1U + (available - DESCRIPTOR_SIZE) / stride};
-    return std::min(MAX_DYNAMIC_DESCRIPTOR_COUNT, available_count);
-}
-
-u32 SaturatingSub(u32 lhs, u32 rhs) {
-    return lhs > rhs ? lhs - rhs : 0;
-}
-
-template <typename Descriptors>
-u32 StaticDescriptorCount(const Descriptors& descriptors) {
-    u32 count{};
-    for (const auto& desc : descriptors) {
-        if (desc.count <= 1) {
-            count += desc.count;
-        }
-    }
-    return count;
-}
-
-u32 DynamicSampledTextureCap(const Info& info, const HostTranslateInfo& host_info,
-                             u32 dynamic_arrays) {
-    if (dynamic_arrays == 0) {
-        return MAX_DYNAMIC_DESCRIPTOR_COUNT;
-    }
-    const u32 sampled_static_count{StaticDescriptorCount(info.texture_buffer_descriptors) +
-                                   StaticDescriptorCount(info.texture_descriptors)};
-    const u32 resource_static_count{
-        NumDescriptors(info.constant_buffer_descriptors) +
-        NumDescriptors(info.storage_buffers_descriptors) + sampled_static_count +
-        NumDescriptors(info.image_buffer_descriptors) + NumDescriptors(info.image_descriptors)};
-    const u32 sampled_limit{std::min(host_info.max_per_stage_descriptor_sampled_images,
-                                     host_info.max_descriptor_set_sampled_images)};
-    const u32 sampled_budget{SaturatingSub(sampled_limit, sampled_static_count)};
-    const u32 resource_budget{SaturatingSub(host_info.max_per_stage_resources,
-                                            resource_static_count)};
-    const u32 sampled_cap{sampled_budget / dynamic_arrays};
-    const u32 resource_cap{resource_budget / dynamic_arrays};
-    return std::max(1U, std::min({MAX_DYNAMIC_DESCRIPTOR_COUNT, sampled_cap, resource_cap}));
-}
+// TODO: We need to implement scatter/gather CBuf stuff
+constexpr u32 DESCRIPTOR_SIZE = 1024;
+constexpr u32 DESCRIPTOR_SIZE_SHIFT = u32(std::countr_zero(u32(8)));

 IR::Opcode IndexedInstruction(const IR::Inst& inst) {
    switch (inst.GetOpcode()) {
@@ -174,39 +110,6 @@ IR::Opcode IndexedInstruction(const IR::Inst& inst) {
    }
 }

-bool IsStorageImageOpcode(IR::Opcode opcode) {
-    switch (opcode) {
-    case IR::Opcode::ImageRead:
-    case IR::Opcode::ImageAtomicIAdd32:
-    case IR::Opcode::ImageAtomicSMin32:
-    case IR::Opcode::ImageAtomicUMin32:
-    case IR::Opcode::ImageAtomicSMax32:
-    case IR::Opcode::ImageAtomicUMax32:
-    case IR::Opcode::ImageAtomicInc32:
-    case IR::Opcode::ImageAtomicDec32:
-    case IR::Opcode::ImageAtomicAnd32:
-    case IR::Opcode::ImageAtomicOr32:
-    case IR::Opcode::ImageAtomicXor32:
-    case IR::Opcode::ImageAtomicExchange32:
-    case IR::Opcode::ImageWrite:
-        return true;
-    default:
-        return false;
-    }
-}
-
-u32 DynamicSampledTextureArrayCount(const TextureInstVector& to_replace) {
-    u32 count{};
-    for (const TextureInst& inst : to_replace) {
-        const auto flags{inst.inst->Flags<IR::TextureInstInfo>()};
-        if (inst.cbuf.count > 1 && !IsStorageImageOpcode(IndexedInstruction(*inst.inst)) &&
-            flags.type != TextureType::Buffer) {
-            ++count;
-        }
-    }
-    return count;
-}
-
 bool IsBindless(const IR::Inst& inst) {
    switch (inst.GetOpcode()) {
    case IR::Opcode::BindlessImageSampleImplicitLod:
@@ -452,7 +355,6 @@ std::optional<ConstBufferAddr> TryGetConstBuffer(const IR::Inst* inst, Environme
    } else {
        return std::nullopt;
    }
-    const u32 size_shift{DynamicDescriptorSizeShift(dynamic_offset)};
    return ConstBufferAddr{
        .index = index.U32(),
        .offset = base_offset,
@@ -461,7 +363,7 @@ std::optional<ConstBufferAddr> TryGetConstBuffer(const IR::Inst* inst, Environme
        .secondary_offset = 0,
        .secondary_shift_left = 0,
        .dynamic_offset = dynamic_offset,
-        .count = DynamicDescriptorCount(base_offset, size_shift),
+        .count = DESCRIPTOR_SIZE,
        .has_secondary = false,
    };
 }
@@ -505,15 +407,15 @@ u32 GetTextureHandle(Environment& env, const ConstBufferAddr& cbuf) {
    return lhs_raw | rhs_raw;
 }

-    [[maybe_unused]]TextureType ReadTextureType(Environment& env, const ConstBufferAddr& cbuf) {
+[[maybe_unused]]TextureType ReadTextureType(Environment& env, const ConstBufferAddr& cbuf) {
    return env.ReadTextureType(GetTextureHandle(env, cbuf));
 }

-    [[maybe_unused]]TexturePixelFormat ReadTexturePixelFormat(Environment& env, const ConstBufferAddr& cbuf) {
+[[maybe_unused]]TexturePixelFormat ReadTexturePixelFormat(Environment& env, const ConstBufferAddr& cbuf) {
    return env.ReadTexturePixelFormat(GetTextureHandle(env, cbuf));
 }

-    [[maybe_unused]]bool IsTexturePixelFormatInteger(Environment& env, const ConstBufferAddr& cbuf) {
+[[maybe_unused]]bool IsTexturePixelFormatInteger(Environment& env, const ConstBufferAddr& cbuf) {
    return env.IsTexturePixelFormatInteger(GetTextureHandle(env, cbuf));
 }

@@ -688,8 +590,6 @@ void TexturePass(Environment& env, IR::Program& program, const HostTranslateInfo
        program.info.texture_descriptors,
        program.info.image_descriptors,
    };
-    const u32 sampled_dynamic_cap{
-        DynamicSampledTextureCap(program.info, host_info, DynamicSampledTextureArrayCount(to_replace))};
    for (TextureInst& texture_inst : to_replace) {
        // TODO: Handle arrays
        IR::Inst* const inst{texture_inst.inst};
@@ -733,9 +633,6 @@ void TexturePass(Environment& env, IR::Program& program, const HostTranslateInfo
            break;
        }
        u32 index;
-        const u32 size_shift{cbuf.count > 1 ? DynamicDescriptorSizeShift(cbuf.dynamic_offset)
-                                            : DESCRIPTOR_SIZE_SHIFT};
-        u32 count{cbuf.count};
        switch (inst->GetOpcode()) {
        case IR::Opcode::ImageRead:
        case IR::Opcode::ImageAtomicIAdd32:
@@ -764,8 +661,8 @@ void TexturePass(Environment& env, IR::Program& program, const HostTranslateInfo
                    .is_integer = is_integer,
                    .cbuf_index = cbuf.index,
                    .cbuf_offset = cbuf.offset,
-                    .count = count,
-                    .size_shift = size_shift,
+                    .count = cbuf.count,
+                    .size_shift = DESCRIPTOR_SIZE_SHIFT,
                });
            } else {
                index = descriptors.Add(ImageDescriptor{
@@ -776,8 +673,8 @@ void TexturePass(Environment& env, IR::Program& program, const HostTranslateInfo
                    .is_integer = is_integer,
                    .cbuf_index = cbuf.index,
                    .cbuf_offset = cbuf.offset,
-                    .count = count,
-                    .size_shift = size_shift,
+                    .count = cbuf.count,
+                    .size_shift = DESCRIPTOR_SIZE_SHIFT,
                });
            }
            break;
@@ -792,11 +689,10 @@ void TexturePass(Environment& env, IR::Program& program, const HostTranslateInfo
                    .secondary_cbuf_index = cbuf.secondary_index,
                    .secondary_cbuf_offset = cbuf.secondary_offset,
                    .secondary_shift_left = cbuf.secondary_shift_left,
-                    .count = count,
-                    .size_shift = size_shift,
+                    .count = cbuf.count,
+                    .size_shift = DESCRIPTOR_SIZE_SHIFT,
                });
            } else {
-                count = std::min(count, sampled_dynamic_cap);
                index = descriptors.Add(TextureDescriptor{
                    .type = flags.type,
                    .is_depth = flags.is_depth != 0,
@@ -808,8 +704,8 @@ void TexturePass(Environment& env, IR::Program& program, const HostTranslateInfo
                    .secondary_cbuf_index = cbuf.secondary_index,
                    .secondary_cbuf_offset = cbuf.secondary_offset,
                    .secondary_shift_left = cbuf.secondary_shift_left,
-                    .count = count,
-                    .size_shift = size_shift,
+                    .count = cbuf.count,
+                    .size_shift = DESCRIPTOR_SIZE_SHIFT,
                });
            }
            break;
@@ -817,12 +713,11 @@ void TexturePass(Environment& env, IR::Program& program, const HostTranslateInfo
        flags.descriptor_index.Assign(index);
        inst->SetFlags(flags);

-        if (count > 1) {
+        if (cbuf.count > 1) {
            const auto insert_point{IR::Block::InstructionList::s_iterator_to(*inst)};
            IR::IREmitter ir{*texture_inst.block, insert_point};
-            const IR::U32 shift{ir.Imm32(size_shift)};
-            inst->SetArg(0, ir.UMin(ir.ShiftRightLogical(cbuf.dynamic_offset, shift),
-                        ir.Imm32(count - 1)));
+            const IR::U32 shift{ir.Imm32(DESCRIPTOR_SIZE_SHIFT)};
+            inst->SetArg(0, ir.UMin(ir.ShiftRightLogical(cbuf.dynamic_offset, shift), ir.Imm32(DESCRIPTOR_SIZE - 1)));
        } else {
            inst->SetArg(0, IR::Value{});
        }
@@ -1,6 +1,3 @@
-// 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

@@ -48,7 +45,6 @@ struct Profile {
    bool support_scaled_attributes{};
    bool support_multi_viewport{};
    bool support_geometry_streams{};
-    bool support_sampled_image_array_nonuniform_indexing{};

    bool warp_size_potentially_larger_than_guest{};

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

 if(LIBVA_FOUND)
-    set_source_files_properties(host1x/ffmpeg.cpp
+    set_source_files_properties(host1x/ffmpeg/ffmpeg.cpp
        PROPERTIES COMPILE_DEFINITIONS LIBVA_FOUND=1)
    list(APPEND FFmpeg_LIBRARIES ${LIBVA_LIBRARIES})
 endif()
@@ -44,6 +44,7 @@ add_library(video_core STATIC
    engines/sw_blitter/converter.h
    engines/const_buffer_info.h
    engines/draw_manager.cpp
+    engines/draw_manager.h
    engines/engine_interface.h
    engines/engine_upload.cpp
    engines/engine_upload.h
@@ -71,9 +72,9 @@ add_library(video_core STATIC
    host1x/codecs/vp8.h
    host1x/codecs/vp9.cpp
    host1x/codecs/vp9.h
-    host1x/codec_types.h
-    host1x/ffmpeg.cpp
-    host1x/ffmpeg.h
+    host1x/codecs/vp9_types.h
+    host1x/ffmpeg/ffmpeg.cpp
+    host1x/ffmpeg/ffmpeg.h
    host1x/control.cpp
    host1x/control.h
    host1x/gpu_device_memory_manager.cpp
@@ -356,7 +356,7 @@ void BufferCache<P>::BindHostGeometryBuffers(bool is_indexed) {
    if (is_indexed) {
        BindHostIndexBuffer();
    } else if constexpr (!HAS_FULL_INDEX_AND_PRIMITIVE_SUPPORT) {
-        const auto& draw_state = maxwell3d->draw_manager.draw_state;
+        const auto& draw_state = maxwell3d->draw_manager->GetDrawState();
        if (draw_state.topology == Maxwell::PrimitiveTopology::Quads ||
            draw_state.topology == Maxwell::PrimitiveTopology::QuadStrip) {
            runtime.BindQuadIndexBuffer(draw_state.topology, draw_state.vertex_buffer.first,
@@ -740,25 +740,30 @@ void BufferCache<P>::BindHostIndexBuffer() {
    TouchBuffer(buffer, channel_state->index_buffer.buffer_id);
    const u32 offset = buffer.Offset(channel_state->index_buffer.device_addr);
    const u32 size = channel_state->index_buffer.size;
-    const auto& draw_state = maxwell3d->draw_manager.draw_state;
-    if (draw_state.inline_index_draw_indexes.empty()) {
-        SynchronizeBuffer(buffer, channel_state->index_buffer.device_addr, size);
-    } else {
+    const auto& draw_state = maxwell3d->draw_manager->GetDrawState();
+    if (!draw_state.inline_index_draw_indexes.empty()) [[unlikely]] {
        if constexpr (USE_MEMORY_MAPS_FOR_UPLOADS) {
            auto upload_staging = runtime.UploadStagingBuffer(size);
-            std::array<BufferCopy, 1> copies{{BufferCopy{.src_offset = upload_staging.offset, .dst_offset = 0, .size = size}}};
-            std::memcpy(upload_staging.mapped_span.data(), draw_state.inline_index_draw_indexes.data(), size);
+            std::array<BufferCopy, 1> copies{
+                {BufferCopy{.src_offset = upload_staging.offset, .dst_offset = 0, .size = size}}};
+            std::memcpy(upload_staging.mapped_span.data(),
+                        draw_state.inline_index_draw_indexes.data(), size);
            runtime.CopyBuffer(buffer, upload_staging.buffer, copies, true);
        } else {
            buffer.ImmediateUpload(0, draw_state.inline_index_draw_indexes);
        }
+    } else {
+        SynchronizeBuffer(buffer, channel_state->index_buffer.device_addr, size);
    }
    if constexpr (HAS_FULL_INDEX_AND_PRIMITIVE_SUPPORT) {
-        const u32 new_offset = offset + draw_state.index_buffer.first * draw_state.index_buffer.FormatSizeInBytes();
+        const u32 new_offset =
+            offset + draw_state.index_buffer.first * draw_state.index_buffer.FormatSizeInBytes();
        runtime.BindIndexBuffer(buffer, new_offset, size);
    } else {
        buffer.MarkUsage(offset, size);
-        runtime.BindIndexBuffer(draw_state.topology, draw_state.index_buffer.format, draw_state.index_buffer.first, draw_state.index_buffer.count, buffer, offset, size);
+        runtime.BindIndexBuffer(draw_state.topology, draw_state.index_buffer.format,
+                                draw_state.index_buffer.first, draw_state.index_buffer.count,
+                                buffer, offset, size);
    }
 }

@@ -940,9 +945,10 @@ void BufferCache<P>::BindHostGraphicsUniformBuffer(size_t stage, u32 index, u32
            return alignment > 1 && (offset % alignment) != 0;
        }
    }();
-    const bool use_fast_buffer = needs_alignment_stream
-        || (has_host_buffer && size <= channel_state->uniform_buffer_skip_cache_size
-            && !memory_tracker.IsRegionGpuModified(device_addr, size));
+    const bool use_fast_buffer = needs_alignment_stream ||
+                                 (has_host_buffer &&
+                                  size <= channel_state->uniform_buffer_skip_cache_size &&
+                                  !memory_tracker.IsRegionGpuModified(device_addr, size));
    if (use_fast_buffer) {
        if constexpr (IS_OPENGL) {
            if (runtime.HasFastBufferSubData()) {
@@ -1223,7 +1229,7 @@ template <class P>
 void BufferCache<P>::UpdateIndexBuffer() {
    // We have to check for the dirty flags and index count
    // The index count is currently changed without updating the dirty flags
-    const auto& draw_state = maxwell3d->draw_manager.draw_state;
+    const auto& draw_state = maxwell3d->draw_manager->GetDrawState();
    const auto& index_buffer_ref = draw_state.index_buffer;
    auto& flags = maxwell3d->dirty.flags;
    if (!flags[Dirty::IndexBuffer]) {
@@ -32,7 +32,7 @@
 #include "video_core/control/channel_state_cache.h"
 #include "video_core/delayed_destruction_ring.h"
 #include "video_core/dirty_flags.h"
-#include "video_core/engines/maxwell_3d.h"
+#include "video_core/engines/draw_manager.h"
 #include "video_core/engines/kepler_compute.h"
 #include "video_core/engines/maxwell_3d.h"
 #include "video_core/memory_manager.h"
@@ -305,7 +305,7 @@ public:
    [[nodiscard]] bool IsRegionCpuModified(DAddr addr, size_t size);

    void SetDrawIndirect(
-        const Tegra::Engines::Maxwell3D::DrawManager::IndirectParams* current_draw_indirect_) {
+        const Tegra::Engines::DrawManager::IndirectParams* current_draw_indirect_) {
        current_draw_indirect = current_draw_indirect_;
    }

@@ -480,7 +480,7 @@ private:
 #endif
    DelayedDestructionRing<Buffer, TICKS_TO_DESTROY> delayed_destruction_ring;

-    const Tegra::Engines::Maxwell3D::DrawManager::IndirectParams* current_draw_indirect{};
+    const Tegra::Engines::DrawManager::IndirectParams* current_draw_indirect{};

    u32 last_index_count = 0;

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

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

 CDmaPusher::CDmaPusher(Host1x::Host1x& host1x_, s32 id)
-    : host_processor(host1x_)
-    , host1x{host1x_}
-    , current_class{ChClassId(id)}
-{
-    thread = std::jthread([this](std::stop_token stop_token) {
-        Common::SetCurrentThreadPriority(Common::ThreadPriority::High);
-        ChCommandHeaderList command_list{host1x.System().ApplicationMemory(), 0, 0};
-        u32 count{};
-        u32 method_offset{};
-        u32 mask{};
-        bool incrementing{};
-        while (!stop_token.stop_requested()) {
-            {
-                std::unique_lock l{command_mutex};
-                command_cv.wait(l, stop_token, [this]() { return command_lists.size() > 0; });
-                if (stop_token.stop_requested()) {
-                    return;
-                }
-
-                command_list = std::move(command_lists.front());
-                command_lists.pop_front();
-            }
-
-            size_t i = 0;
-            for (const auto value : command_list) {
-                i++;
-                if (mask != 0) {
-                    const auto lbs = static_cast<u32>(std::countr_zero(mask));
-                    mask &= ~(1U << lbs);
-                    ExecuteCommand(method_offset + lbs, value.raw);
-                    continue;
-                } else if (count != 0) {
-                    --count;
-                    ExecuteCommand(method_offset, value.raw);
-                    if (incrementing) {
-                        ++method_offset;
-                    }
-                    continue;
-                }
-                const auto mode = value.submission_mode.Value();
-                switch (mode) {
-                case ChSubmissionMode::SetClass: {
-                    mask = value.value & 0x3f;
-                    method_offset = value.method_offset;
-                    current_class = ChClassId((value.value >> 6) & 0x3ff);
-                    break;
-                }
-                case ChSubmissionMode::Incrementing:
-                case ChSubmissionMode::NonIncrementing:
-                    count = value.value;
-                    method_offset = value.method_offset;
-                    incrementing = mode == ChSubmissionMode::Incrementing;
-                    break;
-                case ChSubmissionMode::Mask:
-                    mask = value.value;
-                    method_offset = value.method_offset;
-                    break;
-                case ChSubmissionMode::Immediate: {
-                    const u32 data = value.value & 0xfff;
-                    method_offset = value.method_offset;
-                    ExecuteCommand(method_offset, data);
-                    break;
-                }
-                default:
-                    LOG_ERROR(HW_GPU, "Bad command at index {} (bytes {:#X}), buffer size {}", i - 1, (i - 1) * sizeof(u32), command_list.size());
-                    UNIMPLEMENTED_MSG("ChSubmission mode {} is not implemented!", u32(mode));
-                    break;
-                }
-            }
-        }
-    });
+    : host1x{host1x_}, memory_manager{host1x.GMMU()},
+      host_processor{std::make_unique<Host1x::Control>(host1x_)}, current_class{
+                                                                      static_cast<ChClassId>(id)} {
+    thread = std::jthread([this](std::stop_token stop_token) { ProcessEntries(stop_token); });
 }

 CDmaPusher::~CDmaPusher() = default;

+void CDmaPusher::ProcessEntries(std::stop_token stop_token) {
+    Common::SetCurrentThreadPriority(Common::ThreadPriority::High);
+    ChCommandHeaderList command_list{host1x.System().ApplicationMemory(), 0, 0};
+    u32 count{};
+    u32 method_offset{};
+    u32 mask{};
+    bool incrementing{};
+
+    while (!stop_token.stop_requested()) {
+        {
+            std::unique_lock l{command_mutex};
+            command_cv.wait(l, stop_token,
+                            [this]() { return command_lists.size() > 0; });
+            if (stop_token.stop_requested()) {
+                return;
+            }
+
+            command_list = std::move(command_lists.front());
+            command_lists.pop_front();
+        }
+
+        size_t i = 0;
+        for (const auto value : command_list) {
+            i++;
+            if (mask != 0) {
+                const auto lbs = static_cast<u32>(std::countr_zero(mask));
+                mask &= ~(1U << lbs);
+                ExecuteCommand(method_offset + lbs, value.raw);
+                continue;
+            } else if (count != 0) {
+                --count;
+                ExecuteCommand(method_offset, value.raw);
+                if (incrementing) {
+                    ++method_offset;
+                }
+                continue;
+            }
+            const auto mode = value.submission_mode.Value();
+            switch (mode) {
+            case ChSubmissionMode::SetClass: {
+                mask = value.value & 0x3f;
+                method_offset = value.method_offset;
+                current_class = static_cast<ChClassId>((value.value >> 6) & 0x3ff);
+                break;
+            }
+            case ChSubmissionMode::Incrementing:
+            case ChSubmissionMode::NonIncrementing:
+                count = value.value;
+                method_offset = value.method_offset;
+                incrementing = mode == ChSubmissionMode::Incrementing;
+                break;
+            case ChSubmissionMode::Mask:
+                mask = value.value;
+                method_offset = value.method_offset;
+                break;
+            case ChSubmissionMode::Immediate: {
+                const u32 data = value.value & 0xfff;
+                method_offset = value.method_offset;
+                ExecuteCommand(method_offset, data);
+                break;
+            }
+            default:
+                LOG_ERROR(HW_GPU, "Bad command at index {} (bytes {:#X}), buffer size {}", i - 1,
+                          (i - 1) * sizeof(u32), command_list.size());
+                UNIMPLEMENTED_MSG("ChSubmission mode {} is not implemented!",
+                                  static_cast<u32>(mode));
+                break;
+            }
+        }
+    }
+}
+
 void CDmaPusher::ExecuteCommand(u32 method, u32 arg) {
    switch (current_class) {
    case ChClassId::Control:
-        LOG_TRACE(Service_NVDRV, "Class {} method {:#X} arg 0x{:X}", u32(current_class), method, arg);
-        host_processor.ProcessMethod(Host1x::Control::Method(method), arg);
+        LOG_TRACE(Service_NVDRV, "Class {} method {:#X} arg 0x{:X}",
+                  static_cast<u32>(current_class), method, arg);
+        host_processor->ProcessMethod(static_cast<Host1x::Control::Method>(method), arg);
        break;
    default:
        thi_regs.reg_array[method] = arg;
        switch (static_cast<ThiMethod>(method)) {
        case ThiMethod::IncSyncpt: {
-            const auto syncpoint_id = u32(arg & 0xFF);
-            [[maybe_unused]] const auto cond = u32((arg >> 8) & 0xFF);
-            LOG_TRACE(Service_NVDRV, "Class {} IncSyncpt Method, syncpt {} cond {}", u32(current_class), syncpoint_id, cond);
+            const auto syncpoint_id = static_cast<u32>(arg & 0xFF);
+            [[maybe_unused]] const auto cond = static_cast<u32>((arg >> 8) & 0xFF);
+            LOG_TRACE(Service_NVDRV, "Class {} IncSyncpt Method, syncpt {} cond {}",
+                      static_cast<u32>(current_class), syncpoint_id, cond);
            auto& syncpoint_manager = host1x.GetSyncpointManager();
            syncpoint_manager.IncrementGuest(syncpoint_id);
            syncpoint_manager.IncrementHost(syncpoint_id);
            break;
        }
        case ThiMethod::SetMethod1:
-            LOG_TRACE(Service_NVDRV, "Class {} method {:#X} arg 0x{:X}", u32(current_class), u32(thi_regs.method_0), arg);
+            LOG_TRACE(Service_NVDRV, "Class {} method {:#X} arg 0x{:X}",
+                      static_cast<u32>(current_class), static_cast<u32>(thi_regs.method_0), arg);
            ProcessMethod(thi_regs.method_0, arg);
            break;
        default:
@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

@@ -18,11 +15,11 @@
 #include "common/common_types.h"
 #include "common/polyfill_thread.h"
 #include "core/memory.h"
-#include "video_core/host1x/control.h"

 namespace Tegra {

 namespace Host1x {
+class Control;
 class Host1x;
 class Nvdec;
 class SyncptIncrManager;
@@ -120,19 +117,25 @@ protected:

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

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

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

 } // namespace Tegra
@@ -1,24 +1,23 @@
-// 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 "common/settings.h"
 #include "video_core/dirty_flags.h"
-#include "video_core/engines/maxwell_3d.h"
+#include "video_core/engines/draw_manager.h"
 #include "video_core/rasterizer_interface.h"

 namespace Tegra::Engines {
+DrawManager::DrawManager(Maxwell3D* maxwell3d_) : maxwell3d(maxwell3d_) {}

-void Maxwell3D::DrawManager::ProcessMethodCall(Maxwell3D& maxwell3d, u32 method, u32 argument) {
+void DrawManager::ProcessMethodCall(u32 method, u32 argument) {
+    const auto& regs{maxwell3d->regs};
    switch (method) {
    case MAXWELL3D_REG_INDEX(clear_surface):
-        return Clear(maxwell3d, 1);
+        return Clear(1);
    case MAXWELL3D_REG_INDEX(draw.begin):
-        return DrawBegin(maxwell3d);
+        return DrawBegin();
    case MAXWELL3D_REG_INDEX(draw.end):
-        return DrawEnd(maxwell3d);
+        return DrawEnd();
    case MAXWELL3D_REG_INDEX(vertex_buffer.first):
    case MAXWELL3D_REG_INDEX(vertex_buffer.count):
    case MAXWELL3D_REG_INDEX(index_buffer.first):
@@ -34,29 +33,33 @@ void Maxwell3D::DrawManager::ProcessMethodCall(Maxwell3D& maxwell3d, u32 method,
    case MAXWELL3D_REG_INDEX(index_buffer32_first):
    case MAXWELL3D_REG_INDEX(index_buffer16_first):
    case MAXWELL3D_REG_INDEX(index_buffer8_first):
-        return DrawIndexSmall(maxwell3d, argument);
+        return DrawIndexSmall(argument);
    case MAXWELL3D_REG_INDEX(draw_inline_index):
-        SetInlineIndexBuffer(maxwell3d, argument);
+        SetInlineIndexBuffer(argument);
        break;
    case MAXWELL3D_REG_INDEX(inline_index_2x16.even):
-        SetInlineIndexBuffer(maxwell3d, maxwell3d.regs.inline_index_2x16.even);
-        SetInlineIndexBuffer(maxwell3d, maxwell3d.regs.inline_index_2x16.odd);
+        SetInlineIndexBuffer(regs.inline_index_2x16.even);
+        SetInlineIndexBuffer(regs.inline_index_2x16.odd);
        break;
    case MAXWELL3D_REG_INDEX(inline_index_4x8.index0):
-        SetInlineIndexBuffer(maxwell3d, maxwell3d.regs.inline_index_4x8.index0);
-        SetInlineIndexBuffer(maxwell3d, maxwell3d.regs.inline_index_4x8.index1);
-        SetInlineIndexBuffer(maxwell3d, maxwell3d.regs.inline_index_4x8.index2);
-        SetInlineIndexBuffer(maxwell3d, maxwell3d.regs.inline_index_4x8.index3);
+        SetInlineIndexBuffer(regs.inline_index_4x8.index0);
+        SetInlineIndexBuffer(regs.inline_index_4x8.index1);
+        SetInlineIndexBuffer(regs.inline_index_4x8.index2);
+        SetInlineIndexBuffer(regs.inline_index_4x8.index3);
        break;
    case MAXWELL3D_REG_INDEX(vertex_array_instance_first):
-        DrawArrayInstanced(maxwell3d, maxwell3d.regs.vertex_array_instance_first.topology.Value(), maxwell3d.regs.vertex_array_instance_first.start.Value(), maxwell3d.regs.vertex_array_instance_first.count.Value(), false);
+        DrawArrayInstanced(regs.vertex_array_instance_first.topology.Value(),
+                           regs.vertex_array_instance_first.start.Value(),
+                           regs.vertex_array_instance_first.count.Value(), false);
        break;
    case MAXWELL3D_REG_INDEX(vertex_array_instance_subsequent): {
-        DrawArrayInstanced(maxwell3d, maxwell3d.regs.vertex_array_instance_subsequent.topology.Value(), maxwell3d.regs.vertex_array_instance_subsequent.start.Value(), maxwell3d.regs.vertex_array_instance_subsequent.count.Value(), true);
+        DrawArrayInstanced(regs.vertex_array_instance_subsequent.topology.Value(),
+                           regs.vertex_array_instance_subsequent.start.Value(),
+                           regs.vertex_array_instance_subsequent.count.Value(), true);
        break;
    }
    case MAXWELL3D_REG_INDEX(draw_texture.src_y0): {
-        DrawTexture(maxwell3d);
+        DrawTexture();
        break;
    }
    default:
@@ -64,87 +67,101 @@ void Maxwell3D::DrawManager::ProcessMethodCall(Maxwell3D& maxwell3d, u32 method,
    }
 }

-void Maxwell3D::DrawManager::Clear(Maxwell3D& maxwell3d, u32 layer_count) {
-    if (maxwell3d.ShouldExecute()) {
-        maxwell3d.rasterizer->Clear(layer_count);
+void DrawManager::Clear(u32 layer_count) {
+    if (maxwell3d->ShouldExecute()) {
+        maxwell3d->rasterizer->Clear(layer_count);
    }
 }

-void Maxwell3D::DrawManager::DrawDeferred(Maxwell3D& maxwell3d) {
+void DrawManager::DrawDeferred() {
    if (draw_state.draw_mode != DrawMode::Instance || draw_state.instance_count == 0) {
        return;
    }
-    DrawEnd(maxwell3d, draw_state.instance_count + 1, true);
+    DrawEnd(draw_state.instance_count + 1, true);
    draw_state.instance_count = 0;
 }

-void Maxwell3D::DrawManager::DrawArray(Maxwell3D& maxwell3d, Maxwell3D::Regs::PrimitiveTopology topology, u32 vertex_first, u32 vertex_count, u32 base_instance, u32 num_instances) {
+void DrawManager::DrawArray(PrimitiveTopology topology, u32 vertex_first, u32 vertex_count,
+                            u32 base_instance, u32 num_instances) {
    draw_state.topology = topology;
    draw_state.vertex_buffer.first = vertex_first;
    draw_state.vertex_buffer.count = vertex_count;
    draw_state.base_instance = base_instance;
-    ProcessDraw(maxwell3d, false, num_instances);
+    ProcessDraw(false, num_instances);
 }

-void Maxwell3D::DrawManager::DrawArrayInstanced(Maxwell3D& maxwell3d, Maxwell3D::Regs::PrimitiveTopology topology, u32 vertex_first, u32 vertex_count, bool subsequent) {
+void DrawManager::DrawArrayInstanced(PrimitiveTopology topology, u32 vertex_first, u32 vertex_count,
+                                     bool subsequent) {
    draw_state.topology = topology;
    draw_state.vertex_buffer.first = vertex_first;
    draw_state.vertex_buffer.count = vertex_count;
+
    if (!subsequent) {
        draw_state.instance_count = 1;
    }
+
    draw_state.base_instance = draw_state.instance_count - 1;
    draw_state.draw_mode = DrawMode::Instance;
    draw_state.instance_count++;
-    ProcessDraw(maxwell3d, false, 1);
+    ProcessDraw(false, 1);
 }

-void Maxwell3D::DrawManager::DrawIndex(Maxwell3D& maxwell3d, Maxwell3D::Regs::PrimitiveTopology topology, u32 index_first, u32 index_count, u32 base_index, u32 base_instance, u32 num_instances) {
+void DrawManager::DrawIndex(PrimitiveTopology topology, u32 index_first, u32 index_count,
+                            u32 base_index, u32 base_instance, u32 num_instances) {
+    const auto& regs{maxwell3d->regs};
    draw_state.topology = topology;
-    draw_state.index_buffer = maxwell3d.regs.index_buffer;
+    draw_state.index_buffer = regs.index_buffer;
    draw_state.index_buffer.first = index_first;
    draw_state.index_buffer.count = index_count;
    draw_state.base_index = base_index;
    draw_state.base_instance = base_instance;
-    ProcessDraw(maxwell3d, true, num_instances);
+    ProcessDraw(true, num_instances);
 }

-void Maxwell3D::DrawManager::DrawArrayIndirect(Maxwell3D& maxwell3d, Maxwell3D::Regs::PrimitiveTopology topology) {
+void DrawManager::DrawArrayIndirect(PrimitiveTopology topology) {
    draw_state.topology = topology;
-    ProcessDrawIndirect(maxwell3d);
+
+    ProcessDrawIndirect();
 }

-void Maxwell3D::DrawManager::DrawIndexedIndirect(Maxwell3D& maxwell3d, Maxwell3D::Regs::PrimitiveTopology topology, u32 index_first, u32 index_count) {
+void DrawManager::DrawIndexedIndirect(PrimitiveTopology topology, u32 index_first,
+                                      u32 index_count) {
+    const auto& regs{maxwell3d->regs};
    draw_state.topology = topology;
-    draw_state.index_buffer = maxwell3d.regs.index_buffer;
+    draw_state.index_buffer = regs.index_buffer;
    draw_state.index_buffer.first = index_first;
    draw_state.index_buffer.count = index_count;
-    ProcessDrawIndirect(maxwell3d);
+
+    ProcessDrawIndirect();
 }

-void Maxwell3D::DrawManager::SetInlineIndexBuffer(Maxwell3D& maxwell3d, u32 index) {
-    draw_state.inline_index_draw_indexes.push_back(u8(index & 0x000000ff));
-    draw_state.inline_index_draw_indexes.push_back(u8((index & 0x0000ff00) >> 8));
-    draw_state.inline_index_draw_indexes.push_back(u8((index & 0x00ff0000) >> 16));
-    draw_state.inline_index_draw_indexes.push_back(u8((index & 0xff000000) >> 24));
+void DrawManager::SetInlineIndexBuffer(u32 index) {
+    draw_state.inline_index_draw_indexes.push_back(static_cast<u8>(index & 0x000000ff));
+    draw_state.inline_index_draw_indexes.push_back(static_cast<u8>((index & 0x0000ff00) >> 8));
+    draw_state.inline_index_draw_indexes.push_back(static_cast<u8>((index & 0x00ff0000) >> 16));
+    draw_state.inline_index_draw_indexes.push_back(static_cast<u8>((index & 0xff000000) >> 24));
    draw_state.draw_mode = DrawMode::InlineIndex;
 }

-void Maxwell3D::DrawManager::DrawBegin(Maxwell3D& maxwell3d) {
-    auto reset_instance_count = maxwell3d.regs.draw.instance_id == Maxwell3D::Regs::Draw::InstanceId::First;
-    auto increment_instance_count = maxwell3d.regs.draw.instance_id == Maxwell3D::Regs::Draw::InstanceId::Subsequent;
+void DrawManager::DrawBegin() {
+    const auto& regs{maxwell3d->regs};
+    auto reset_instance_count = regs.draw.instance_id == Maxwell3D::Regs::Draw::InstanceId::First;
+    auto increment_instance_count =
+        regs.draw.instance_id == Maxwell3D::Regs::Draw::InstanceId::Subsequent;
    if (reset_instance_count) {
-        DrawDeferred(maxwell3d);
+        DrawDeferred();
        draw_state.instance_count = 0;
        draw_state.draw_mode = DrawMode::General;
    } else if (increment_instance_count) {
        draw_state.instance_count++;
        draw_state.draw_mode = DrawMode::Instance;
    }
-    draw_state.topology = maxwell3d.regs.draw.topology;
+
+    draw_state.topology = regs.draw.topology;
 }

-void Maxwell3D::DrawManager::DrawEnd(Maxwell3D& maxwell3d, u32 instance_count, bool force_draw) {
+void DrawManager::DrawEnd(u32 instance_count, bool force_draw) {
+    const auto& regs{maxwell3d->regs};
    switch (draw_state.draw_mode) {
    case DrawMode::Instance:
        if (!force_draw) {
@@ -152,100 +169,119 @@ void Maxwell3D::DrawManager::DrawEnd(Maxwell3D& maxwell3d, u32 instance_count, b
        }
        [[fallthrough]];
    case DrawMode::General:
-        draw_state.base_instance = maxwell3d.regs.global_base_instance_index;
-        draw_state.base_index = maxwell3d.regs.global_base_vertex_index;
+        draw_state.base_instance = regs.global_base_instance_index;
+        draw_state.base_index = regs.global_base_vertex_index;
        if (draw_state.draw_indexed) {
-            draw_state.index_buffer = maxwell3d.regs.index_buffer;
-            ProcessDraw(maxwell3d, true, instance_count);
+            draw_state.index_buffer = regs.index_buffer;
+            ProcessDraw(true, instance_count);
        } else {
-            draw_state.vertex_buffer = maxwell3d.regs.vertex_buffer;
-            ProcessDraw(maxwell3d, false, instance_count);
+            draw_state.vertex_buffer = regs.vertex_buffer;
+            ProcessDraw(false, instance_count);
        }
        draw_state.draw_indexed = false;
        break;
    case DrawMode::InlineIndex:
-        draw_state.base_instance = maxwell3d.regs.global_base_instance_index;
-        draw_state.base_index = maxwell3d.regs.global_base_vertex_index;
-        draw_state.index_buffer = maxwell3d.regs.index_buffer;
-        draw_state.index_buffer.count = u32(draw_state.inline_index_draw_indexes.size() / 4);
+        draw_state.base_instance = regs.global_base_instance_index;
+        draw_state.base_index = regs.global_base_vertex_index;
+        draw_state.index_buffer = regs.index_buffer;
+        draw_state.index_buffer.count =
+            static_cast<u32>(draw_state.inline_index_draw_indexes.size() / 4);
        draw_state.index_buffer.format = Maxwell3D::Regs::IndexFormat::UnsignedInt;
-        maxwell3d.dirty.flags[VideoCommon::Dirty::IndexBuffer] = true;
-        ProcessDraw(maxwell3d, true, instance_count);
+        maxwell3d->dirty.flags[VideoCommon::Dirty::IndexBuffer] = true;
+        ProcessDraw(true, instance_count);
        draw_state.inline_index_draw_indexes.clear();
        break;
    }
 }

-void Maxwell3D::DrawManager::DrawIndexSmall(Maxwell3D& maxwell3d, u32 argument) {
-    Maxwell3D::Regs::IndexBufferSmall index_small_params{argument};
-    draw_state.base_instance = maxwell3d.regs.global_base_instance_index;
-    draw_state.base_index = maxwell3d.regs.global_base_vertex_index;
-    draw_state.index_buffer = maxwell3d.regs.index_buffer;
+void DrawManager::DrawIndexSmall(u32 argument) {
+    const auto& regs{maxwell3d->regs};
+    IndexBufferSmall index_small_params{argument};
+    draw_state.base_instance = regs.global_base_instance_index;
+    draw_state.base_index = regs.global_base_vertex_index;
+    draw_state.index_buffer = regs.index_buffer;
    draw_state.index_buffer.first = index_small_params.first;
    draw_state.index_buffer.count = index_small_params.count;
    draw_state.topology = index_small_params.topology;
-    maxwell3d.dirty.flags[VideoCommon::Dirty::IndexBuffer] = true;
-    ProcessDraw(maxwell3d, true, 1);
+    maxwell3d->dirty.flags[VideoCommon::Dirty::IndexBuffer] = true;
+    ProcessDraw(true, 1);
 }

-void Maxwell3D::DrawManager::DrawTexture(Maxwell3D& maxwell3d) {
-    draw_texture_state.dst_x0 = f32(maxwell3d.regs.draw_texture.dst_x0) / 4096.f;
-    draw_texture_state.dst_y0 = f32(maxwell3d.regs.draw_texture.dst_y0) / 4096.f;
-    const auto dst_width = f32(maxwell3d.regs.draw_texture.dst_width) / 4096.f;
-    const auto dst_height = f32(maxwell3d.regs.draw_texture.dst_height) / 4096.f;
-    const bool lower_left{maxwell3d.regs.window_origin.mode != Maxwell3D::Regs::WindowOrigin::Mode::UpperLeft};
+void DrawManager::DrawTexture() {
+    const auto& regs{maxwell3d->regs};
+    draw_texture_state.dst_x0 = static_cast<float>(regs.draw_texture.dst_x0) / 4096.f;
+    draw_texture_state.dst_y0 = static_cast<float>(regs.draw_texture.dst_y0) / 4096.f;
+    const auto dst_width = static_cast<float>(regs.draw_texture.dst_width) / 4096.f;
+    const auto dst_height = static_cast<float>(regs.draw_texture.dst_height) / 4096.f;
+    const bool lower_left{regs.window_origin.mode !=
+                          Maxwell3D::Regs::WindowOrigin::Mode::UpperLeft};
    if (lower_left) {
-        draw_texture_state.dst_y0 = f32(maxwell3d.regs.surface_clip.height) - draw_texture_state.dst_y0;
+        draw_texture_state.dst_y0 =
+            static_cast<f32>(regs.surface_clip.height) - draw_texture_state.dst_y0;
    }
    draw_texture_state.dst_x1 = draw_texture_state.dst_x0 + dst_width;
    draw_texture_state.dst_y1 = draw_texture_state.dst_y0 + dst_height;
-    draw_texture_state.src_x0 = f32(maxwell3d.regs.draw_texture.src_x0) / 4096.f;
-    draw_texture_state.src_y0 = f32(maxwell3d.regs.draw_texture.src_y0) / 4096.f;
-    draw_texture_state.src_x1 = (f32(maxwell3d.regs.draw_texture.dx_du) / 4294967296.f) * dst_width + draw_texture_state.src_x0;
-    draw_texture_state.src_y1 = (f32(maxwell3d.regs.draw_texture.dy_dv) / 4294967296.f) * dst_height + draw_texture_state.src_y0;
-    draw_texture_state.src_sampler = maxwell3d.regs.draw_texture.src_sampler;
-    draw_texture_state.src_texture = maxwell3d.regs.draw_texture.src_texture;
-    maxwell3d.rasterizer->DrawTexture();
+    draw_texture_state.src_x0 = static_cast<float>(regs.draw_texture.src_x0) / 4096.f;
+    draw_texture_state.src_y0 = static_cast<float>(regs.draw_texture.src_y0) / 4096.f;
+    draw_texture_state.src_x1 =
+        (static_cast<float>(regs.draw_texture.dx_du) / 4294967296.f) * dst_width +
+        draw_texture_state.src_x0;
+    draw_texture_state.src_y1 =
+        (static_cast<float>(regs.draw_texture.dy_dv) / 4294967296.f) * dst_height +
+        draw_texture_state.src_y0;
+    draw_texture_state.src_sampler = regs.draw_texture.src_sampler;
+    draw_texture_state.src_texture = regs.draw_texture.src_texture;
+    maxwell3d->rasterizer->DrawTexture();
 }

-void Maxwell3D::DrawManager::UpdateTopology(Maxwell3D& maxwell3d) {
-    switch (maxwell3d.regs.primitive_topology_control) {
-    case Maxwell3D::Regs::PrimitiveTopologyControl::UseInBeginMethods:
+void DrawManager::UpdateTopology() {
+    const auto& regs{maxwell3d->regs};
+    switch (regs.primitive_topology_control) {
+    case PrimitiveTopologyControl::UseInBeginMethods:
        break;
-    case Maxwell3D::Regs::PrimitiveTopologyControl::UseSeparateState:
-        switch (maxwell3d.regs.topology_override) {
-        case Maxwell3D::Regs::PrimitiveTopologyOverride::None:
+    case PrimitiveTopologyControl::UseSeparateState:
+        switch (regs.topology_override) {
+        case PrimitiveTopologyOverride::None:
            break;
-        case Maxwell3D::Regs::PrimitiveTopologyOverride::Points:
-            draw_state.topology = Maxwell3D::Regs::PrimitiveTopology::Points;
+        case PrimitiveTopologyOverride::Points:
+            draw_state.topology = PrimitiveTopology::Points;
            break;
-        case Maxwell3D::Regs::PrimitiveTopologyOverride::Lines:
-            draw_state.topology = Maxwell3D::Regs::PrimitiveTopology::Lines;
+        case PrimitiveTopologyOverride::Lines:
+            draw_state.topology = PrimitiveTopology::Lines;
            break;
-        case Maxwell3D::Regs::PrimitiveTopologyOverride::LineStrip:
-            draw_state.topology = Maxwell3D::Regs::PrimitiveTopology::LineStrip;
+        case PrimitiveTopologyOverride::LineStrip:
+            draw_state.topology = PrimitiveTopology::LineStrip;
            break;
        default:
-            draw_state.topology = Maxwell3D::Regs::PrimitiveTopology(maxwell3d.regs.topology_override);
+            draw_state.topology = static_cast<PrimitiveTopology>(regs.topology_override);
            break;
        }
        break;
    }
 }

-void Maxwell3D::DrawManager::ProcessDraw(Maxwell3D& maxwell3d, bool draw_indexed, u32 instance_count) {
-    LOG_TRACE(HW_GPU, "called, topology={}, count={}", draw_state.topology, draw_indexed ? draw_state.index_buffer.count : draw_state.vertex_buffer.count);
-    UpdateTopology(maxwell3d);
-    if (maxwell3d.ShouldExecute()) {
-        maxwell3d.rasterizer->Draw(draw_indexed, instance_count);
+void DrawManager::ProcessDraw(bool draw_indexed, u32 instance_count) {
+    LOG_TRACE(HW_GPU, "called, topology={}, count={}", draw_state.topology,
+              draw_indexed ? draw_state.index_buffer.count : draw_state.vertex_buffer.count);
+
+    UpdateTopology();
+
+    if (maxwell3d->ShouldExecute()) {
+        maxwell3d->rasterizer->Draw(draw_indexed, instance_count);
    }
 }

-void Maxwell3D::DrawManager::ProcessDrawIndirect(Maxwell3D& maxwell3d) {
-    LOG_TRACE(HW_GPU, "called, topology={}, is_indexed={}, includes_count={}, buffer_size={}, max_draw_count={}", draw_state.topology, indirect_state.is_indexed, indirect_state.include_count, indirect_state.buffer_size, indirect_state.max_draw_counts);
-    UpdateTopology(maxwell3d);
-    if (maxwell3d.ShouldExecute()) {
-        maxwell3d.rasterizer->DrawIndirect();
+void DrawManager::ProcessDrawIndirect() {
+    LOG_TRACE(
+        HW_GPU,
+        "called, topology={}, is_indexed={}, includes_count={}, buffer_size={}, max_draw_count={}",
+        draw_state.topology, indirect_state.is_indexed, indirect_state.include_count,
+        indirect_state.buffer_size, indirect_state.max_draw_counts);
+
+    UpdateTopology();
+
+    if (maxwell3d->ShouldExecute()) {
+        maxwell3d->rasterizer->DrawIndirect();
    }
 }
 } // namespace Tegra::Engines
@@ -0,0 +1,117 @@
+// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+#include "common/common_types.h"
+#include "video_core/engines/maxwell_3d.h"
+
+namespace VideoCore {
+class RasterizerInterface;
+}
+
+namespace Tegra::Engines {
+using PrimitiveTopologyControl = Maxwell3D::Regs::PrimitiveTopologyControl;
+using PrimitiveTopology = Maxwell3D::Regs::PrimitiveTopology;
+using PrimitiveTopologyOverride = Maxwell3D::Regs::PrimitiveTopologyOverride;
+using IndexBuffer = Maxwell3D::Regs::IndexBuffer;
+using VertexBuffer = Maxwell3D::Regs::VertexBuffer;
+using IndexBufferSmall = Maxwell3D::Regs::IndexBufferSmall;
+
+class DrawManager {
+public:
+    enum class DrawMode : u32 { General = 0, Instance, InlineIndex };
+    struct State {
+        PrimitiveTopology topology{};
+        DrawMode draw_mode{};
+        bool draw_indexed{};
+        u32 base_index{};
+        VertexBuffer vertex_buffer;
+        IndexBuffer index_buffer;
+        u32 base_instance{};
+        u32 instance_count{};
+        std::vector<u8> inline_index_draw_indexes;
+    };
+
+    struct DrawTextureState {
+        f32 dst_x0;
+        f32 dst_y0;
+        f32 dst_x1;
+        f32 dst_y1;
+        f32 src_x0;
+        f32 src_y0;
+        f32 src_x1;
+        f32 src_y1;
+        u32 src_sampler;
+        u32 src_texture;
+    };
+
+    struct IndirectParams {
+        bool is_byte_count;
+        bool is_indexed;
+        bool include_count;
+        GPUVAddr count_start_address;
+        GPUVAddr indirect_start_address;
+        size_t buffer_size;
+        size_t max_draw_counts;
+        size_t stride;
+    };
+
+    explicit DrawManager(Maxwell3D* maxwell_3d);
+
+    void ProcessMethodCall(u32 method, u32 argument);
+
+    void Clear(u32 layer_count);
+
+    void DrawDeferred();
+
+    void DrawArray(PrimitiveTopology topology, u32 vertex_first, u32 vertex_count,
+                   u32 base_instance, u32 num_instances);
+    void DrawArrayInstanced(PrimitiveTopology topology, u32 vertex_first, u32 vertex_count,
+                            bool subsequent);
+
+    void DrawIndex(PrimitiveTopology topology, u32 index_first, u32 index_count, u32 base_index,
+                   u32 base_instance, u32 num_instances);
+
+    void DrawArrayIndirect(PrimitiveTopology topology);
+
+    void DrawIndexedIndirect(PrimitiveTopology topology, u32 index_first, u32 index_count);
+
+    const State& GetDrawState() const {
+        return draw_state;
+    }
+
+    const DrawTextureState& GetDrawTextureState() const {
+        return draw_texture_state;
+    }
+
+    IndirectParams& GetIndirectParams() {
+        return indirect_state;
+    }
+
+    const IndirectParams& GetIndirectParams() const {
+        return indirect_state;
+    }
+
+private:
+    void SetInlineIndexBuffer(u32 index);
+
+    void DrawBegin();
+
+    void DrawEnd(u32 instance_count = 1, bool force_draw = false);
+
+    void DrawIndexSmall(u32 argument);
+
+    void DrawTexture();
+
+    void UpdateTopology();
+
+    void ProcessDraw(bool draw_indexed, u32 instance_count);
+
+    void ProcessDrawIndirect();
+
+    Maxwell3D* maxwell3d{};
+    State draw_state{};
+    DrawTextureState draw_texture_state{};
+    IndirectParams indirect_state{};
+};
+} // namespace Tegra::Engines
@@ -13,7 +13,7 @@
 #include "core/core.h"
 #include "core/core_timing.h"
 #include "video_core/dirty_flags.h"
-#include "video_core/engines/maxwell_3d.h"
+#include "video_core/engines/draw_manager.h"
 #include "video_core/engines/maxwell_3d.h"
 #include "video_core/gpu.h"
 #include "video_core/memory_manager.h"
@@ -26,8 +26,7 @@ namespace Tegra::Engines {
 constexpr u32 MacroRegistersStart = 0xE00;

 Maxwell3D::Maxwell3D(Core::System& system_, MemoryManager& memory_manager_)
-    : draw_manager()
-    , system{system_}
+    : draw_manager{std::make_unique<DrawManager>(this)}, system{system_}
    , memory_manager{memory_manager_}
 #ifdef ARCHITECTURE_x86_64
    , macro_engine(bool(Settings::values.disable_macro_jit))
@@ -374,7 +373,8 @@ void Maxwell3D::ProcessMethodCall(u32 method, u32 argument, u32 nonshadow_argume
    case MAXWELL3D_REG_INDEX(sync_info):
        return ProcessSyncPoint();
    case MAXWELL3D_REG_INDEX(launch_dma):
-        return upload_state.ProcessExec(regs.launch_dma.memory_layout.Value() == Regs::LaunchDMA::Layout::Pitch);
+        return upload_state.ProcessExec(regs.launch_dma.memory_layout.Value() ==
+                                        Regs::LaunchDMA::Layout::Pitch);
    case MAXWELL3D_REG_INDEX(inline_data):
        upload_state.ProcessData(argument, is_last_call);
        return;
@@ -386,7 +386,7 @@ void Maxwell3D::ProcessMethodCall(u32 method, u32 argument, u32 nonshadow_argume
    case MAXWELL3D_REG_INDEX(tiled_cache_barrier):
        return rasterizer->TiledCacheBarrier();
    default:
-        draw_manager.ProcessMethodCall(*this, method, argument);
+        draw_manager->ProcessMethodCall(method, argument);
        break;
    }
 }
@@ -401,7 +401,8 @@ void Maxwell3D::CallMacroMethod(u32 method, const std::vector<u32>& parameters)

    // Execute the current macro.
    macro_engine.Execute(*this, macro_positions[entry], parameters);
-    draw_manager.DrawDeferred(*this);
+
+    draw_manager->DrawDeferred();
 }

 void Maxwell3D::CallMethod(u32 method, u32 method_argument, bool is_last_call) {
@@ -25,7 +25,6 @@
 #include "video_core/gpu.h"
 #include "video_core/macro.h"
 #include "video_core/textures/texture.h"
-#include "video_core/engines/maxwell_3d.h"

 namespace Core {
 class System;
@@ -41,6 +40,8 @@ class RasterizerInterface;

 namespace Tegra::Engines {

+class DrawManager;
+
 /**
 * This Engine is known as GF100_3D. Documentation can be found in:
 * https://github.com/NVIDIA/open-gpu-doc/blob/master/classes/3d/clb197.h
@@ -542,7 +543,7 @@ public:
            }
            GPUVAddr StorageLimitAddress() const {
                return (GPUVAddr{storage_limit_address_high} << 32) |
-                        GPUVAddr{storage_limit_address_low};
+                       GPUVAddr{storage_limit_address_low};
            }
        };

@@ -818,7 +819,7 @@ public:

            u32 Map(std::size_t index) const {
                const std::array<u32, NumRenderTargets> maps{target0, target1, target2, target3,
-                                                                target4, target5, target6, target7};
+                                                             target4, target5, target6, target7};
                ASSERT(index < maps.size());
                return maps[index];
            }
@@ -1830,7 +1831,7 @@ public:

            bool AnyEnabled() const {
                return output0_enable || output1_enable || output2_enable || output3_enable ||
-                        output4_enable || output5_enable || output6_enable || output7_enable;
+                       output4_enable || output5_enable || output6_enable || output7_enable;
            }
        };

@@ -1869,7 +1870,7 @@ public:

                bool AnyEnabled() const {
                    return plane0 || plane1 || plane2 || plane3 || plane4 || plane5 || plane6 ||
-                            plane7;
+                           plane7;
                }
            };

@@ -3022,7 +3023,8 @@ public:
                u32 bindless_texture_const_buffer_slot;                                ///< 0x2608
                u32 trap_handler;                                                      ///< 0x260C
                INSERT_PADDING_BYTES_NOINIT(0x1F0);
-                std::array<std::array<StreamOutLayout, 32>, NumTransformFeedbackBuffers> stream_out_layout;                                                 ///< 0x2800
+                std::array<std::array<StreamOutLayout, 32>, NumTransformFeedbackBuffers>
+                    stream_out_layout;                                                 ///< 0x2800
                INSERT_PADDING_BYTES_NOINIT(0x93C);
                ShaderPerformance shader_performance;                                  ///< 0x333C
                INSERT_PADDING_BYTES_NOINIT(0x18);
@@ -3033,62 +3035,6 @@ public:
    };
    // clang-format on

-    struct DrawManager {
-        enum class DrawMode : u32 { General = 0, Instance, InlineIndex };
-        struct State {
-            Maxwell3D::Regs::PrimitiveTopology topology{};
-            DrawMode draw_mode{};
-            bool draw_indexed{};
-            u32 base_index{};
-            Maxwell3D::Regs::VertexBuffer vertex_buffer;
-            Maxwell3D::Regs::IndexBuffer index_buffer;
-            u32 base_instance{};
-            u32 instance_count{};
-            std::vector<u8> inline_index_draw_indexes;
-        };
-        struct DrawTextureState {
-            f32 dst_x0;
-            f32 dst_y0;
-            f32 dst_x1;
-            f32 dst_y1;
-            f32 src_x0;
-            f32 src_y0;
-            f32 src_x1;
-            f32 src_y1;
-            u32 src_sampler;
-            u32 src_texture;
-        };
-        struct IndirectParams {
-            bool is_byte_count;
-            bool is_indexed;
-            bool include_count;
-            GPUVAddr count_start_address;
-            GPUVAddr indirect_start_address;
-            size_t buffer_size;
-            size_t max_draw_counts;
-            size_t stride;
-        };
-        void ProcessMethodCall(Maxwell3D& maxwell3d, u32 method, u32 argument);
-        void Clear(Maxwell3D& maxwell3d, u32 layer_count);
-        void DrawDeferred(Maxwell3D& maxwell3d);
-        void DrawArray(Maxwell3D& maxwell3d, Maxwell3D::Regs::PrimitiveTopology topology, u32 vertex_first, u32 vertex_count, u32 base_instance, u32 num_instances);
-        void DrawArrayInstanced(Maxwell3D& maxwell3d, Maxwell3D::Regs::PrimitiveTopology topology, u32 vertex_first, u32 vertex_count, bool subsequent);
-        void DrawIndex(Maxwell3D& maxwell3d, Maxwell3D::Regs::PrimitiveTopology topology, u32 index_first, u32 index_count, u32 base_index, u32 base_instance, u32 num_instances);
-        void DrawArrayIndirect(Maxwell3D& maxwell3d, Maxwell3D::Regs::PrimitiveTopology topology);
-        void DrawIndexedIndirect(Maxwell3D& maxwell3d, Maxwell3D::Regs::PrimitiveTopology topology, u32 index_first, u32 index_count);
-        void SetInlineIndexBuffer(Maxwell3D& maxwell3d, u32 index);
-        void DrawBegin(Maxwell3D& maxwell3d);
-        void DrawEnd(Maxwell3D& maxwell3d, u32 instance_count = 1, bool force_draw = false);
-        void DrawIndexSmall(Maxwell3D& maxwell3d, u32 argument);
-        void DrawTexture(Maxwell3D& maxwell3d);
-        void UpdateTopology(Maxwell3D& maxwell3d);
-        void ProcessDraw(Maxwell3D& maxwell3d, bool draw_indexed, u32 instance_count);
-        void ProcessDrawIndirect(Maxwell3D& maxwell3d);
-        State draw_state{};
-        DrawTextureState draw_texture_state{};
-        IndirectParams indirect_state{};
-    };
-
    Regs regs{};

    /// Store temporary hw register values, used by some calls to restore state after a operation
@@ -3156,7 +3102,8 @@ public:
        Tables tables{};
    } dirty;

-    DrawManager draw_manager;
+    std::unique_ptr<DrawManager> draw_manager;
+    friend class DrawManager;

    GPUVAddr GetMacroAddress(size_t index) const {
        return macro_addresses[index];
@@ -89,7 +89,7 @@ struct GPU::Impl {
        renderer = std::move(renderer_);
        rasterizer = renderer->ReadRasterizer();
        host1x.MemoryManager().BindInterface(rasterizer);
-        host1x.gmmu_manager.BindRasterizer(rasterizer);
+        host1x.GMMU().BindRasterizer(rasterizer);
    }

    /// Flush all current written commands into the host GPU for execution.
@@ -19,45 +19,56 @@

 namespace VideoCommon::GPUThread {

+/// Runs the GPU thread
+static void RunThread(std::stop_token stop_token, Core::System& system,
+                      VideoCore::RendererBase& renderer, Core::Frontend::GraphicsContext& context,
+                      Tegra::Control::Scheduler& scheduler, SynchState& state) {
+    Common::SetCurrentThreadName("GPU");
+    Common::SetCurrentThreadPriority(Common::ThreadPriority::Critical);
+    system.RegisterHostThread();
+
+    auto current_context = context.Acquire();
+    VideoCore::RasterizerInterface* const rasterizer = renderer.ReadRasterizer();
+
+    CommandDataContainer next;
+
+    while (!stop_token.stop_requested()) {
+        state.queue.PopWait(next, stop_token);
+        if (stop_token.stop_requested()) {
+            break;
+        }
+        if (auto* submit_list = std::get_if<SubmitListCommand>(&next.data)) {
+            scheduler.Push(submit_list->channel, std::move(submit_list->entries));
+        } else if (std::holds_alternative<GPUTickCommand>(next.data)) {
+            system.GPU().TickWork();
+        } else if (const auto* flush = std::get_if<FlushRegionCommand>(&next.data)) {
+            rasterizer->FlushRegion(flush->addr, flush->size);
+        } else if (const auto* invalidate = std::get_if<InvalidateRegionCommand>(&next.data)) {
+            rasterizer->OnCacheInvalidation(invalidate->addr, invalidate->size);
+        } else {
+            ASSERT(false);
+        }
+        state.signaled_fence.store(next.fence);
+        if (next.block) {
+            // We have to lock the write_lock to ensure that the condition_variable wait not get a
+            // race between the check and the lock itself.
+            std::scoped_lock lk{state.write_lock};
+            state.cv.notify_all();
+        }
+    }
+}
+
 ThreadManager::ThreadManager(Core::System& system_, bool is_async_)
    : system{system_}, is_async{is_async_} {}

 ThreadManager::~ThreadManager() = default;

-void ThreadManager::StartThread(VideoCore::RendererBase& renderer, Core::Frontend::GraphicsContext& context, Tegra::Control::Scheduler& scheduler) {
+void ThreadManager::StartThread(VideoCore::RendererBase& renderer,
+                                Core::Frontend::GraphicsContext& context,
+                                Tegra::Control::Scheduler& scheduler) {
    rasterizer = renderer.ReadRasterizer();
-    thread = std::jthread([&](std::stop_token stop_token) {
-        Common::SetCurrentThreadName("GPU");
-        Common::SetCurrentThreadPriority(Common::ThreadPriority::Critical);
-        system.RegisterHostThread();
-
-        auto current_context = context.Acquire();
-        CommandDataContainer next;
-        while (!stop_token.stop_requested()) {
-            state.queue.PopWait(next, stop_token);
-            if (stop_token.stop_requested()) {
-                break;
-            }
-            if (auto* submit_list = std::get_if<SubmitListCommand>(&next.data)) {
-                scheduler.Push(submit_list->channel, std::move(submit_list->entries));
-            } else if (std::holds_alternative<GPUTickCommand>(next.data)) {
-                system.GPU().TickWork();
-            } else if (const auto* flush = std::get_if<FlushRegionCommand>(&next.data)) {
-                renderer.ReadRasterizer()->FlushRegion(flush->addr, flush->size);
-            } else if (const auto* invalidate = std::get_if<InvalidateRegionCommand>(&next.data)) {
-                renderer.ReadRasterizer()->OnCacheInvalidation(invalidate->addr, invalidate->size);
-            } else {
-                ASSERT(false);
-            }
-            state.signaled_fence.store(next.fence);
-            if (next.block) {
-                // We have to lock the write_lock to ensure that the condition_variable wait not get a
-                // race between the check and the lock itself.
-                std::scoped_lock lk{state.write_lock};
-                state.cv.notify_all();
-            }
-        }
-    });
+    thread = std::jthread(RunThread, std::ref(system), std::ref(renderer), std::ref(context),
+                          std::ref(scheduler), std::ref(state));
 }

 void ThreadManager::SubmitList(s32 channel, Tegra::CommandList&& entries) {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
lizzie	3e54fb4c33	fix le crash	2026-04-28 00:52:15 +00:00
lizzie	f8689fb451	fx	2026-04-28 00:52:15 +00:00
lizzie	00d745e4e5	coalesce	2026-04-28 00:52:15 +00:00
lizzie	f0685cc0c9	[video_core] raise bindless texture array length to 1024 notably fixes TL:LTD grass Authored-by: Mythrax <mythrax@mytrax-rs.org> Signed-off-by: lizzie <lizzie@eden-emu.dev>	2026-04-28 00:52:15 +00:00