[vulkan, qcom] Fix shader float controls on QCOM driver

[common, settings] Fixes misaligned Aniso levels (#4295 )
PR/Commit Owner: CamilleLaVey Just quick fixes to ANISO bugged level selector, removes x32 and x64 from choices, also fixes the none value to actully use default. Co-authored-by: CamilleLaVey <camillelavey99@gmail.com> Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4295 Reviewed-by: Maufeat <sahyno1996@gmail.com> Reviewed-by: CamilleLaVey <camillelavey99@gmail.com>
2026-08-24 08:21:19 +00:00 · 2026-08-23 23:55:22 -04:00 · 2026-08-24 00:06:11 +02:00 · 2026-08-24 00:01:21 +02:00 · 2026-08-23 23:58:50 +02:00 · 2026-08-23 23:36:24 +02:00
137 changed files with 2035 additions and 1902 deletions
@@ -624,6 +624,7 @@ abstract class SettingsItem(
                    IntSetting.FSR_SHARPENING_SLIDER,
                    titleId = R.string.fsr_sharpness,
                    descriptionId = R.string.fsr_sharpness_description,
+                    max = 200,
                    units = "%"
                )
            )
@@ -1182,7 +1182,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {
                    container,
                    IntSetting.FSR_SHARPENING_SLIDER,
                    minValue = 0,
-                    maxValue = 100,
+                    maxValue = 200,
                    units = "%"
                )
            }
@@ -328,9 +328,6 @@ Core::SystemResultStatus EmulationSession::InitializeEmulation(const std::string
    m_system.GetCpuManager().OnGpuReady();
    m_system.RegisterExitCallback([&] { HaltEmulation(); });

-    m_system.RegisterApplicationChangedCallback(
-        [&](u64 changed_program_id) { RequestDiskShaderCacheReload(changed_program_id); });
-
    // Register an ExecuteProgram callback such that Core can execute a sub-program
    m_system.RegisterExecuteProgramCallback([&](std::size_t program_index_) {
        m_next_program_index = program_index_;
@@ -410,58 +407,20 @@ void EmulationSession::RunEmulation() {
    }

    while (true) {
-        std::optional<u64> reload_title;
        {
            [[maybe_unused]] std::unique_lock lock(m_mutex);
-            if (m_cv.wait_for(lock, std::chrono::milliseconds(800), [&]() {
-                    return !m_is_running || m_pending_shader_cache_title.has_value();
-                })) {
-                if (!m_is_running) {
-                    break;
-                }
-                reload_title = std::exchange(m_pending_shader_cache_title, std::nullopt);
+            if (m_cv.wait_for(lock, std::chrono::milliseconds(800),
+                              [&]() { return !m_is_running; })) {
+                // Emulation halted.
+                break;
            }
        }
-
-        if (reload_title.has_value())
-            ReloadDiskShaderCache(*reload_title);
    }

    // Reset current applet ID.
    m_applet_id = static_cast<int>(Service::AM::AppletId::Application);
 }

-void EmulationSession::RequestDiskShaderCacheReload(u64 program_id) {
-    {
-        std::scoped_lock lock(m_mutex);
-        m_pending_shader_cache_title = program_id;
-    }
-    m_cv.notify_one();
-}
-
-void EmulationSession::ReloadDiskShaderCache(u64 program_id) {
-    if (!Settings::values.use_disk_shader_cache.GetValue())
-        return;
-
-    LOG_INFO(Frontend, "Reloading disk shader cache for {:016X}", program_id);
-
-    const bool was_paused = m_is_paused;
-
-    m_system.Pause();
-    m_system.GPU().WaitForIdle();
-    m_system.GPU().ObtainContext();
-
-    LoadDiskCacheProgress(VideoCore::LoadCallbackStage::Prepare, 0, 0);
-    m_system.Renderer().ReadRasterizer()->LoadDiskResources(program_id, std::stop_token{},
-                                                            LoadDiskCacheProgress);
-    LoadDiskCacheProgress(VideoCore::LoadCallbackStage::Complete, 0, 0);
-
-    m_system.GPU().ReleaseContext();
-
-    if (!was_paused)
-        m_system.Run();
-}
-
 Common::Android::SoftwareKeyboard::AndroidKeyboard* EmulationSession::SoftwareKeyboard() {
    return m_software_keyboard;
 }
@@ -4,8 +4,6 @@
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

-#include <optional>
-
 #include <android/native_window_jni.h>
 #include "common/android/applets/software_keyboard.h"
 #include "core/core.h"
@@ -46,7 +44,6 @@ public:
    void HaltEmulation();
    void RunEmulation();
    void ShutdownEmulation();
-    void RequestDiskShaderCacheReload(u64 program_id);

    const Core::PerfStatsResults& PerfStats();
    int ShadersBuilding();
@@ -68,7 +65,6 @@ private:
    static void LoadDiskCacheProgress(VideoCore::LoadCallbackStage stage, int progress, int max);
    static void OnEmulationStopped(Core::SystemResultStatus result);
    static void ChangeProgram(std::size_t program_index);
-    void ReloadDiskShaderCache(u64 program_id);

 private:
    // Window management
@@ -87,7 +83,6 @@ private:
    Common::Android::SoftwareKeyboard::AndroidKeyboard* m_software_keyboard{};
    std::unique_ptr<FileSys::ManualContentProvider> m_manual_provider;
    int m_applet_id{1};
-    std::optional<u64> m_pending_shader_cache_title;

    // GPU driver parameters
    std::shared_ptr<Common::DynamicLibrary> m_vulkan_library;
@@ -1107,7 +1107,6 @@
    <string name="theme_mode_light">فاتح</string>
    <string name="theme_mode_dark">داكن</string>

-    <string name="multiplier_none">لا شيء</string>

    <!-- Black backgrounds theme -->
    <string name="use_black_backgrounds">خلفيات سوداء</string>
@@ -991,7 +991,6 @@ Wirklich fortfahren?</string>
    <string name="theme_mode_light">Hell</string>
    <string name="theme_mode_dark">Dunkel</string>

-    <string name="multiplier_none">Keine</string>

    <!-- Black backgrounds theme -->
    <string name="use_black_backgrounds">Schwarze Hintergründe</string>
@@ -1092,7 +1092,6 @@
    <string name="theme_mode_light">Claro</string>
    <string name="theme_mode_dark">Oscuro</string>

-    <string name="multiplier_none">Nada</string>

    <!-- Black backgrounds theme -->
    <string name="use_black_backgrounds">Fondos oscuros</string>
@@ -808,9 +808,6 @@
    <string name="multiplier_x4">x4</string>
    <string name="multiplier_x8">x8</string>
    <string name="multiplier_x16">x16</string>
-    <string name="multiplier_x32">x32</string>
-    <string name="multiplier_x64">x64</string>
-    <string name="multiplier_none">None</string>

    <!-- Black backgrounds theme -->
    <string name="use_black_backgrounds">پس‌زمینه مشکی</string>
@@ -1004,7 +1004,6 @@
    <string name="theme_mode_light">Lumineux</string>
    <string name="theme_mode_dark">Sombre</string>

-    <string name="multiplier_none">Aucun</string>

    <!-- Black backgrounds theme -->
    <string name="use_black_backgrounds">Arrière-plan noir</string>
@@ -935,7 +935,6 @@
    <string name="theme_mode_light">Jasny</string>
    <string name="theme_mode_dark">Ciemny</string>

-    <string name="multiplier_none">Brak</string>

    <!-- Black backgrounds theme -->
    <string name="use_black_backgrounds">Czarne tła</string>
@@ -891,7 +891,6 @@
    <string name="theme_mode_light">Claro</string>
    <string name="theme_mode_dark">Escuro</string>

-    <string name="multiplier_none">Nenhum</string>

    <!-- Black backgrounds theme -->
    <string name="use_black_backgrounds">Planos de fundo pretos</string>
@@ -1071,7 +1071,6 @@
    <string name="theme_mode_light">Светлая</string>
    <string name="theme_mode_dark">Темная</string>

-    <string name="multiplier_none">Отключено</string>

    <!-- Black backgrounds theme -->
    <string name="use_black_backgrounds">Чёрный фон</string>
@@ -1053,7 +1053,6 @@
    <string name="theme_mode_light">Світла</string>
    <string name="theme_mode_dark">Темна</string>

-    <string name="multiplier_none">Жодного</string>

    <!-- Black backgrounds theme -->
    <string name="use_black_backgrounds">Чорний фон</string>
@@ -1081,7 +1081,6 @@
    <string name="theme_mode_light">浅色</string>
    <string name="theme_mode_dark">深色</string>

-    <string name="multiplier_none">无</string>

    <!-- Black backgrounds theme -->
    <string name="use_black_backgrounds">使用黑色背景</string>
@@ -1006,7 +1006,6 @@
    <string name="theme_mode_light">淺色</string>
    <string name="theme_mode_dark">深色</string>

-    <string name="multiplier_none">無</string>

    <!-- Black backgrounds theme -->
    <string name="use_black_backgrounds">黑色背景</string>
@@ -111,43 +111,38 @@
        <item>1</item>
    </integer-array>

-    <!-- VRAM USAGE MODE CHOICES -->
    <string-array name="vramUsageMethodNames">
        <item>@string/vram_usage_conservative</item>
        <item>@string/vram_usage_aggressive</item>
    </string-array>

-    <!-- VRAM USAGE MODE VALUES -->
    <integer-array name="vramUsageMethodValues">
-        <item>0</item> <!-- Conservative -->
-        <item>1</item> <!-- Aggressive -->
+        <item>0</item>
+        <item>1</item>
    </integer-array>

-    <!-- ASTC Decoding Method Choices -->
    <string-array name="astcDecodingMethodNames">
        <item>@string/accelerate_astc_cpu</item>
        <item>@string/accelerate_astc_gpu</item>
        <item>@string/accelerate_astc_async</item>
    </string-array>

-    <!-- ASTC Decoding Method Values -->
    <integer-array name="astcDecodingMethodValues">
-        <item>0</item> <!-- CPU -->
-        <item>1</item> <!-- GPU -->
-        <item>2</item> <!-- CPU Asynchronously -->
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
    </integer-array>
-    <!-- NVDEC Emulation Choices -->
+
    <string-array name="rendererNvdecNames">
-        <item>@string/nvdec_emulation_none</item> <!-- Off -->
-        <item>@string/nvdec_emulation_cpu</item>  <!-- Cpu -->
-        <item>@string/nvdec_emulation_gpu</item>  <!-- Gpu -->
+        <item>@string/nvdec_emulation_none</item>
+        <item>@string/nvdec_emulation_cpu</item>
+        <item>@string/nvdec_emulation_gpu</item>
    </string-array>

-    <!-- NVDEC Emulation Values -->
    <integer-array name="rendererNvdecValues">
-        <item>3</item> <!-- Off value -->
-        <item>1</item> <!-- CPU value -->
-        <item>2</item> <!-- GPU value -->
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
    </integer-array>

    <string-array name="rendererResolutionNames">
@@ -513,9 +508,6 @@
        <item>@string/multiplier_x4</item>
        <item>@string/multiplier_x8</item>
        <item>@string/multiplier_x16</item>
-        <item>@string/multiplier_x32</item>
-        <item>@string/multiplier_x64</item>
-        <item>@string/multiplier_none</item>
    </string-array>
    <integer-array name="anisoValues">
        <item>0</item>
@@ -524,9 +516,6 @@
        <item>3</item>
        <item>4</item>
        <item>5</item>
-        <item>6</item>
-        <item>7</item>
-        <item>8</item>
    </integer-array>

    <string-array name="verticalAlignmentEntries">
@@ -1246,9 +1246,6 @@
    <string name="multiplier_x4" translatable="false">x4</string>
    <string name="multiplier_x8" translatable="false">x8</string>
    <string name="multiplier_x16" translatable="false">x16</string>
-    <string name="multiplier_x32" translatable="false">x32</string>
-    <string name="multiplier_x64" translatable="false">x64</string>
-    <string name="multiplier_none">None</string>

    <!-- Black backgrounds theme -->
    <string name="use_black_backgrounds">Black backgrounds</string>
@@ -39,6 +39,19 @@

 namespace Common::Log {

+/// @brief A log entry. Log entries are store in a structured format to permit more varied output
+/// formatting on different frontends, as well as facilitating filtering and aggregation.
+struct Entry {
+    char const* message = nullptr;
+    size_t message_len = 0;
+    std::chrono::microseconds timestamp;
+    Class log_class{};
+    Level log_level{};
+    const char* filename = nullptr;
+    const char* function = nullptr;
+    uint32_t line_num = 0;
+};
+
 namespace {

 /// @brief Returns the name of the passed log class as a C-string. Subclasses are separated by periods
@@ -70,8 +83,6 @@ const char* GetLevelName(Level log_level) {
    }
 }

-}
-
 // Some IDEs prefer <file>:<line> instead, so let's just do that :)
 std::string FormatLogMessage(const Entry& entry) noexcept {
    if (!entry.filename) return "";
@@ -79,10 +90,9 @@ std::string FormatLogMessage(const Entry& entry) noexcept {
    auto const time_fractional = uint32_t(entry.timestamp.count() % 1000000);
    auto const class_name = GetLogClassName(entry.log_class);
    auto const level_name = GetLevelName(entry.log_level);
-    return fmt::format("[{:4d}.{:06d}] {} <{}> {}:{}:{}: {}", time_seconds, time_fractional, class_name, level_name, entry.filename, entry.line_num, entry.function, entry.message);
+    return fmt::format("[{:4d}.{:06d}] {} <{}> {}:{}:{}: {}\n", time_seconds, time_fractional, class_name, level_name, entry.filename, entry.line_num, entry.function, entry.message);
 }

-namespace {
 template <typename It>
 Level GetLevelByName(const It begin, const It end) {
    for (u32 i = 0; i < u32(Level::Count); ++i) {
@@ -127,25 +137,6 @@ bool ParseFilterRule(Filter& instance, Iterator begin, Iterator end) {
    instance.SetClassLevel(log_class, level);
    return true;
 }
-} // Anonymous namespace
-
-void Filter::ParseFilterString(std::string_view filter_view) {
-    auto clause_begin = filter_view.cbegin();
-    while (clause_begin != filter_view.cend()) {
-        auto clause_end = std::find(clause_begin, filter_view.cend(), ' ');
-        // If clause isn't empty
-        if (clause_end != clause_begin) {
-            ParseFilterRule(*this, clause_begin, clause_end);
-        }
-        if (clause_end != filter_view.cend()) {
-            // Skip over the whitespace
-            ++clause_end;
-        }
-        clause_begin = clause_end;
-    }
-}
-
-namespace {

 /// @brief Trims up to and including the last of ../, ..\, src/, src\ in a string
 /// do not be fooled this isn't generating new strings on .rodata :)
@@ -208,7 +199,7 @@ struct ColorConsoleBackend final : public Backend {
            }());
            SetConsoleTextAttribute(console_handle, color);
            auto const df = GetDirectFormatArgs(entry);
-            std::fprintf(stdout, CCB_PRINTF_FMT "\n", df.time_seconds, df.time_fractional, df.class_name, df.level_name, entry.filename, entry.line_num, entry.function, entry.message.c_str());
+            std::fprintf(stdout, CCB_PRINTF_FMT "\n", df.time_seconds, df.time_fractional, df.class_name, df.level_name, entry.filename, entry.line_num, entry.function, entry.message);
        }
    }
    void Flush() noexcept override {}
@@ -220,22 +211,24 @@ struct ColorConsoleBackend final : public Backend {
    ~ColorConsoleBackend() noexcept override {}
    void Write(const Entry& entry) noexcept override {
        if (enabled) {
-#define ESC "\x1b"
            auto const color_str = [&entry]() -> const char* {
                switch (entry.log_level) {
-#define CCB_MAKE_COLOR_FMT(X) ESC X CCB_PRINTF_FMT ESC "[0m\n"
-                case Level::Debug: return CCB_MAKE_COLOR_FMT("[0;36m"); // Cyan
-                case Level::Info: return CCB_MAKE_COLOR_FMT("[0;37m"); // Bright gray
-                case Level::Warning: return CCB_MAKE_COLOR_FMT("[1;33m"); // Bright yellow
-                case Level::Error: return CCB_MAKE_COLOR_FMT("[1;31m"); // Bright red
-                case Level::Critical: return CCB_MAKE_COLOR_FMT("[1;35m"); // Bright magenta
-                default: return CCB_MAKE_COLOR_FMT("[1;30m"); // Grey
-#undef CCB_MAKE_COLOR_FMT
+                case Level::Debug: return "[0;36m"; // Cyan
+                case Level::Info: return "[0;37m"; // Bright gray
+                case Level::Warning: return "[1;33m"; // Bright yellow
+                case Level::Error: return "[1;31m"; // Bright red
+                case Level::Critical: return "[1;35m"; // Bright magenta
+                default: return "[1;30m"; // Grey
                }
            }();
            auto const df = GetDirectFormatArgs(entry);
-            std::fprintf(stdout, color_str, df.time_seconds, df.time_fractional, df.class_name, df.level_name, entry.filename, entry.line_num, entry.function, entry.message.c_str());
-#undef ESC
+            // more restrictive, because take for example this simple prelude:
+            // [  50.872256] Config <Info> common/settings.cpp:142:LogSettings:
+            char buffer[128];
+            auto result = fmt::format_to_n(buffer, sizeof(buffer) - 1, "\x1b{}[{:4d}.{:06d}] {} <{}> {}:{}:{}: ", color_str, df.time_seconds, df.time_fractional, df.class_name, df.level_name, entry.filename, entry.line_num, entry.function, entry.message);
+            std::fwrite(buffer, 1, (std::min)(sizeof(buffer) - 1, result.size), stdout);
+            std::fwrite(entry.message, 1, entry.message_len, stdout);
+            std::fwrite("\x1b[0m\n", 1, sizeof("\x1b[0m\n"), stdout);
        }
    }
    void Flush() noexcept override {}
@@ -246,7 +239,7 @@ struct ColorConsoleBackend final : public Backend {
 #ifndef __OPENORBIS__
 /// @brief Backend that writes to a file passed into the constructor
 struct FileBackend final : public Backend {
-    explicit FileBackend(const std::filesystem::path& filename) noexcept {
+    explicit FileBackend(const std::filesystem::path filename) noexcept {
        auto old_filename = filename;
        old_filename += ".old.txt";
        // Existence checks are done within the functions themselves.
@@ -261,7 +254,7 @@ struct FileBackend final : public Backend {
        if (!enabled)
            return;

-        auto message = FormatLogMessage(entry).append(1, '\n');
+        auto message = FormatLogMessage(entry);
 #ifndef __ANDROID__
        if (Settings::values.censor_username.GetValue()) {
            // This must be a static otherwise it would get checked on EVERY
@@ -269,8 +262,7 @@ struct FileBackend final : public Backend {
            static std::string username = []() -> std::string {
                // in order of precedence
                // LOGNAME usually works on UNIX, USERNAME on Windows
-                // Some UNIX systems suck and don't use LOGNAME so we also
-                // need USER :(
+                // Some UNIX systems suck and don't use LOGNAME so we also need USER :(
                for (auto const var : { "LOGNAME", "USERNAME", "USER", })
                    if (auto const s = ::getenv(var); s != nullptr)
                        return std::string{s};
@@ -280,7 +272,7 @@ struct FileBackend final : public Backend {
                boost::replace_all(message, username, "user");
        }
 #endif
-        bytes_written += file->WriteString(message);
+        bytes_written += file->WriteSpan(std::span<const char>{message.begin(), message.end()});

        // Option to log each line rather than 4k buffers
        if (Settings::values.log_flush_line.GetValue())
@@ -308,14 +300,13 @@ private:
    bool enabled = true;
 };
 #endif
-
 #ifdef _WIN32
 /// @brief Backend that writes to Visual Studio's output window
 struct DebuggerBackend final : public Backend {
    explicit DebuggerBackend() noexcept = default;
    ~DebuggerBackend() noexcept override = default;
    void Write(const Entry& entry) noexcept override {
-        ::OutputDebugStringW(UTF8ToUTF16W(FormatLogMessage(entry).append(1, '\n')).c_str());
+        ::OutputDebugStringW(UTF8ToUTF16W(FormatLogMessage(entry)).c_str());
    }
    void Flush() noexcept override {}
 };
@@ -338,7 +329,7 @@ struct LogcatBackend : public Backend {
            }
        }();
        auto const df = GetDirectFormatArgs(entry);
-        __android_log_print(android_log_priority, "YuzuNative", CCB_PRINTF_FMT, df.time_seconds, df.time_fractional, df.class_name, df.level_name, entry.filename, entry.line_num, entry.function, entry.message.c_str());
+        __android_log_print(android_log_priority, "YuzuNative", CCB_PRINTF_FMT, df.time_seconds, df.time_fractional, df.class_name, df.level_name, entry.filename, entry.line_num, entry.function, entry.message);
    }
    void Flush() noexcept override {}
 };
@@ -377,7 +368,23 @@ struct Impl {
 #endif
    std::chrono::steady_clock::time_point time_origin{std::chrono::steady_clock::now()};
 };
-} // namespace
+} // Anonymous namespace
+
+void Filter::ParseFilterString(std::string_view filter_view) {
+    auto clause_begin = filter_view.cbegin();
+    while (clause_begin < filter_view.cend()) {
+        auto clause_end = std::find(clause_begin, filter_view.cend(), ' ');
+        // If clause isn't empty
+        if (clause_end != clause_begin) {
+            ParseFilterRule(*this, clause_begin, clause_end);
+        }
+        if (clause_end != filter_view.cend()) {
+            // Skip over the whitespace
+            ++clause_end;
+        }
+        clause_begin = clause_end;
+    }
+}

 // Constructor shall NOT depend upon Settings() or whatever
 // it's ran at global static ctor() time... so BE CAREFUL MFER!
@@ -418,10 +425,14 @@ void SetColorConsoleBackendEnabled(bool enabled) {

 void FmtLogMessageImpl(Class log_class, Level log_level, const char* filename, unsigned int line_num, const char* function, fmt::string_view format, const fmt::format_args& args) {
    if (logging_instance && logging_instance->filter.CheckMessage(log_class, log_level)) {
+        char buffer[BUFSIZ];
+        auto result = fmt::vformat_to_n(buffer, sizeof(buffer) - 1, format, args);
+        buffer[result.size] = '\0';
        auto const flush = ::Settings::values.log_flush_line.GetValue();
        logging_instance->ForEachBackend([=](Backend& backend) {
            backend.Write(Entry{
-                .message = fmt::vformat(format, args),
+                .message = buffer,
+                .message_len = (std::min)(sizeof(buffer) - 1, result.size),
                .timestamp = std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::steady_clock::now() - logging_instance->time_origin),
                .log_class = log_class,
                .log_level = log_level,
@@ -140,25 +140,4 @@ void Stop();
 void SetGlobalFilter(const Filter& filter);
 void SetColorConsoleBackendEnabled(bool enabled);

-/// @brief A log entry. Log entries are store in a structured format to permit more varied output
-/// formatting on different frontends, as well as facilitating filtering and aggregation.
-struct Entry {
-    std::string message;
-    std::chrono::microseconds timestamp;
-    Class log_class{};
-    Level log_level{};
-    const char* filename = nullptr;
-    const char* function = nullptr;
-    unsigned int line_num = 0;
-};
-
-/// Formats a log entry into the provided text buffer.
-std::string FormatLogMessage(const Entry& entry) noexcept;
-
-/// Prints the same message as `PrintMessage`, but colored according to the severity level.
-void PrintColoredMessage(const Entry& entry) noexcept;
-
-/// Formats and prints a log entry to the android logcat.
-void PrintMessageToLogcat(const Entry& entry) noexcept;
-
 } // namespace Common::Log
@@ -128,7 +128,7 @@ ENUM(TimeZone, Auto, Default, Cet, Cst6Cdt, Cuba, Eet, Egypt, Eire, Est, Est5Edt
    GmtPlusZero, GmtMinusZero, GmtZero, Greenwich, Hongkong, Hst, Iceland, Iran, Israel, Jamaica,
    Japan, Kwajalein, Libya, Met, Mst, Mst7Mdt, Navajo, Nz, NzChat, Poland, Portugal, Prc, Pst8Pdt,
    Roc, Rok, Singapore, Turkey, Uct, Universal, Utc, WSu, Wet, Zulu);
-ENUM(AnisotropyMode, Automatic, Default, X2, X4, X8, X16, X32, X64, None);
+ENUM(AnisotropyMode, Automatic, Default, X2, X4, X8, X16);
 ENUM(AstcDecodeMode, Cpu, Gpu, CpuAsynchronous);
 ENUM(AstcRecompression, Uncompressed, Bc1, Bc3);
 ENUM(FramePacingMode, Target_Auto, Target_30, Target_60, Target_90, Target_120);
@@ -286,6 +286,7 @@ void ArmDynarmic32::MakeJit(Common::PageTable* page_table) {
        config.optimizations |= Dynarmic::OptimizationFlag::Unsafe_UnfuseFMA;
        config.optimizations |= Dynarmic::OptimizationFlag::Unsafe_IgnoreStandardFPCRValue;
        config.optimizations |= Dynarmic::OptimizationFlag::Unsafe_InaccurateNaN;
+        config.optimizations |= Dynarmic::OptimizationFlag::Unsafe_IgnoreGlobalMonitor;
        break;
    // Paranoia mode for debugging optimizations
    case Settings::CpuAccuracy::Paranoid:
@@ -338,6 +338,7 @@ void ArmDynarmic64::MakeJit(Common::PageTable* page_table, std::size_t address_s
        config.unsafe_optimizations = true;
        config.optimizations |= Dynarmic::OptimizationFlag::Unsafe_UnfuseFMA;
        config.fastmem_address_space_bits = 64;
+        config.optimizations |= Dynarmic::OptimizationFlag::Unsafe_IgnoreGlobalMonitor;
        break;
    // Paranoia mode for debugging optimizations
    case Settings::CpuAccuracy::Paranoid:
@@ -3,7 +3,6 @@

 #include <array>
 #include <atomic>
-#include <filesystem>
 #include <memory>
 #include <utility>

@@ -296,8 +295,6 @@ struct System::Impl {
    SystemResultStatus Load(System& system, Frontend::EmuWindow& emu_window, const std::string& filepath, Service::AM::FrontendAppletParameters& params) {
        InitializeKernel(system);

-        system.SetCurrentApplicationFilePath(filepath);
-
        const auto file = GetGameFileFromPath(virtual_filesystem, filepath);

        // Create the application process
@@ -333,7 +330,7 @@ struct System::Impl {
        LaunchTimestampCache::SaveLaunchTimestamp(params.program_id);

        // Make the process created be the application
-        kernel.SetApplicationProcess(process->GetHandle());
+        kernel.MakeApplicationProcess(process->GetHandle());

        // Set up the rest of the system.
        SystemResultStatus init_result{SetupForApplicationProcess(system, emu_window)};
@@ -470,7 +467,6 @@ struct System::Impl {
    Core::SpeedLimiter speed_limiter;
    ExecuteProgramCallback execute_program_callback;
    ExitCallback exit_callback;
-    ApplicationChangedCallback application_changed_callback;

    std::optional<Service::Services> services;
    std::optional<Core::Debugger> debugger;
@@ -492,8 +488,6 @@ struct System::Impl {
    std::array<u64, Core::Hardware::NUM_CPU_CORES> dynarmic_ticks{};
    std::array<u8, 0x20> build_id{};

-    std::string current_application_filepath;
-
    /// Service manager
    std::shared_ptr<Service::SM::ServiceManager> service_manager;
    /// ContentProviderUnion instance
@@ -733,25 +727,7 @@ const Core::SpeedLimiter& System::SpeedLimiter() const {
 }

 u64 System::GetApplicationProcessProgramID() const {
-    const auto* const process = impl->kernel.ApplicationProcess();
-    return process != nullptr ? process->GetProgramId() : 0;
-}
-
-u64 System::GetProgramIdForProcessId(u64 process_id) const {
-    auto process = impl->kernel.GetProcessByProcessId(process_id);
-    return process.IsNull() ? 0 : process->GetProgramId();
-}
-
-u64 System::ResolveCallerProgramId(u64 process_id) const {
-    if (const auto program_id = this->GetProgramIdForProcessId(process_id); program_id != 0) {
-        return program_id;
-    }
-
-    const auto fallback = this->GetApplicationProcessProgramID();
-    LOG_WARNING(Core,
-                "Could not resolve caller process_id={}, falling back to application {:016X}",
-                process_id, fallback);
-    return fallback;
+    return impl->kernel.ApplicationProcess()->GetProgramId();
 }

 Loader::ResultStatus System::GetGameName(std::string& out) const {
@@ -934,14 +910,6 @@ void System::ExecuteProgram(std::size_t program_index) {
    }
 }

-const std::string& System::GetCurrentApplicationFilePath() const {
-    return impl->current_application_filepath;
-}
-
-void System::SetCurrentApplicationFilePath(const std::string& filepath) {
-    impl->current_application_filepath = filepath;
-}
-
 /// @brief Gets a reference to the user channel stack.
 /// It is used to transfer data between programs.
 std::vector<std::vector<u8>>& System::GetUserChannel() {
@@ -993,18 +961,6 @@ void System::Exit() {
    }
 }

-void System::RegisterApplicationChangedCallback(ApplicationChangedCallback&& callback) {
-    impl->application_changed_callback = std::move(callback);
-}
-
-void System::NotifyApplicationChanged(u64 program_id) {
-    //LOG_DEBUG(Core, "Running application changed to {:016X}", program_id);
-
-    if (impl->application_changed_callback) {
-        impl->application_changed_callback(program_id);
-    }
-}
-
 void System::ApplySettings() {
    impl->RefreshTime(*this);

@@ -322,10 +322,6 @@ public:

    [[nodiscard]] u64 GetApplicationProcessProgramID() const;

-    [[nodiscard]] u64 GetProgramIdForProcessId(u64 process_id) const;
-
-    [[nodiscard]] u64 ResolveCallerProgramId(u64 process_id) const;
-
    /// Gets the name of the current game
    [[nodiscard]] Loader::ResultStatus GetGameName(std::string& out) const;

@@ -427,9 +423,6 @@ public:
    bool TryPopGeneralChannel(std::vector<u8>& out_data);
    [[nodiscard]] Service::Event& GetGeneralChannelEvent();

-    [[nodiscard]] const std::string& GetCurrentApplicationFilePath() const;
-    void SetCurrentApplicationFilePath(const std::string& filepath);
-
    /// Type used for the frontend to designate a callback for System to exit the application.
    using ExitCallback = std::function<void()>;

@@ -442,10 +435,6 @@ public:
    /// Instructs the frontend to exit the application.
    void Exit();

-    using ApplicationChangedCallback = std::function<void(u64 program_id)>;
-    void RegisterApplicationChangedCallback(ApplicationChangedCallback&& callback);
-    void NotifyApplicationChanged(u64 program_id);
-
    /// Applies any changes to settings to this core instance.
    void ApplySettings();

@@ -349,18 +349,9 @@ struct KernelCore::Impl {
        object_name_global_data.emplace(kernel);
    }

-    void SetApplicationProcess(KernelCore& kernel, KProcess* process) {
-        if (application_process == process)
-            return;
-
-        KProcess* const previous = application_process;
+    void MakeApplicationProcess(KernelCore& kernel, KProcess* process) {
        application_process = process;
-
-        if (application_process != nullptr)
-            application_process->Open(kernel);
-
-        if (previous != nullptr)
-            previous->Close(kernel);
+        application_process->Open(kernel);
    }

    /// Sets the host thread ID for the caller.
@@ -888,8 +879,8 @@ void KernelCore::RemoveProcess(KProcess* process) {
    }
 }

-void KernelCore::SetApplicationProcess(KProcess* process) {
-    impl->SetApplicationProcess(*this, process);
+void KernelCore::MakeApplicationProcess(KProcess* process) {
+    impl->MakeApplicationProcess(*this, process);
 }

 KProcess* KernelCore::ApplicationProcess() {
@@ -900,14 +891,6 @@ const KProcess* KernelCore::ApplicationProcess() const {
    return impl->application_process;
 }

-KScopedAutoObject<KProcess> KernelCore::GetProcessByProcessId(u64 process_id) {
-    std::scoped_lock lk{impl->process_list_lock};
-    for (auto* const process : impl->process_list)
-        if (process != nullptr && process->GetProcessId() == process_id)
-            return {*this, process};
-    return {*this, nullptr};
-}
-
 std::list<KScopedAutoObject<KProcess>> KernelCore::GetProcessList() {
    std::list<KScopedAutoObject<KProcess>> processes;
    std::scoped_lock lk{impl->process_list_lock};
@@ -124,8 +124,8 @@ public:
    void AppendNewProcess(KProcess* process);
    void RemoveProcess(KProcess* process);

-    /// Makes the given process the current application process.
-    void SetApplicationProcess(KProcess* process);
+    /// Makes the given process the new application process.
+    void MakeApplicationProcess(KProcess* process);

    /// Retrieves a pointer to the application process.
    KProcess* ApplicationProcess();
@@ -133,9 +133,6 @@ public:
    /// Retrieves a const pointer to the application process.
    const KProcess* ApplicationProcess() const;

-    /// Retrieves the process with the given process ID, or a null object.
-    KScopedAutoObject<KProcess> GetProcessByProcessId(u64 process_id);
-
    /// Retrieves the list of processes.
    std::list<KScopedAutoObject<KProcess>> GetProcessList();

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

@@ -13,7 +10,6 @@ namespace Service::AM {
 constexpr Result ResultNoDataInChannel{ErrorModule::AM, 2};
 constexpr Result ResultNoMessages{ErrorModule::AM, 3};
 constexpr Result ResultLibraryAppletTerminated{ErrorModule::AM, 22};
-constexpr Result ResultApplicationRecordNotFound{ErrorModule::AM, 37};
 constexpr Result ResultInvalidOffset{ErrorModule::AM, 503};
 constexpr Result ResultInvalidStorageType{ErrorModule::AM, 511};
 constexpr Result ResultFatalSectionCountImbalance{ErrorModule::AM, 512};
@@ -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
@@ -201,14 +201,6 @@ enum class ProgramSpecifyKind : u32 {
    RestartProgram = 2,
 };

-// Maufeat: Use enums for zindex instead of using random zindex numbers
-enum AppletZIndex : s32 {
-    Background = 0,
-    Foreground = 1,
-    ForegroundVisible = 2,
-    Overlay = 3,
-};
-
 struct CommonArguments {
    CommonArgumentVersion arguments_version;
    CommonArgumentSize size;
@@ -56,22 +56,22 @@ void Applet::UpdateSuspensionStateLocked(bool force_message) {
    }
 }

-void Applet::SetInteractibleLocked(bool pad_interactible, bool touch_interactible) {
-    if (is_pad_interactible == pad_interactible && is_touch_interactible == touch_interactible) {
+void Applet::SetInteractibleLocked(bool interactible) {
+    if (is_interactible == interactible) {
        return;
    }

-    is_pad_interactible = pad_interactible;
-    is_touch_interactible = touch_interactible;
+    is_interactible = interactible;

    const bool exit_requested = lifecycle_manager.GetExitRequested();
-    const bool pad_enabled = pad_interactible && !exit_requested;
-    const bool touch_enabled = touch_interactible && !exit_requested;
+    const bool input_enabled = interactible && !exit_requested;

-    LOG_DEBUG(Service_AM, "applet={} pad={} touch={} exit_requested={}",
-              static_cast<u32>(applet_id), pad_enabled, touch_enabled, exit_requested);
+    if (applet_id == AppletId::OverlayDisplay || applet_id == AppletId::Application) {
+        LOG_DEBUG(Service_AM, "called, applet={} interactible={} exit_requested={} input_enabled={} overlay_in_foreground={}",
+                 static_cast<u32>(applet_id), interactible, exit_requested, input_enabled, overlay_in_foreground);
+    }

-    hid_registration.EnableAppletToGetInput(pad_enabled, touch_enabled);
+    hid_registration.EnableAppletToGetInput(input_enabled);
 }

 void Applet::OnProcessTerminatedLocked() {
@@ -125,11 +125,9 @@ struct Applet {
    bool album_image_taken_notification_enabled{};
    bool record_volume_muted{};
    bool is_activity_runnable{};
-    bool is_pad_interactible{true};
-    bool is_touch_interactible{true};
+    bool is_interactible{true};
    bool window_visible{true};
-    bool overlay_watching_short_home_button{false};
-    bool overlay_handling_touch_input{false};
+    bool overlay_in_foreground{false};

    // Events
    Event overlay_event;
@@ -150,7 +148,7 @@ struct Applet {

    // Process state management
    void UpdateSuspensionStateLocked(bool force_message);
-    void SetInteractibleLocked(bool pad_interactible, bool touch_interactible);
+    void SetInteractibleLocked(bool interactible);
    void OnProcessTerminatedLocked();
 };

@@ -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
@@ -6,7 +6,6 @@

 #include "core/core.h"
 #include "core/hle/service/am/display_layer_manager.h"
-#include "core/hle/service/nvnflinger/hwc_layer.h"
 #include "core/hle/service/sm/sm.h"
 #include "core/hle/service/vi/application_display_service.h"
 #include "core/hle/service/vi/container.h"
@@ -34,7 +33,6 @@ void DisplayLayerManager::Initialize(Core::System& system, Kernel::KProcess* pro
    m_system_shared_buffer_id = 0;
    m_system_shared_layer_id = 0;
    m_applet_id = applet_id;
-    m_library_applet_mode = mode;
    m_buffer_sharing_enabled = false;
    m_blending_enabled = mode == LibraryAppletMode::PartialForeground ||
                         mode == LibraryAppletMode::PartialForegroundIndirectDisplay;
@@ -74,16 +72,14 @@ Result DisplayLayerManager::CreateManagedDisplayLayer(u64* out_layer_id) {
        out_layer_id, 0, display_id, Service::AppletResourceUserId{m_process->GetProcessId()}));

    m_manager_display_service->SetLayerVisibility(m_visible, *out_layer_id);
-    (void)m_display_service->GetContainer()->SetLayerStackMask(*out_layer_id,
-                                                              this->GetLayerStackMask());

    if (m_applet_id != AppletId::Application) {
        (void)m_manager_display_service->SetLayerBlending(m_blending_enabled, *out_layer_id);
        if (m_applet_id == AppletId::OverlayDisplay) {
-            (void)m_manager_display_service->SetLayerZIndex(Overlay, *out_layer_id);
+            (void)m_manager_display_service->SetLayerZIndex(-1, *out_layer_id);
            (void)m_display_service->GetContainer()->SetLayerIsOverlay(*out_layer_id, true);
        } else {
-            (void)m_manager_display_service->SetLayerZIndex(Foreground, *out_layer_id);
+            (void)m_manager_display_service->SetLayerZIndex(1, *out_layer_id);
        }
    }

@@ -126,12 +122,10 @@ Result DisplayLayerManager::IsSystemBufferSharingEnabled() {

    // Ensure the overlay layer is visible
    m_manager_display_service->SetLayerVisibility(m_visible, m_system_shared_layer_id);
-    (void)m_display_service->GetContainer()->SetLayerStackMask(m_system_shared_layer_id,
-                                                              this->GetLayerStackMask());
    m_manager_display_service->SetLayerBlending(m_blending_enabled, m_system_shared_layer_id);
-    s32 initial_z = Foreground;
+    s32 initial_z = 1;
    if (m_applet_id == AppletId::OverlayDisplay) {
-        initial_z = Overlay;
+        initial_z = -1;
        (void)m_display_service->GetContainer()->SetLayerIsOverlay(m_system_shared_layer_id, true);
    }
    m_manager_display_service->SetLayerZIndex(initial_z, m_system_shared_layer_id);
@@ -148,36 +142,6 @@ Result DisplayLayerManager::GetSystemSharedLayerHandle(u64* out_system_shared_bu
    R_SUCCEED();
 }

-u32 DisplayLayerManager::GetLayerStackMask() const {
-    using Nvnflinger::LayerStackBit;
-    using Nvnflinger::LayerStackId;
-
-    constexpr u32 Displayed = LayerStackBit(LayerStackId::Default);
-    constexpr u32 Screenshot = LayerStackBit(LayerStackId::Screenshot);
-    constexpr u32 Recording = LayerStackBit(LayerStackId::Recording);
-    constexpr u32 LastFrame = LayerStackBit(LayerStackId::LastFrame);
-    constexpr u32 Debug = LayerStackBit(LayerStackId::ApplicationForDebug);
-
-    switch (m_applet_id) {
-        case AppletId::Application:
-            return Displayed | Screenshot | Recording | LastFrame | Debug;
-        case AppletId::OverlayDisplay:
-            return Displayed;
-        case AppletId::QLaunch:
-            return Displayed;
-        default:
-            break;
-    }
-
-    switch (m_library_applet_mode) {
-    case LibraryAppletMode::AllForeground:
-    case LibraryAppletMode::AllForegroundInitiallyHidden:
-        return Displayed | Screenshot | LastFrame;
-    default:
-        return Displayed | Screenshot;
-    }
-}
-
 void DisplayLayerManager::SetWindowVisibility(bool visible) {
    if (m_visible == visible) {
        return;
@@ -221,17 +185,10 @@ void DisplayLayerManager::SetOverlayZIndex(s32 z_index) {
 }

 Result DisplayLayerManager::WriteAppletCaptureBuffer(bool* out_was_written,
-                                                     s32* out_fbshare_layer_index,
-                                                     VI::CaptureKind kind) {
+                                                     s32* out_fbshare_layer_index) {
    R_UNLESS(m_buffer_sharing_enabled, VI::ResultPermissionDenied);
    R_RETURN(m_display_service->GetContainer()->GetSharedBufferManager()->WriteAppletCaptureBuffer(
-        out_was_written, out_fbshare_layer_index, kind));
-}
-
-Result DisplayLayerManager::ClearAppletCaptureBuffer(s32 fbshare_layer_index, u32 color) {
-    R_UNLESS(m_buffer_sharing_enabled, VI::ResultPermissionDenied);
-    R_RETURN(m_display_service->GetContainer()->GetSharedBufferManager()->ClearAppletCaptureBuffer(
-        fbshare_layer_index, color));
+        out_was_written, out_fbshare_layer_index));
 }

 } // 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
@@ -23,7 +23,6 @@ class KProcess;
 namespace Service::VI {
 class IApplicationDisplayService;
 class IManagerDisplayService;
-enum class CaptureKind : u32;
 } // namespace Service::VI

 namespace Service::AM {
@@ -49,13 +48,9 @@ public:

    void SetOverlayZIndex(s32 z_index);

-    Result WriteAppletCaptureBuffer(bool* out_was_written, s32* out_fbshare_layer_index,
-                                    VI::CaptureKind kind);
-    Result ClearAppletCaptureBuffer(s32 fbshare_layer_index, u32 color);
+    Result WriteAppletCaptureBuffer(bool* out_was_written, s32* out_fbshare_layer_index);

 private:
-    u32 GetLayerStackMask() const;
-
    Kernel::KProcess* m_process{};
    std::shared_ptr<VI::IApplicationDisplayService> m_display_service{};
    std::shared_ptr<VI::IManagerDisplayService> m_manager_display_service{};
@@ -64,7 +59,6 @@ private:
    u64 m_system_shared_buffer_id{};
    u64 m_system_shared_layer_id{};
    AppletId m_applet_id{};
-    LibraryAppletMode m_library_applet_mode{};
    bool m_buffer_sharing_enabled{};
    bool m_blending_enabled{};
    bool m_visible{true};
@@ -36,17 +36,12 @@ HidRegistration::~HidRegistration() {
    }
 }

-void HidRegistration::EnableAppletToGetInput(bool enable_pad, bool enable_touch) {
-    if (!m_process.IsInitialized())
-        return;
-
-    const auto resource_manager = m_hid_server->GetResourceManager();
-    const u64 aruid = m_process.GetProcessId();
-
-    resource_manager->EnablePadInput(aruid, enable_pad);
-    resource_manager->EnableTouchScreen(aruid, enable_touch);
-
-    resource_manager->SetAruidValidForVibration(aruid, enable_pad);
+void HidRegistration::EnableAppletToGetInput(bool enable) {
+    if (m_process.IsInitialized()) {
+        m_hid_server->GetResourceManager()->SetAruidValidForVibration(m_process.GetProcessId(),
+                                                                      enable);
+        m_hid_server->GetResourceManager()->EnableInput(m_process.GetProcessId(), enable);
+    }
 }

 } // namespace Service::AM
@@ -28,7 +28,7 @@ public:
    ~HidRegistration();

    void RegisterCurrentProcess();
-    void EnableAppletToGetInput(bool enable_pad, bool enable_touch);
+    void EnableAppletToGetInput(bool enable);

 private:
    Process& m_process;
@@ -4,8 +4,6 @@
 // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

-#include "core/core.h"
-#include "core/file_sys/common_funcs.h"
 #include "core/hle/service/am/applet.h"
 #include "core/hle/service/am/service/applet_common_functions.h"
 #include "core/hle/service/cmif_serialization.h"
@@ -80,7 +78,7 @@ Result IAppletCommonFunctions::SetCpuBoostRequestPriority(s32 priority) {

 Result IAppletCommonFunctions::GetCurrentApplicationId(Out<u64> out_application_id) {
    LOG_WARNING(Service_AM, "(STUBBED) called");
-    *out_application_id = FileSys::GetBaseTitleID(system.GetApplicationProcessProgramID());
+    *out_application_id = system.GetApplicationProcessProgramID() & ~0xFFFULL;
    R_SUCCEED();
 }

@@ -150,7 +150,7 @@ Result IApplicationFunctions::EnsureSaveData(Out<u64> out_size, Common::UUID use
 Result IApplicationFunctions::GetDesiredLanguage(Out<u64> out_language_code) {
    // FIXME: all of this stuff belongs to ns
    // TODO(bunnei): This should be configurable
-    LOG_DEBUG(Service_AM, "called, program_id={:016X}", m_applet->program_id);
+    LOG_DEBUG(Service_AM, "called");

    // Get supported languages from NACP, if possible
    // Default to 0 (all languages supported)
@@ -430,16 +430,15 @@ Result IApplicationFunctions::ExecuteProgram(ProgramSpecifyKind kind, u64 value)

 // https://switchbrew.org/wiki/Applet_Manager_services#CreateApplicationAndRequestToStart
 Result IApplicationFunctions::CreateApplicationAndRequestToStart(u64 application_id) {
-    LOG_INFO(Service_AM, "called, application_id={:016X} current_program_id={:016X}", application_id, m_applet->program_id);
+    LOG_INFO(Service_AM, "called, application_id={:016X}", application_id);

-    // If application_id is 0 or matches the current application, relaunch the current application.
-    if (application_id == 0 || application_id == m_applet->program_id) {
-        system.GetUserChannel() = m_applet->user_channel_launch_parameter;
-        system.ExecuteProgram(0);
-        R_SUCCEED();
-    }
+    // If application_id is 0, relaunch the current application
+    const u64 target_application_id =
+        (application_id == 0) ? m_applet->program_id : application_id;

-    R_THROW(ResultUnknown);
+    system.GetUserChannel() = m_applet->user_channel_launch_parameter;
+    system.ExecuteProgram(target_application_id);
+    R_SUCCEED();
 }

 Result IApplicationFunctions::ClearUserChannel() {
@@ -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
@@ -8,7 +8,6 @@
 #include "core/hle/service/am/applet.h"
 #include "core/hle/service/am/service/display_controller.h"
 #include "core/hle/service/cmif_serialization.h"
-#include "core/hle/service/vi/shared_buffer_manager.h"

 namespace Service::AM {

@@ -72,16 +71,16 @@ Result IDisplayController::TakeScreenShotOfOwnLayer(bool unknown0, s32 fbshare_l
 }

 Result IDisplayController::ClearCaptureBuffer(bool unknown0, s32 fbshare_layer_index, u32 color) {
-    LOG_DEBUG(Service_AM, "called, unknown0={} fbshare_layer_index={} color={:#x}", unknown0,
-              fbshare_layer_index, color);
-    R_RETURN(applet->display_layer_manager.ClearAppletCaptureBuffer(fbshare_layer_index, color));
+    LOG_WARNING(Service_AM, "(STUBBED) called, unknown0={} fbshare_layer_index={} color={:#x}",
+                unknown0, fbshare_layer_index, color);
+    R_SUCCEED();
 }

 Result IDisplayController::AcquireLastForegroundCaptureSharedBuffer(
    Out<bool> out_was_written, Out<s32> out_fbshare_layer_index) {
-    LOG_DEBUG(Service_AM, "called");
-    R_RETURN(applet->display_layer_manager.WriteAppletCaptureBuffer(
-        out_was_written, out_fbshare_layer_index, VI::CaptureKind::LastForeground));
+    LOG_WARNING(Service_AM, "(STUBBED) called");
+    R_RETURN(applet->display_layer_manager.WriteAppletCaptureBuffer(out_was_written,
+                                                                    out_fbshare_layer_index));
 }

 Result IDisplayController::ReleaseLastForegroundCaptureSharedBuffer() {
@@ -91,9 +90,9 @@ Result IDisplayController::ReleaseLastForegroundCaptureSharedBuffer() {

 Result IDisplayController::AcquireCallerAppletCaptureSharedBuffer(
    Out<bool> out_was_written, Out<s32> out_fbshare_layer_index) {
-    LOG_DEBUG(Service_AM, "called");
-    R_RETURN(applet->display_layer_manager.WriteAppletCaptureBuffer(
-        out_was_written, out_fbshare_layer_index, VI::CaptureKind::CallerApplet));
+    LOG_WARNING(Service_AM, "(STUBBED) called");
+    R_RETURN(applet->display_layer_manager.WriteAppletCaptureBuffer(out_was_written,
+                                                                    out_fbshare_layer_index));
 }

 Result IDisplayController::ReleaseCallerAppletCaptureSharedBuffer() {
@@ -103,9 +102,9 @@ Result IDisplayController::ReleaseCallerAppletCaptureSharedBuffer() {

 Result IDisplayController::AcquireLastApplicationCaptureSharedBuffer(
    Out<bool> out_was_written, Out<s32> out_fbshare_layer_index) {
-    LOG_DEBUG(Service_AM, "called");
-    R_RETURN(applet->display_layer_manager.WriteAppletCaptureBuffer(
-        out_was_written, out_fbshare_layer_index, VI::CaptureKind::LastApplication));
+    LOG_WARNING(Service_AM, "(STUBBED) called");
+    R_RETURN(applet->display_layer_manager.WriteAppletCaptureBuffer(out_was_written,
+                                                                    out_fbshare_layer_index));
 }

 Result IDisplayController::ReleaseLastApplicationCaptureSharedBuffer() {
@@ -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

 #include "core/hle/service/am/applet.h"
@@ -22,7 +22,7 @@ namespace Service::AM {
        {10, nullptr, "StartShutdownSequenceForOverlay"},
        {11, nullptr, "StartRebootSequenceForOverlay"},
        {20, D<&IOverlayFunctions::SetHandlingHomeButtonShortPressedEnabled>, "SetHandlingHomeButtonShortPressedEnabled"},
-        {21, D<&IOverlayFunctions::SetHandlingTouchScreenInputEnabled>, "SetHandlingTouchScreenInputEnabled"},
+        {21, nullptr, "SetHandlingTouchScreenInputEnabled"},
        {30, nullptr, "SetHealthWarningShowingState"},
        {31, D<&IOverlayFunctions::IsHealthWarningRequired>, "IsHealthWarningRequired"},
        {40, nullptr, "GetApplicationNintendoLogo"},
@@ -43,12 +43,10 @@ namespace Service::AM {
    Result IOverlayFunctions::BeginToWatchShortHomeButtonMessage() {
        LOG_DEBUG(Service_AM, "called");

-        {
-            std::scoped_lock lk{m_applet->lock};
-            m_applet->overlay_watching_short_home_button = true;
-        }
+        m_applet->overlay_in_foreground = true;
+        m_applet->home_button_short_pressed_blocked = false;

-        if (auto* window_system = system.GetAppletManager().GetWindowSystem()) {
+        if (auto *window_system = system.GetAppletManager().GetWindowSystem()) {
            window_system->RequestUpdate();
        }

@@ -58,26 +56,16 @@ namespace Service::AM {
    Result IOverlayFunctions::EndToWatchShortHomeButtonMessage() {
        LOG_DEBUG(Service_AM, "called");

-        {
-            std::scoped_lock lk{m_applet->lock};
-            m_applet->overlay_watching_short_home_button = false;
-        }
+        m_applet->overlay_in_foreground = false;
+        m_applet->home_button_short_pressed_blocked = false;

-        if (auto* window_system = system.GetAppletManager().GetWindowSystem()) {
+        if (auto *window_system = system.GetAppletManager().GetWindowSystem()) {
            window_system->RequestUpdate();
        }

        R_SUCCEED();
    }

-    Result IOverlayFunctions::SetHandlingTouchScreenInputEnabled(bool enabled) {
-        LOG_DEBUG(Service_AM, "called, enabled={}", enabled);
-
-        std::scoped_lock lk{m_applet->lock};
-        m_applet->overlay_handling_touch_input = enabled;
-        R_SUCCEED();
-    }
-
    Result IOverlayFunctions::GetApplicationIdForLogo(Out<u64> out_application_id) {
        LOG_DEBUG(Service_AM, "called");

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

 #pragma once
@@ -20,7 +20,6 @@ namespace Service::AM {
        Result SetAutoSleepTimeAndDimmingTimeEnabled(bool enabled);
        Result IsHealthWarningRequired(Out<bool> is_required);
        Result SetHandlingHomeButtonShortPressedEnabled(bool enabled);
-        Result SetHandlingTouchScreenInputEnabled(bool enabled);
        Result Unknown70();

    private:
@@ -4,11 +4,7 @@
 // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

-#include <utility>
-
-#include "common/settings.h"
 #include "core/core.h"
-#include "core/hle/kernel/kernel.h"
 #include "core/hle/service/am/am_results.h"
 #include "core/hle/service/am/applet.h"
 #include "core/hle/service/am/applet_manager.h"
@@ -36,82 +32,46 @@ void WindowSystem::RequestUpdate() {
 }

 void WindowSystem::Update() {
-    {
-        std::scoped_lock lk{m_lock};
+    std::scoped_lock lk{m_lock};

-        LOG_DEBUG(Service_AM, "called, home_menu={} application={} overlay={}",
-                  m_home_menu != nullptr, m_application != nullptr, m_overlay_display != nullptr);
+    LOG_DEBUG(Service_AM, "called, home_menu={} application={} overlay={}",
+              m_home_menu != nullptr, m_application != nullptr, m_overlay_display != nullptr);

-        // Loop through all applets and remove terminated applets.
-        this->PruneTerminatedAppletsLocked();
+    // Loop through all applets and remove terminated applets.
+    this->PruneTerminatedAppletsLocked();

-        // If the home menu is being locked into the foreground, handle that.
-        if (!this->LockHomeMenuIntoForegroundLocked()) {
-            const bool overlay_takes_input = this->DoesOverlayTakeInputLocked();
-
-            this->UpdateAppletStateLocked(m_overlay_display, true, overlay_takes_input);
-            this->UpdateAppletStateLocked(m_home_menu, m_foreground_requested_applet == m_home_menu, overlay_takes_input);
-            this->UpdateAppletStateLocked(m_application, m_foreground_requested_applet == m_application, overlay_takes_input);
-        }
+    // If the home menu is being locked into the foreground, handle that.
+    if (this->LockHomeMenuIntoForegroundLocked()) {
+        return;
    }

-    this->NotifyApplicationChangedIfNeeded();
+    bool overlay_blocks_input = false;
+    if (m_overlay_display) {
+        std::scoped_lock lk_overlay{m_overlay_display->lock};
+        overlay_blocks_input = m_overlay_display->overlay_in_foreground;
+    }
+
+    // Recursively update each applet root.
+    this->UpdateAppletStateLocked(m_home_menu, m_foreground_requested_applet == m_home_menu, overlay_blocks_input);
+    this->UpdateAppletStateLocked(m_application, m_foreground_requested_applet == m_application, overlay_blocks_input);
+    this->UpdateAppletStateLocked(m_overlay_display, true, false); // overlay is always updated, never blocked
 }

 void WindowSystem::TrackApplet(std::shared_ptr<Applet> applet, bool is_application) {
-    {
-        std::scoped_lock lk{m_lock};
+    std::scoped_lock lk{m_lock};

-        if (applet->applet_id == AppletId::QLaunch) {
-            ASSERT(m_home_menu == nullptr);
-            m_home_menu = applet.get();
-        } else if (applet->applet_id == AppletId::OverlayDisplay) {
-            m_overlay_display = applet.get();
-        } else if (is_application) {
-            ASSERT(m_application == nullptr);
-            m_application = applet.get();
-        }
-
-        this->UpdateCurrentApplicationLocked();
-
-        m_event_observer->TrackAppletProcess(*applet);
-        m_applets.emplace(applet->aruid.pid, std::move(applet));
+    if (applet->applet_id == AppletId::QLaunch) {
+        ASSERT(m_home_menu == nullptr);
+        m_home_menu = applet.get();
+    } else if (applet->applet_id == AppletId::OverlayDisplay) {
+        m_overlay_display = applet.get();
+    } else if (is_application) {
+        ASSERT(m_application == nullptr);
+        m_application = applet.get();
    }

-    this->NotifyApplicationChangedIfNeeded();
-}
-
-void WindowSystem::UpdateCurrentApplicationLocked() {
-    const Applet* const candidate = m_application != nullptr ? m_application : m_home_menu;
-    if (candidate == nullptr) {
-        return;
-    }
-
-    auto* const process = candidate->process->GetHandle();
-    if (process == nullptr || process == m_system.Kernel().ApplicationProcess()) {
-        return;
-    }
-
-    LOG_INFO(Service_AM, "Current application is now {:016X}", candidate->program_id);
-
-    m_system.Kernel().SetApplicationProcess(process);
-    Settings::SetCurrentProgramID(candidate->program_id);
-
-    m_pending_application_notification = candidate->program_id;
-}
-
-void WindowSystem::NotifyApplicationChangedIfNeeded() {
-    std::optional<u64> program_id;
-    {
-        std::scoped_lock lk{m_lock};
-        program_id = std::exchange(m_pending_application_notification, std::nullopt);
-    }
-
-    if (!program_id.has_value()) {
-        return;
-    }
-
-    m_system.NotifyApplicationChanged(*program_id);
+    m_event_observer->TrackAppletProcess(*applet);
+    m_applets.emplace(applet->aruid.pid, std::move(applet));
 }

 std::shared_ptr<Applet> WindowSystem::GetByAppletResourceUserId(u64 aruid) {
@@ -209,40 +169,18 @@ void WindowSystem::OnExitRequested() {
 }

 void WindowSystem::SendButtonAppletMessageLocked(AppletMessage message) {
-    const auto is_blocked = [message](const Applet& applet) {
-        if (message == AppletMessage::DetectShortPressingHomeButton &&
-            applet.applet_id == AppletId::OverlayDisplay &&
-            !applet.overlay_watching_short_home_button) {
-            return true;
-        }
-
-        switch (message) {
-        case AppletMessage::DetectShortPressingHomeButton:
-            return applet.home_button_short_pressed_blocked;
-        case AppletMessage::DetectLongPressingHomeButton:
-            return applet.home_button_long_pressed_blocked;
-        default:
-            return false;
-        }
-    };
-
-    const auto send_to = [&](Applet* applet) {
-        if (!applet) {
-            return;
-        }
-        std::scoped_lock lk{applet->lock};
-        if (is_blocked(*applet)) {
-            LOG_DEBUG(Service_AM, "Applet {} is blocking message {}",
-                      static_cast<u32>(applet->applet_id), static_cast<u32>(message));
-            return;
-        }
-        applet->lifecycle_manager.PushUnorderedMessage(m_system.Kernel(), message);
-    };
-
-    send_to(m_home_menu);
-    send_to(m_overlay_display);
-    send_to(m_application);
-
+    if (m_home_menu) {
+        std::scoped_lock lk_home{m_home_menu->lock};
+        m_home_menu->lifecycle_manager.PushUnorderedMessage(m_system.Kernel(), message);
+    }
+    if (m_overlay_display) {
+        std::scoped_lock lk_overlay{m_overlay_display->lock};
+        m_overlay_display->lifecycle_manager.PushUnorderedMessage(m_system.Kernel(), message);
+    }
+    if (m_application) {
+        std::scoped_lock lk_application{m_application->lock};
+        m_application->lifecycle_manager.PushUnorderedMessage(m_system.Kernel(), message);
+    }
    if (m_event_observer) {
        m_event_observer->RequestUpdate();
    }
@@ -254,9 +192,19 @@ void WindowSystem::OnSystemButtonPress(SystemButtonType type) {
    case SystemButtonType::HomeButtonShortPressing:
        SendButtonAppletMessageLocked(AppletMessage::DetectShortPressingHomeButton);
        break;
-    case SystemButtonType::HomeButtonLongPressing:
+    case SystemButtonType::HomeButtonLongPressing: {
+        // Toggle overlay foreground visibility on long home press
+        if (m_overlay_display) {
+            std::scoped_lock lk_overlay{m_overlay_display->lock};
+            m_overlay_display->overlay_in_foreground = !m_overlay_display->overlay_in_foreground;
+            LOG_INFO(Service_AM, "Overlay long-press toggle: overlay_in_foreground={} window_visible={}", m_overlay_display->overlay_in_foreground, m_overlay_display->window_visible);
+        }
        SendButtonAppletMessageLocked(AppletMessage::DetectLongPressingHomeButton);
-        break;
+        // Force a state update after toggling overlay
+        if (m_event_observer) {
+            m_event_observer->RequestUpdate();
+        }
+        break; }
    case SystemButtonType::CaptureButtonShortPressing:
        SendButtonAppletMessageLocked(AppletMessage::DetectShortPressingCaptureButton);
        break;
@@ -369,8 +317,6 @@ void WindowSystem::PruneTerminatedAppletsLocked() {
            m_overlay_display = nullptr;
        }

-        this->UpdateCurrentApplicationLocked();
-
        // Finalize applet.
        applet->OnProcessTerminatedLocked();

@@ -443,20 +389,7 @@ void WindowSystem::TerminateChildAppletsLocked(Applet* applet) {
    applet->lock.lock();
 }

-bool WindowSystem::IsOverlayOpenLocked(const Applet& overlay) const {
-    return overlay.window_visible && overlay.overlay_watching_short_home_button;
-}
-
-bool WindowSystem::DoesOverlayTakeInputLocked() const {
-    if (m_overlay_display == nullptr) {
-        return false;
-    }
-
-    std::scoped_lock lk{m_overlay_display->lock};
-    return this->IsOverlayOpenLocked(*m_overlay_display);
-}
-
-void WindowSystem::UpdateAppletStateLocked(Applet* applet, bool is_foreground, bool overlay_takes_input) {
+void WindowSystem::UpdateAppletStateLocked(Applet* applet, bool is_foreground, bool overlay_blocking) {
    // With no applet, we don't have anything to do.
    if (!applet) {
        return;
@@ -487,18 +420,24 @@ void WindowSystem::UpdateAppletStateLocked(Applet* applet, bool is_foreground, b
        return false;
    }();

-    const bool is_overlay = applet->applet_id == AppletId::OverlayDisplay;
-
    // Update visibility state.
-    const bool should_be_visible =
-        is_overlay ? applet->window_visible : (is_foreground && applet->window_visible);
+    // Overlay applets should always be visible when window_visible is true, regardless of foreground state
+    const bool should_be_visible = (applet->applet_id == AppletId::OverlayDisplay)
+                                     ? applet->window_visible
+                                     : (is_foreground && applet->window_visible);
    applet->display_layer_manager.SetWindowVisibility(should_be_visible);

-    const bool needs_hid_input =
-        is_overlay ? this->IsOverlayOpenLocked(*applet)
-                   : (is_foreground && applet->window_visible && !overlay_takes_input);

-    applet->SetInteractibleLocked(needs_hid_input, needs_hid_input);
+    const bool should_be_interactible = (applet->applet_id == AppletId::OverlayDisplay)
+                                          ? applet->overlay_in_foreground
+                                          : (is_foreground && applet->window_visible && !overlay_blocking);
+
+    if (applet->applet_id == AppletId::OverlayDisplay || applet->applet_id == AppletId::Application) {
+        LOG_DEBUG(Service_AM, "UpdateAppletStateLocked: applet={} overlay_in_foreground={} is_foreground={} window_visible={} overlay_blocking={} should_be_interactible={}",
+                 static_cast<u32>(applet->applet_id), applet->overlay_in_foreground, is_foreground, applet->window_visible, overlay_blocking, should_be_interactible);
+    }
+
+    applet->SetInteractibleLocked(should_be_interactible);

    // Update focus state and suspension.
    const bool is_obscured = has_obscuring_child_applets || !applet->window_visible;
@@ -514,18 +453,23 @@ void WindowSystem::UpdateAppletStateLocked(Applet* applet, bool is_foreground, b
        applet->UpdateSuspensionStateLocked(true);
    }

-    // Layer ordering. Composition sorts back-to-front. Now with enums for calrity.
-    s32 z_index = Background;
-    if (is_overlay) {
-        z_index = Overlay;
-    } else if (inherited_foreground) {
-        z_index = is_obscured ? Foreground : ForegroundVisible;
+    // Z-index logic like in reference C# implementation (tuned for overlay extremes)
+    s32 z_index = 0;
+    const bool now_foreground = inherited_foreground;
+    if (applet->applet_id == AppletId::OverlayDisplay) {
+        z_index = applet->overlay_in_foreground ? 100000 : -1;
+    } else if (now_foreground && !is_obscured) {
+        z_index = 2;
+    } else if (now_foreground) {
+        z_index = 1;
+    } else {
+        z_index = 0;
    }
    applet->display_layer_manager.SetOverlayZIndex(z_index);

    // Recurse into child applets.
    for (const auto& child_applet : applet->child_applets) {
-        this->UpdateAppletStateLocked(child_applet.get(), is_foreground, overlay_takes_input);
+        this->UpdateAppletStateLocked(child_applet.get(), is_foreground, overlay_blocking);
    }
 }

@@ -9,7 +9,6 @@
 #include <map>
 #include <memory>
 #include <mutex>
-#include <optional>

 #include "common/common_types.h"
 #include "core/hle/service/am/am_types.h"
@@ -61,16 +60,11 @@ public:
    void OnPowerButtonPressed(ButtonPressDuration type) {}

 private:
-    void UpdateCurrentApplicationLocked();
-    void NotifyApplicationChangedIfNeeded();
    void PruneTerminatedAppletsLocked();
    bool RestartAppletProcessLocked(Applet* applet);
    bool LockHomeMenuIntoForegroundLocked();
    void TerminateChildAppletsLocked(Applet* applet);
-    bool IsOverlayOpenLocked(const Applet& overlay) const;
-    bool DoesOverlayTakeInputLocked() const;
-
-    void UpdateAppletStateLocked(Applet* applet, bool is_foreground, bool overlay_takes_input);
+    void UpdateAppletStateLocked(Applet* applet, bool is_foreground, bool overlay_blocking = false);
    void SendButtonAppletMessageLocked(AppletMessage message);

 private:
@@ -94,7 +88,6 @@ private:

    // Applet map by aruid.
    std::map<u64, std::shared_ptr<Applet>> m_applets{};
-    std::optional<u64> m_pending_application_notification{};
 };

 } // namespace Service::AM
@@ -23,7 +23,6 @@
 #include "core/hle/service/cmif_serialization.h"
 #include "core/hle/service/ipc_helpers.h"
 #include "core/hle/service/server_manager.h"
-#include "core/hle/service/am/am_results.h"
 #include "core/loader/loader.h"

 namespace Service::AOC {
@@ -32,10 +31,6 @@ static bool CheckAOCTitleIDMatchesBase(u64 title_id, u64 base) {
    return FileSys::GetBaseTitleID(title_id) == base;
 }

-static u64 GetCallerBaseTitleID(Core::System& system, const ClientProcessId& process_id) {
-    return FileSys::GetBaseTitleID(system.ResolveCallerProgramId(*process_id));
-}
-
 static std::vector<u64> AccumulateAOCTitleIDs(Core::System& system) {
    std::vector<u64> add_on_content;
    const auto& rcu = system.GetContentProvider();
@@ -96,7 +91,7 @@ IAddOnContentManager::~IAddOnContentManager() {
 Result IAddOnContentManager::CountAddOnContent(Out<u32> out_count, ClientProcessId process_id) {
    LOG_DEBUG(Service_AOC, "called. process_id={}", process_id.pid);

-    const auto current = GetCallerBaseTitleID(system, process_id);
+    const auto current = system.GetApplicationProcessProgramID();

    const auto& disabled = Settings::values.disabled_addons[current];
    if (std::find(disabled.begin(), disabled.end(), "DLC") != disabled.end()) {
@@ -117,7 +112,7 @@ Result IAddOnContentManager::ListAddOnContent(Out<u32> out_count,
    LOG_DEBUG(Service_AOC, "called with offset={}, count={}, process_id={}", offset, count,
              process_id.pid);

-    const auto current = GetCallerBaseTitleID(system, process_id);
+    const auto current = FileSys::GetBaseTitleID(system.GetApplicationProcessProgramID());

    std::vector<u32> out;
    const auto& disabled = Settings::values.disabled_addons[current];
@@ -131,7 +126,8 @@ Result IAddOnContentManager::ListAddOnContent(Out<u32> out_count,
        }
    }

-    R_UNLESS(out.size() >= offset, AM::ResultApplicationRecordNotFound);
+    // TODO(DarkLordZach): Find the correct error code.
+    R_UNLESS(out.size() >= offset, ResultUnknown);

    *out_count = static_cast<u32>(std::min<size_t>(out.size() - offset, count));
    std::rotate(out.begin(), out.begin() + offset, out.end());
@@ -145,7 +141,7 @@ Result IAddOnContentManager::GetAddOnContentBaseId(Out<u64> out_title_id,
                                                   ClientProcessId process_id) {
    LOG_DEBUG(Service_AOC, "called. process_id={}", process_id.pid);

-    const auto title_id = system.ResolveCallerProgramId(*process_id);
+    const auto title_id = system.GetApplicationProcessProgramID();
    const FileSys::PatchManager pm{title_id, system.GetFileSystemController(),
                                   system.GetContentProvider()};

@@ -24,8 +24,8 @@ static u64 GetCurrentBuildID(const Core::System::CurrentBuildProcessID& id) {
    return out;
 }

-IBcatService::IBcatService(Core::System& system_, BcatBackend& backend_, u64 program_id_)
-    : ServiceFramework{system_, "IBcatService"}, backend{backend_}, program_id{program_id_},
+IBcatService::IBcatService(Core::System& system_, BcatBackend& backend_)
+    : ServiceFramework{system_, "IBcatService"}, backend{backend_},
      progress{{
          ProgressServiceBackend{system_, "Normal"},
          ProgressServiceBackend{system_, "Directory"},
@@ -70,7 +70,8 @@ Result IBcatService::RequestSyncDeliveryCache(
    LOG_DEBUG(Service_BCAT, "called");

    auto& progress_backend{GetProgressBackend(SyncType::Normal)};
-    backend.Synchronize(system.Kernel(), {program_id, GetCurrentBuildID(system.GetApplicationProcessBuildID())},
+    backend.Synchronize(system.Kernel(), {system.GetApplicationProcessProgramID(),
+                         GetCurrentBuildID(system.GetApplicationProcessBuildID())},
                        GetProgressBackend(SyncType::Normal));

    *out_interface = std::make_shared<IDeliveryCacheProgressService>(
@@ -85,8 +86,9 @@ Result IBcatService::RequestSyncDeliveryCacheWithDirectoryName(
    LOG_DEBUG(Service_BCAT, "called, name={}", name);

    auto& progress_backend{GetProgressBackend(SyncType::Directory)};
-    backend.SynchronizeDirectory(system.Kernel(), {program_id, GetCurrentBuildID(system.GetApplicationProcessBuildID())},
-        name, progress_backend);
+    backend.SynchronizeDirectory(system.Kernel(), {system.GetApplicationProcessProgramID(),
+                                  GetCurrentBuildID(system.GetApplicationProcessBuildID())},
+                                 name, progress_backend);

    *out_interface = std::make_shared<IDeliveryCacheProgressService>(
        system, progress_backend.GetEvent(), progress_backend.GetImpl());
@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

@@ -22,7 +19,7 @@ class IDeliveryCacheProgressService;

 class IBcatService final : public ServiceFramework<IBcatService> {
 public:
-    explicit IBcatService(Core::System& system_, BcatBackend& backend_, u64 program_id_);
+    explicit IBcatService(Core::System& system_, BcatBackend& backend_);
    ~IBcatService() override;

 private:
@@ -42,7 +39,6 @@ private:
    const ProgressServiceBackend& GetProgressBackend(SyncType type) const;

    BcatBackend& backend;
-    u64 program_id;
    std::array<ProgressServiceBackend, static_cast<size_t>(SyncType::Count)> progress;
 };

@@ -1,10 +1,6 @@
-// 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

-#include "core/core.h"
 #include "core/hle/service/bcat/bcat_service.h"
 #include "core/hle/service/bcat/delivery_cache_storage_service.h"
 #include "core/hle/service/bcat/service_creator.h"
@@ -41,8 +37,7 @@ IServiceCreator::~IServiceCreator() = default;
 Result IServiceCreator::CreateBcatService(ClientProcessId process_id,
                                          OutInterface<IBcatService> out_interface) {
    LOG_INFO(Service_BCAT, "called, process_id={}", process_id.pid);
-    *out_interface =
-        std::make_shared<IBcatService>(system, *backend, system.ResolveCallerProgramId(*process_id));
+    *out_interface = std::make_shared<IBcatService>(system, *backend);
    R_SUCCEED();
 }

@@ -50,7 +45,7 @@ Result IServiceCreator::CreateDeliveryCacheStorageService(
    ClientProcessId process_id, OutInterface<IDeliveryCacheStorageService> out_interface) {
    LOG_INFO(Service_BCAT, "called, process_id={}", process_id.pid);

-    const auto title_id = system.ResolveCallerProgramId(*process_id);
+    const auto title_id = system.GetApplicationProcessProgramID();
    *out_interface =
        std::make_shared<IDeliveryCacheStorageService>(system, fsc.GetBCATDirectory(title_id));
    R_SUCCEED();
@@ -243,15 +243,10 @@ Result AlbumManager::SaveScreenShot(ApplicationAlbumEntry& out_entry,
    return SaveScreenShot(out_entry, attribute, report_option, {}, image_data, aruid);
 }

-Result AlbumManager::SaveScreenShot(ApplicationAlbumEntry& out_entry,
-                                    const ScreenShotAttribute& attribute,
-                                    AlbumReportOption report_option,
-                                    const ApplicationData& app_data, std::span<const u8> image_data,
-                                    u64 aruid) {
+Result AlbumManager::SaveScreenShot(ApplicationAlbumEntry& out_entry, const ScreenShotAttribute& attribute, AlbumReportOption report_option, const ApplicationData& app_data, std::span<const u8> image_data, u64 aruid) {
    R_UNLESS(!image_data.empty(), ResultUnknown); //TODO: ???

-    const u64 title_id = system.ResolveCallerProgramId(aruid);
-
+    const u64 title_id = system.GetApplicationProcessProgramID();
    auto static_service =
        system.ServiceManager().GetService<Service::Glue::Time::StaticService>("time:u", true);

@@ -95,8 +95,7 @@ void IScreenShotApplicationService::CaptureAndSaveScreenshot(AlbumReportOption r
            manager->FlipVerticallyOnWrite(invert_y);
            manager->SaveScreenShot(entry, attribute, report_option, image_data, {});
        },
-        layout,
-        Nvnflinger::LayerStackId::Screenshot);
+        layout);
 }

 } // namespace Service::Capture
@@ -1164,7 +1164,7 @@ Result IHidServer::InitializeSevenSixAxisSensor(ClientAppletResourceUserId aruid
    GetResourceManager()->GetConsoleSixAxis()->Activate();
    GetResourceManager()->GetSevenSixAxis()->Activate();

-    GetResourceManager()->GetSevenSixAxis()->SetTransferMemoryAddress(t_mem_1->GetSourceAddress(), t_mem_1->GetOwner());
+    GetResourceManager()->GetSevenSixAxis()->SetTransferMemoryAddress(t_mem_1->GetSourceAddress());

    R_SUCCEED();
 }
@@ -312,7 +312,7 @@ Result Hidbus::EnableJoyPollingReceiveMode(u32 t_mem_size, JoyPollingMode pollin

    auto& device = devices[device_index.value()].device;
    device->SetPollingMode(polling_mode);
-    device->SetTransferMemoryAddress(t_mem->GetSourceAddress(), t_mem->GetOwner());
+    device->SetTransferMemoryAddress(t_mem->GetSourceAddress());
    R_SUCCEED();
 }

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

@@ -150,7 +147,7 @@ Result IRS::RunImageTransferProcessor(
    MakeProcessorWithCoreContext<ImageTransferProcessor>(camera_handle, device);
    auto& image_transfer_processor = GetProcessor<ImageTransferProcessor>(camera_handle);
    image_transfer_processor.SetConfig(processor_config);
-    image_transfer_processor.SetTransferMemoryAddress(t_mem->GetSourceAddress(), t_mem->GetOwner());
+    image_transfer_processor.SetTransferMemoryAddress(t_mem->GetSourceAddress());
    npad_device->SetPollingMode(Core::HID::EmulatedDeviceIndex::RightIndex,
                                Common::Input::PollingMode::IR);

@@ -298,8 +295,7 @@ Result IRS::RunImageTransferExProcessor(
    MakeProcessorWithCoreContext<ImageTransferProcessor>(camera_handle, device);
    auto& image_transfer_processor = GetProcessor<ImageTransferProcessor>(camera_handle);
    image_transfer_processor.SetConfig(processor_config);
-    image_transfer_processor.SetTransferMemoryAddress(t_mem->GetSourceAddress(),
-                                                      t_mem->GetOwner());
+    image_transfer_processor.SetTransferMemoryAddress(t_mem->GetSourceAddress());
    npad_device->SetPollingMode(Core::HID::EmulatedDeviceIndex::RightIndex,
                                Common::Input::PollingMode::IR);

@@ -35,7 +35,7 @@ public:
        , process{kernel, process_}
        , user_rx{std::move(user_rx_)}
        , user_ro{std::move(user_ro_)}
-        , context{process_->GetMemory()}
+        , context{system_.ApplicationMemory()}
    {

        // clang-format off
@@ -18,7 +18,6 @@
 #include "core/file_sys/control_metadata.h"
 #include "core/file_sys/patch_manager.h"
 #include "core/file_sys/vfs/vfs.h"
-#include "core/hle/kernel/k_process.h"
 #include "core/hle/kernel/k_transfer_memory.h"
 #include "core/hle/service/cmif_serialization.h"
 #include "core/hle/service/ns/language.h"
@@ -337,8 +336,8 @@ void IReadOnlyApplicationControlDataInterface::ListApplicationTitle(HLERequestCo

    constexpr s32 data_offset = 0;

-    if (t_mem != nullptr && t_mem->GetOwner() != nullptr && app_count > 0) {
-        auto& memory = t_mem->GetOwner()->GetMemory();
+    if (t_mem != nullptr && app_count > 0) {
+        auto& memory = system.ApplicationMemory();
        const auto t_mem_address = t_mem->GetSourceAddress();

        for (size_t i = 0; i < app_count; ++i) {
@@ -77,7 +77,6 @@ void nvdisp_disp0::Composite(std::span<const Nvnflinger::HwcLayer> sorted_layers
            .transform_flags = layer.transform,
            .crop_rect = layer.crop_rect,
            .blending = ConvertBlending(layer.blending),
-            .layer_stack_mask = layer.layer_stack_mask,
        });

        for (size_t i = 0; i < layer.acquire_fence.num_fences; i++) {
@@ -69,7 +69,7 @@ NvResult nvhost_gpu::Ioctl1(DeviceFD fd, Ioctl command, std::span<const u8> inpu
        case 0x3:
            return WrapFixed(this, &nvhost_gpu::ChannelSetTimeout, input, output);
        case 0x8:
-            return WrapFixedVariable(this, &nvhost_gpu::SubmitGPFIFOBase1, input, output, fd, false);
+            return WrapFixedVariable(this, &nvhost_gpu::SubmitGPFIFOBase1, input, output, false);
        case 0x9:
            return WrapFixed(this, &nvhost_gpu::AllocateObjectContext, input, output);
        case 0xb:
@@ -83,7 +83,7 @@ NvResult nvhost_gpu::Ioctl1(DeviceFD fd, Ioctl command, std::span<const u8> inpu
        case 0x1a:
            return WrapFixed(this, &nvhost_gpu::AllocGPFIFOEx2, input, output, fd);
        case 0x1b:
-            return WrapFixedVariable(this, &nvhost_gpu::SubmitGPFIFOBase1, input, output, fd, true);
+            return WrapFixedVariable(this, &nvhost_gpu::SubmitGPFIFOBase1, input, output, true);
        case 0x1d:
            return WrapFixed(this, &nvhost_gpu::ChannelSetTimeslice, input, output);
        default:
@@ -387,19 +387,8 @@ NvResult nvhost_gpu::SubmitGPFIFOImpl(IoctlSubmitGpfifo& params, Tegra::CommandL
    return NvResult::Success;
 }

-Core::Memory::Memory& nvhost_gpu::GetSessionMemory(DeviceFD fd) {
-    if (const auto it = sessions.find(fd); it != sessions.end())
-        if (auto* const session = core.GetSession(it->second);
-            session != nullptr && session->process != nullptr)
-            return session->process->GetMemory();
-
-    LOG_ERROR(Service_NVDRV, "No session for fd={}, falling back to application memory", fd);
-    return system.ApplicationMemory();
-}
-
 NvResult nvhost_gpu::SubmitGPFIFOBase1(IoctlSubmitGpfifo& params,
-                                       std::span<Tegra::CommandListHeader> commands, DeviceFD fd,
-                                       bool kickoff) {
+                                       std::span<Tegra::CommandListHeader> commands, bool kickoff) {
    if (params.num_entries > commands.size()) {
        UNIMPLEMENTED();
        return NvResult::InvalidSize;
@@ -407,7 +396,7 @@ NvResult nvhost_gpu::SubmitGPFIFOBase1(IoctlSubmitGpfifo& params,

    Tegra::CommandList entries(params.num_entries);
    if (kickoff) {
-        this->GetSessionMemory(fd).ReadBlock(params.address, entries.command_lists.data(),
+        system.ApplicationMemory().ReadBlock(params.address, entries.command_lists.data(),
                                             params.num_entries * sizeof(Tegra::CommandListHeader));
    } else {
        std::memcpy(entries.command_lists.data(), commands.data(),
@@ -16,10 +16,6 @@
 #include "core/hle/service/nvdrv/nvdata.h"
 #include "video_core/dma_pusher.h"

-namespace Core::Memory {
-class Memory;
-}
-
 namespace Tegra {
 namespace Control {
 struct ChannelState;
@@ -200,11 +196,8 @@ private:

    NvResult SubmitGPFIFOImpl(IoctlSubmitGpfifo& params, Tegra::CommandList&& entries);

-    Core::Memory::Memory& GetSessionMemory(DeviceFD fd);
-
    NvResult SubmitGPFIFOBase1(IoctlSubmitGpfifo& params,
-                               std::span<Tegra::CommandListHeader> commands, DeviceFD fd,
-                               bool kickoff = false);
+                               std::span<Tegra::CommandListHeader> commands, bool kickoff = false);
    NvResult SubmitGPFIFOBase2(IoctlSubmitGpfifo& params,
                               std::span<const Tegra::CommandListHeader> commands);

@@ -105,7 +105,12 @@ void LoopProcess(Core::System& system) {
    auto server_manager = std::make_unique<ServerManager>(system);
    auto module = std::make_shared<Module>(system);
    server_manager->RegisterNamedService("nvdrv", std::make_shared<NVDRV>(system, module, "nvdrv"));
-    server_manager->RegisterNamedService("nvdrv:a", std::make_shared<NVDRV>(system, module, "nvdrv:a"));
+
+    const auto NvdrvInterfaceFactoryForApplets = [&, module] {
+        return std::make_shared<NVDRV>(system, module, "nvdrv:a");
+    };
+
+    server_manager->RegisterNamedService("nvdrv:a", NvdrvInterfaceFactoryForApplets);
    server_manager->RegisterNamedService("nvdrv:s", std::make_shared<NVDRV>(system, module, "nvdrv:s"));
    server_manager->RegisterNamedService("nvdrv:t", std::make_shared<NVDRV>(system, module, "nvdrv:t"));
    server_manager->RegisterNamedService("nvmemp", std::make_shared<NVMEMP>(system));
@@ -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
@@ -15,8 +15,7 @@ struct Layer {
    explicit Layer(std::shared_ptr<android::BufferItemConsumer> buffer_item_consumer_,
                   s32 consumer_id_)
        : buffer_item_consumer(std::move(buffer_item_consumer_)), consumer_id(consumer_id_),
-          blending(LayerBlending::None), visible(true), z_index(0), is_overlay(false),
-          layer_stack_mask(DefaultLayerStackMask) {}
+          blending(LayerBlending::None), visible(true), z_index(0), is_overlay(false) {}
    ~Layer() {
        buffer_item_consumer->Abandon();
    }
@@ -27,7 +26,6 @@ struct Layer {
    bool visible;
    s32 z_index;
    bool is_overlay;
-    u32 layer_stack_mask;
 };

 struct LayerStack {
@@ -115,7 +115,6 @@ u32 HardwareComposer::ComposeLocked(f32* out_speed_scale, Display& display,
                .transform = static_cast<android::BufferTransformFlags>(item.transform),
                .crop_rect = item.crop,
                .acquire_fence = item.fence,
-                .layer_stack_mask = layer->layer_stack_mask,
            });
        }

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

@@ -26,25 +23,6 @@ enum class LayerBlending : u32 {
    Coverage = 0x405,
 };

-enum class LayerStackId : u32 {
-    Default = 0,
-    Lcd = 1,
-    Screenshot = 2,
-    Recording = 3,
-    LastFrame = 4,
-    Arbitrary = 5,
-    ApplicationForDebug = 6,
-    Null = 10,
-};
-
-constexpr u32 LayerStackBit(LayerStackId id) {
-    return 1U << static_cast<u32>(id);
-}
-
-constexpr u32 DefaultLayerStackMask =
-    LayerStackBit(LayerStackId::Default) | LayerStackBit(LayerStackId::Screenshot) |
-    LayerStackBit(LayerStackId::Recording) | LayerStackBit(LayerStackId::LastFrame);
-
 struct HwcLayer {
    u32 buffer_handle;
    u32 offset;
@@ -57,7 +35,6 @@ struct HwcLayer {
    android::BufferTransformFlags transform;
    Common::Rectangle<int> crop_rect;
    android::Fence acquire_fence;
-    u32 layer_stack_mask;
 };

 } // namespace Service::Nvnflinger
@@ -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
@@ -104,14 +104,6 @@ void SurfaceFlinger::SetLayerBlending(s32 consumer_binder_id, LayerBlending blen
    }
 }

-void SurfaceFlinger::SetLayerStackMask(s32 consumer_binder_id, u32 layer_stack_mask) {
-    if (const auto layer = this->FindLayer(consumer_binder_id); layer != nullptr) {
-        layer->layer_stack_mask = layer_stack_mask;
-        LOG_DEBUG(Service_VI, "Layer {} stack mask set to {:#x}", consumer_binder_id,
-                  layer_stack_mask);
-    }
-}
-
 void SurfaceFlinger::SetLayerIsOverlay(s32 consumer_binder_id, bool is_overlay) {
    if (const auto layer = this->FindLayer(consumer_binder_id); layer != nullptr) {
        layer->is_overlay = is_overlay;
@@ -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
@@ -48,7 +48,6 @@ public:
    void SetLayerVisibility(s32 consumer_binder_id, bool visible);
    void SetLayerBlending(s32 consumer_binder_id, LayerBlending blending);
    void SetLayerIsOverlay(s32 consumer_binder_id, bool is_overlay);
-    void SetLayerStackMask(s32 consumer_binder_id, u32 layer_stack_mask);

    std::shared_ptr<Layer> FindLayer(s32 consumer_binder_id);

@@ -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
@@ -13,10 +13,8 @@

 namespace Service::PCTL {

-IParentalControlService::IParentalControlService(Core::System& system_, Capability capability_,
-                                                 u64 program_id_)
+IParentalControlService::IParentalControlService(Core::System& system_, Capability capability_)
    : ServiceFramework{system_, "IParentalControlService"}, capability{capability_},
-      program_id{program_id_},
      service_context{system_, "IParentalControlService"}, synchronization_event{service_context},
      unlinked_event{service_context}, request_suspension_event{service_context} {
    // clang-format off
@@ -204,6 +202,7 @@ Result IParentalControlService::Initialize() {

    // TODO(ogniK): Recovery flag initialization for pctl:r

+    const auto program_id = system.GetApplicationProcessProgramID();
    if (program_id != 0) {
        const FileSys::PatchManager pm{program_id, system.GetFileSystemController(),
                                       system.GetContentProvider()};
@@ -16,8 +16,7 @@ namespace Service::PCTL {

 class IParentalControlService final : public ServiceFramework<IParentalControlService> {
 public:
-    explicit IParentalControlService(Core::System& system_, Capability capability_,
-                                     u64 program_id_);
+    explicit IParentalControlService(Core::System& system_, Capability capability_);
    ~IParentalControlService() override;

 private:
@@ -85,7 +84,6 @@ private:
    RestrictionSettings restriction_settings{};
    std::array<char, 8> pin_code{};
    Capability capability{};
-    u64 program_id{};
    // TODO: this is raw
    PlayTimerSettings raw_play_timer_settings{};

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

-#include "core/core.h"
 #include "core/hle/service/cmif_serialization.h"
 #include "core/hle/service/pctl/parental_control_service.h"
 #include "core/hle/service/pctl/parental_control_service_factory.h"
@@ -27,17 +23,17 @@ IParentalControlServiceFactory::~IParentalControlServiceFactory() = default;

 Result IParentalControlServiceFactory::CreateService(
    Out<SharedPointer<IParentalControlService>> out_service, ClientProcessId process_id) {
-    LOG_DEBUG(Service_PCTL, "called, process_id={}", process_id.pid);
-    *out_service = std::make_shared<IParentalControlService>(
-        system, capability, system.ResolveCallerProgramId(*process_id));
+    LOG_DEBUG(Service_PCTL, "called");
+    // TODO(ogniK): Get application id from process
+    *out_service = std::make_shared<IParentalControlService>(system, capability);
    R_SUCCEED();
 }

 Result IParentalControlServiceFactory::CreateServiceWithoutInitialize(
    Out<SharedPointer<IParentalControlService>> out_service, ClientProcessId process_id) {
-    LOG_DEBUG(Service_PCTL, "called, process_id={}", process_id.pid);
-    *out_service = std::make_shared<IParentalControlService>(
-        system, capability, system.ResolveCallerProgramId(*process_id));
+    LOG_DEBUG(Service_PCTL, "called");
+    // TODO(ogniK): Get application id from process
+    *out_service = std::make_shared<IParentalControlService>(system, capability);
    R_SUCCEED();
 }

@@ -132,7 +132,8 @@ private:

        LOG_WARNING(Service_PM, "(Partial Implementation) called, pid={:016X}", pid);

-        auto process = kernel.GetProcessByProcessId(pid);
+        auto list = kernel.GetProcessList();
+        auto process = SearchProcessList(system.Kernel(), list, [pid](auto& p) { return p->GetProcessId() == pid; });

        if (process.IsNull()) {
            IPC::ResponseBuilder rb{ctx, 2};
@@ -185,7 +186,9 @@ private:

        LOG_DEBUG(Service_PM, "called, process_id={:016X}", process_id);

-        auto process = kernel.GetProcessByProcessId(process_id);
+        auto list = kernel.GetProcessList();
+        auto process = SearchProcessList(system.Kernel(),
+            list, [process_id](auto& p) { return p->GetProcessId() == process_id; });

        if (process.IsNull()) {
            IPC::ResponseBuilder rb{ctx, 2};
@@ -76,7 +76,7 @@ private:
                  Type, process_id, data1.size(), data2.size());

        const auto& reporter{system.GetReporter()};
-        reporter.SavePlayReport(Type, system.ResolveCallerProgramId(process_id), {data1, data2},
+        reporter.SavePlayReport(Type, system.GetApplicationProcessProgramID(), {data1, data2},
                                process_id);

        IPC::ResponseBuilder rb{ctx, 2};
@@ -98,7 +98,7 @@ private:
                  Type, user_id[1], user_id[0], process_id, data1.size(), data2.size());

        const auto& reporter{system.GetReporter()};
-        reporter.SavePlayReport(Type, system.ResolveCallerProgramId(process_id), {data1, data2},
+        reporter.SavePlayReport(Type, system.GetApplicationProcessProgramID(), {data1, data2},
                                process_id, user_id);

        IPC::ResponseBuilder rb{ctx, 2};
@@ -588,7 +588,12 @@ void LoopProcess(Core::System& system) {
    auto server_manager = std::make_unique<ServerManager>(system);

    auto ro = std::make_shared<RoContext>();
-    server_manager->RegisterNamedService("ldr:ro", std::make_shared<RoInterface>(system, "ldr:ro", ro, NrrKind::User));
+
+    const auto RoInterfaceFactoryForUser = [&, ro] {
+        return std::make_shared<RoInterface>(system, "ldr:ro", ro, NrrKind::User);
+    };
+
+    server_manager->RegisterNamedService("ldr:ro", std::move(RoInterfaceFactoryForUser));
    server_manager->RegisterNamedService("ro:1", std::make_shared<RoInterface>(system, "ro:1", ro, NrrKind::JitPlugin));
    server_manager->RegisterNamedService("ro:dmnt", std::make_shared<IDebugMonitorInterface>(system));
    ServerManager::RunServer(std::move(server_manager));
@@ -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
@@ -166,16 +166,6 @@ Result Container::GetLayerZIndex(u64 layer_id, s32* out_z_index) {
    R_RETURN(VI::ResultNotFound);
 }

-Result Container::SetLayerStackMask(u64 layer_id, u32 layer_stack_mask) {
-    std::scoped_lock lk{m_lock};
-
-    auto* const layer = m_layers.GetLayerById(layer_id);
-    R_UNLESS(layer != nullptr, VI::ResultNotFound);
-
-    m_surface_flinger->SetLayerStackMask(layer->GetConsumerBinderId(), layer_stack_mask);
-    R_SUCCEED();
-}
-
 Result Container::SetLayerIsOverlay(u64 layer_id, bool is_overlay) {
    std::scoped_lock lk{m_lock};

@@ -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
@@ -68,7 +68,6 @@ public:
    Result SetLayerZIndex(u64 layer_id, s32 z_index);
    Result GetLayerZIndex(u64 layer_id, s32* out_z_index);
    Result SetLayerIsOverlay(u64 layer_id, bool is_overlay);
-    Result SetLayerStackMask(u64 layer_id, u32 layer_stack_mask);

    void LinkVsyncEvent(u64 display_id, Event* event);
    void UnlinkVsyncEvent(u64 display_id, Event* event);
@@ -4,15 +4,9 @@
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

-#include <algorithm>
-#include <array>
 #include <random>

-#include "common/assert.h"
-#include "common/logging.h"
-#include "common/scratch_buffer.h"
 #include "core/core.h"
-#include "core/hle/kernel/k_page_group.h"
 #include "core/hle/kernel/k_process.h"
 #include "core/hle/kernel/k_system_resource.h"
 #include "core/hle/service/nvdrv/devices/nvmap.h"
@@ -53,7 +47,7 @@ Result AllocateSharedBufferMemory(std::unique_ptr<Kernel::KPageGroup>* out_page_
        u32* end = system.DeviceMemory().GetPointer<u32>(block.GetAddress() + block.GetSize());

        for (; start < end; start++) {
-            *start = 0x00000000;
+            *start = 0xFF0000FF;
        }
    }

@@ -174,14 +168,7 @@ constexpr u32 SharedBufferBlockLinearWidth = 1280;
 constexpr u32 SharedBufferBlockLinearHeight = 768;
 constexpr u32 SharedBufferBlockLinearStride =
    SharedBufferBlockLinearWidth * SharedBufferBlockLinearBpp;
-
-constexpr u32 SharedBufferNumCaptureSlots = 3;
-constexpr u32 SharedBufferSlotsPerSession = 2;
-constexpr u32 SharedBufferMaxSessions = 2;
-
-constexpr u32 SharedBufferNumSlots =
-    SharedBufferNumCaptureSlots + SharedBufferSlotsPerSession * SharedBufferMaxSessions;
-static_assert(SharedBufferNumSlots <= 16, "Shared buffer pool exceeds the maximum texture count");
+constexpr u32 SharedBufferNumSlots = 7;

 constexpr u32 SharedBufferWidth = 1280;
 constexpr u32 SharedBufferHeight = 720;
@@ -205,52 +192,7 @@ constexpr SharedMemoryPoolLayout SharedBufferPoolLayout = [] {
    return layout;
 }();

-constexpr u32 GetCaptureSlot(CaptureKind kind) {
-    return static_cast<u32>(kind);
-}
-static_assert(static_cast<u32>(CaptureKind::CallerApplet) + 1 == SharedBufferNumCaptureSlots,
-              "Capture slot count does not match CaptureKind");
-
-constexpr u32 GetPresentationSlot(u32 slot_base, u32 index) {
-    return SharedBufferNumCaptureSlots + slot_base + index;
-}
-
-constexpr u32 ColorOpaqueBlackRgba32 = 0xFF000000;
-
-template <typename F>
-void ForEachPoolChunk(Core::System& system, Kernel::KPageGroup& page_group, u64 offset, u64 size,
-                      F&& writer) {
-    Common::ScratchBuffer<u32> scratch;
-    const u64 range_end = offset + size;
-    u64 pool_pos = 0;
-
-    for (auto& block : page_group) {
-        const u64 block_begin = pool_pos;
-        const u64 block_end = block_begin + block.GetSize();
-        pool_pos = block_end;
-
-        if (block_end <= offset) {
-            continue;
-        }
-        if (block_begin >= range_end) {
-            break;
-        }
-
-        const u64 chunk_begin = (std::max)(block_begin, offset);
-        const u64 chunk_end = (std::min)(block_end, range_end);
-        const u64 chunk_size = chunk_end - chunk_begin;
-
-        u8* const dst =
-            system.DeviceMemory().GetPointer<u8>(block.GetAddress()) + (chunk_begin - block_begin);
-
-        writer(dst, chunk_begin - offset, chunk_size);
-
-        system.GPU().Host1x().MemoryManager().ApplyOpOnPointer(
-            dst, scratch, [&](DAddr addr) { system.GPU().InvalidateRegion(addr, chunk_size); });
-    }
-}
-
-void MakeGraphicBuffer(android::BufferQueueProducer& producer, u32 producer_slot, u32 pool_slot, u32 handle) {
+void MakeGraphicBuffer(android::BufferQueueProducer& producer, u32 slot, u32 handle) {
    auto buffer = std::make_shared<android::NvGraphicBuffer>();
    buffer->width = SharedBufferWidth;
    buffer->height = SharedBufferHeight;
@@ -258,8 +200,8 @@ void MakeGraphicBuffer(android::BufferQueueProducer& producer, u32 producer_slot
    buffer->format = SharedBufferBlockLinearFormat;
    buffer->external_format = SharedBufferBlockLinearFormat;
    buffer->buffer_id = handle;
-    buffer->offset = pool_slot * SharedBufferSlotSize;
-    ASSERT(producer.SetPreallocatedBuffer(producer_slot, buffer) == android::Status::NoError);
+    buffer->offset = slot * SharedBufferSlotSize;
+    ASSERT(producer.SetPreallocatedBuffer(slot, buffer) == android::Status::NoError);
 }

 } // namespace
@@ -273,91 +215,59 @@ SharedBufferManager::~SharedBufferManager() = default;
 Result SharedBufferManager::CreateSession(Kernel::KProcess* owner_process, u64* out_buffer_id,
                                          u64* out_layer_handle, u64 display_id,
                                          bool enable_blending) {
-    {
-        std::scoped_lock lk{m_guard};
+    std::scoped_lock lk{m_guard};

-        // Ensure we haven't already created.
-        const u64 aruid = owner_process->GetProcessId();
-        R_UNLESS(!m_sessions.contains(aruid), VI::ResultPermissionDenied);
+    // Ensure we haven't already created.
+    const u64 aruid = owner_process->GetProcessId();
+    R_UNLESS(!m_sessions.contains(aruid), VI::ResultPermissionDenied);

-        // Allocate memory for the shared buffer if needed.
-        if (!m_buffer_page_group) {
-            R_TRY(AllocateSharedBufferMemory(std::addressof(m_buffer_page_group), m_system,
-                                             SharedBufferSize));
+    // Allocate memory for the shared buffer if needed.
+    if (!m_buffer_page_group) {
+        R_TRY(AllocateSharedBufferMemory(std::addressof(m_buffer_page_group), m_system,
+                                         SharedBufferSize));

-            // Record buffer id.
-            m_buffer_id = m_next_buffer_id++;
+        // Record buffer id.
+        m_buffer_id = m_next_buffer_id++;

-            // Record display id.
-            m_display_id = display_id;
-
-            for (u32 slot = 0; slot < SharedBufferNumCaptureSlots; slot++) {
-                ForEachPoolChunk(m_system, *m_buffer_page_group, u64{slot} * SharedBufferSlotSize,
-                                 SharedBufferSlotSize, [](u8* dst, u64, u64 length) {
-                                     std::fill_n(reinterpret_cast<u32*>(dst), length / sizeof(u32),
-                                                 ColorOpaqueBlackRgba32);
-                                 });
-            }
-        }
-
-        // Claim a presentation slot range.
-        u32 slot_base = 0;
-
-        std::array<bool, SharedBufferMaxSessions> in_use{};
-        for (const auto& [existing_aruid, existing] : m_sessions) {
-            const u32 index = existing.presentation_slot_base / SharedBufferSlotsPerSession;
-
-            if (index < in_use.size())
-                in_use[index] = true;
-        }
-
-        u32 index = 0;
-        while (index < in_use.size() && in_use[index])
-            index++;
-
-        if (index >= in_use.size()) {
-            LOG_ERROR(Service_VI, "Out of shared buffer presentation slots ({} sessions)", SharedBufferMaxSessions);
-            R_THROW(VI::ResultOperationFailed);
-        }
-
-        slot_base = index * SharedBufferSlotsPerSession;
-
-        // Map into process.
-        Common::ProcessAddress map_address{};
-        R_TRY(MapSharedBufferIntoProcessAddressSpace(std::addressof(map_address), m_buffer_page_group,
-                                                     owner_process, m_system));
-
-        // Create new session.
-        auto [it, was_emplaced] = m_sessions.emplace(aruid, SharedBufferSession{});
-        auto& session = it->second;
-        session.presentation_slot_base = slot_base;
-
-        auto& container = m_nvdrv->GetContainer();
-        session.session_id = container.OpenSession(owner_process);
-        session.nvmap_fd = m_nvdrv->Open("/dev/nvmap", session.session_id);
-
-        // Create an nvmap handle for the buffer and assign the memory to it.
-        R_TRY(AllocateHandleForBuffer(std::addressof(session.buffer_nvmap_handle), *m_nvdrv,
-                                      session.nvmap_fd, map_address, SharedBufferSize));
-
-        // Create and open a layer for the display.
-        s32 producer_binder_id;
-        R_TRY(m_container.CreateStrayLayer(std::addressof(producer_binder_id),
-                                           std::addressof(session.layer_id), display_id));
-
-        // Configure blending and z-index
-        R_ASSERT(m_container.SetLayerBlending(session.layer_id, enable_blending));
-
-        // Get the producer and set preallocated buffers.
-        std::shared_ptr<android::BufferQueueProducer> producer;
-        R_TRY(m_container.GetLayerProducerHandle(std::addressof(producer), session.layer_id));
-        for (u32 i = 0; i < SharedBufferSlotsPerSession; i++)
-            MakeGraphicBuffer(*producer, i, GetPresentationSlot(session.presentation_slot_base, i), session.buffer_nvmap_handle);
-
-        // Assign outputs.
-        *out_buffer_id = m_buffer_id;
-        *out_layer_handle = session.layer_id;
+        // Record display id.
+        m_display_id = display_id;
    }
+
+    // Map into process.
+    Common::ProcessAddress map_address{};
+    R_TRY(MapSharedBufferIntoProcessAddressSpace(std::addressof(map_address), m_buffer_page_group,
+                                                 owner_process, m_system));
+
+    // Create new session.
+    auto [it, was_emplaced] = m_sessions.emplace(aruid, SharedBufferSession{});
+    auto& session = it->second;
+
+    auto& container = m_nvdrv->GetContainer();
+    session.session_id = container.OpenSession(owner_process);
+    session.nvmap_fd = m_nvdrv->Open("/dev/nvmap", session.session_id);
+
+    // Create an nvmap handle for the buffer and assign the memory to it.
+    R_TRY(AllocateHandleForBuffer(std::addressof(session.buffer_nvmap_handle), *m_nvdrv,
+                                  session.nvmap_fd, map_address, SharedBufferSize));
+
+    // Create and open a layer for the display.
+    s32 producer_binder_id;
+    R_TRY(m_container.CreateStrayLayer(std::addressof(producer_binder_id),
+                                       std::addressof(session.layer_id), display_id));
+
+    // Configure blending and z-index
+    R_ASSERT(m_container.SetLayerBlending(session.layer_id, enable_blending));
+
+    // Get the producer and set preallocated buffers.
+    std::shared_ptr<android::BufferQueueProducer> producer;
+    R_TRY(m_container.GetLayerProducerHandle(std::addressof(producer), session.layer_id));
+    MakeGraphicBuffer(*producer, 0, session.buffer_nvmap_handle);
+    MakeGraphicBuffer(*producer, 1, session.buffer_nvmap_handle);
+
+    // Assign outputs.
+    *out_buffer_id = m_buffer_id;
+    *out_layer_handle = session.layer_id;
+
    // We succeeded.
    R_SUCCEED();
 }
@@ -426,51 +336,14 @@ Result SharedBufferManager::AcquireSharedFrameBuffer(android::Fence* out_fence,
                                     SharedBufferBlockLinearFormat, 0) == android::Status::NoError,
             VI::ResultOperationFailed);

-    out_slot_indexes.fill(-1);
-
-    {
-        std::scoped_lock lk{m_guard};
-        const auto* const session = this->FindSessionByLayerIdLocked(layer_id);
-        if (session == nullptr) {
-            producer->CancelBuffer(slot, *out_fence);
-            // LOG_DEBUG(Service_VI, "No Session found");
-            R_THROW(VI::ResultNotFound);
-        }
-
-        for (u32 i = 0; i < SharedBufferSlotsPerSession; i++)
-            out_slot_indexes[i] =
-                static_cast<s32>(GetPresentationSlot(session->presentation_slot_base, i));
-
-        *out_target_slot = static_cast<s64>(
-            GetPresentationSlot(session->presentation_slot_base, static_cast<u32>(slot)));
-    }
+    // Assign remaining outputs.
+    *out_target_slot = slot;
+    out_slot_indexes = {0, 1, -1, -1};

    // We succeeded.
    R_SUCCEED();
 }

-Result SharedBufferManager::GetProducerSlotLocked(s32* out_producer_slot, u64 layer_id,
-                                                   s64 pool_slot) const {
-    const auto* const session = this->FindSessionByLayerIdLocked(layer_id);
-    R_UNLESS(session != nullptr, VI::ResultNotFound);
-
-    const s64 base = GetPresentationSlot(session->presentation_slot_base, 0);
-    const s64 producer_slot = pool_slot - base;
-    R_UNLESS(producer_slot >= 0 && producer_slot < SharedBufferSlotsPerSession,
-             VI::ResultOperationFailed);
-
-    *out_producer_slot = static_cast<s32>(producer_slot);
-    R_SUCCEED();
-}
-
-const SharedBufferSession* SharedBufferManager::FindSessionByLayerIdLocked(u64 layer_id) const {
-    for (const auto& [aruid, session] : m_sessions)
-        if (session.layer_id == layer_id)
-            return std::addressof(session);
-
-    return nullptr;
-}
-
 Result SharedBufferManager::PresentSharedFrameBuffer(android::Fence fence,
                                                     Common::Rectangle<s32> crop_region,
                                                     u32 transform, s32 swap_interval, u64 layer_id,
@@ -479,20 +352,14 @@ Result SharedBufferManager::PresentSharedFrameBuffer(android::Fence fence,
    std::shared_ptr<android::BufferQueueProducer> producer;
    R_TRY(m_container.GetLayerProducerHandle(std::addressof(producer), layer_id));

-    s32 producer_slot;
-    {
-        std::scoped_lock lk{m_guard};
-        R_TRY(this->GetProducerSlotLocked(std::addressof(producer_slot), layer_id, slot));
-    }
-
    // Request to queue the buffer.
    std::shared_ptr<android::GraphicBuffer> buffer;
-    R_UNLESS(producer->RequestBuffer(producer_slot, std::addressof(buffer)) ==
+    R_UNLESS(producer->RequestBuffer(static_cast<s32>(slot), std::addressof(buffer)) ==
                 android::Status::NoError,
             VI::ResultOperationFailed);

    ON_RESULT_FAILURE {
-        producer->CancelBuffer(producer_slot, fence);
+        producer->CancelBuffer(static_cast<s32>(slot), fence);
    };

    // Queue the buffer to the producer.
@@ -502,10 +369,12 @@ Result SharedBufferManager::PresentSharedFrameBuffer(android::Fence fence,
    input.fence = fence;
    input.transform = static_cast<android::NativeWindowTransform>(transform);
    input.swap_interval = swap_interval;
-    R_UNLESS(producer->QueueBuffer(producer_slot, input, std::addressof(output)) ==
+    R_UNLESS(producer->QueueBuffer(static_cast<s32>(slot), input, std::addressof(output)) ==
                 android::Status::NoError,
             VI::ResultOperationFailed);

+    (void)m_container.SetLayerZIndex(layer_id, 100000);
+
    // We succeeded.
    R_SUCCEED();
 }
@@ -515,14 +384,8 @@ Result SharedBufferManager::CancelSharedFrameBuffer(u64 layer_id, s64 slot) {
    std::shared_ptr<android::BufferQueueProducer> producer;
    R_TRY(m_container.GetLayerProducerHandle(std::addressof(producer), layer_id));

-    s32 producer_slot;
-    {
-        std::scoped_lock lk{m_guard};
-        R_TRY(this->GetProducerSlotLocked(std::addressof(producer_slot), layer_id, slot));
-    }
-
    // Cancel.
-    producer->CancelBuffer(producer_slot, android::Fence::NoFence());
+    producer->CancelBuffer(static_cast<s32>(slot), android::Fence::NoFence());

    // We succeeded.
    R_SUCCEED();
@@ -541,47 +404,31 @@ Result SharedBufferManager::GetSharedFrameBufferAcquirableEvent(Kernel::KReadabl
    R_SUCCEED();
 }

-Result SharedBufferManager::WriteAppletCaptureBuffer(bool* out_was_written, s32* out_layer_index, CaptureKind kind) {
-    std::scoped_lock lk{m_guard};
-    R_UNLESS(m_buffer_page_group != nullptr, VI::ResultNotFound);
+Result SharedBufferManager::WriteAppletCaptureBuffer(bool* out_was_written, s32* out_layer_index) {
+    std::vector<u8> capture_buffer(m_system.GPU().GetAppletCaptureBuffer());
+    Common::ScratchBuffer<u32> scratch;

-    const std::vector<u8> capture = m_system.GPU().GetAppletCaptureBuffer();
-    const u32 slot = GetCaptureSlot(kind);
+    // TODO: this could be optimized
+    s64 e = -1280 * 768 * 4;
+    for (auto& block : *m_buffer_page_group) {
+        u8* start = m_system.DeviceMemory().GetPointer<u8>(block.GetAddress());
+        u8* end = m_system.DeviceMemory().GetPointer<u8>(block.GetAddress() + block.GetSize());

-    if (capture.size() < SharedBufferSlotSize) {
-        //LOG_WARNING(Service_VI, "Capture buffer is {} bytes, expected at least {}; not writing",
-        //            capture.size(), SharedBufferSlotSize);
-        *out_was_written = false;
-        *out_layer_index = static_cast<s32>(slot);
-        R_SUCCEED();
+        for (; start < end; start++) {
+            *start = 0;
+            if (e >= 0 && e < static_cast<s64>(capture_buffer.size())) {
+                *start = capture_buffer[e];
+            }
+            e++;
+        }
+
+        m_system.GPU().Host1x().MemoryManager().ApplyOpOnPointer(start, scratch, [&](DAddr addr) {
+            m_system.GPU().InvalidateRegion(addr, end - start);
+        });
    }

-    ForEachPoolChunk(m_system, *m_buffer_page_group, u64{slot} * SharedBufferSlotSize,
-                     SharedBufferSlotSize,
-                     [&](u8* dst, u64 src_offset, u64 length) {
-                         std::memcpy(dst, capture.data() + src_offset, length);
-                     });
-
    *out_was_written = true;
-    *out_layer_index = static_cast<s32>(slot);
-    R_SUCCEED();
-}
-
-Result SharedBufferManager::ClearAppletCaptureBuffer(s32 layer_index, u32 color) {
-    std::scoped_lock lk{m_guard};
-    R_UNLESS(m_buffer_page_group != nullptr, VI::ResultNotFound);
-
-    if (layer_index < 0 || layer_index >= static_cast<s32>(SharedBufferNumCaptureSlots)) {
-        LOG_WARNING(Service_VI, "Couldnt clear non-capture slot {}", layer_index);
-        R_SUCCEED();
-    }
-
-    ForEachPoolChunk(m_system, *m_buffer_page_group, u64{static_cast<u32>(layer_index)} * SharedBufferSlotSize,
-                     SharedBufferSlotSize, [&](u8* dst, u64 src_offset, u64 length) {
-                         ASSERT(src_offset % sizeof(u32) == 0 && length % sizeof(u32) == 0);
-                         std::fill_n(reinterpret_cast<u32*>(dst), length / sizeof(u32), color);
-                     });
-
+    *out_layer_index = 1;
    R_SUCCEED();
 }

@@ -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
@@ -48,12 +48,6 @@ static_assert(sizeof(SharedMemoryPoolLayout) == 0x188, "SharedMemoryPoolLayout h

 struct SharedBufferSession;

-enum class CaptureKind : u32 {
-    LastApplication,
-    LastForeground,
-    CallerApplet,
-};
-
 class SharedBufferManager final {
 public:
    explicit SharedBufferManager(Core::System& system, Container& container,
@@ -74,15 +68,9 @@ public:
    Result CancelSharedFrameBuffer(u64 layer_id, s64 slot);
    Result GetSharedFrameBufferAcquirableEvent(Kernel::KReadableEvent** out_event, u64 layer_id);

-    Result WriteAppletCaptureBuffer(bool* out_was_written, s32* out_layer_index, CaptureKind kind);
-    Result ClearAppletCaptureBuffer(s32 layer_index, u32 color);
+    Result WriteAppletCaptureBuffer(bool* out_was_written, s32* out_layer_index);

 private:
-    const SharedBufferSession* FindSessionByLayerIdLocked(u64 layer_id) const;
-
-    /// Converts a pool slot index, which is what the guest works in, back to the buffer queues slot index
-    Result GetProducerSlotLocked(s32* out_producer_slot, u64 layer_id, s64 pool_slot) const;
-
    u64 m_next_buffer_id = 1;
    u64 m_display_id = 0;
    u64 m_buffer_id = 0;
@@ -101,7 +89,6 @@ struct SharedBufferSession {
    Nvidia::NvCore::SessionId session_id = {};
    u64 layer_id = {};
    u32 buffer_nvmap_handle = 0;
-    u32 presentation_slot_base = 0;
 };

 } // namespace Service::VI
@@ -209,10 +209,7 @@ std::optional<VAddr> AppLoader_NSO::LoadModule(Kernel::KProcess& process, Core::

    // Apply cheats if they exist and the program has a valid title ID
    if (pm) {
-        // TODO(Maufeat): Check if there is a better way to check
-        if (name == "main")
-            system.SetApplicationProcessBuildID(nso_header.build_id);
-
+        system.SetApplicationProcessBuildID(nso_header.build_id);
        const auto cheats = pm->CreateCheatList(nso_header.build_id);
        if (!cheats.empty()) {
            system.RegisterCheatList(cheats, nso_header.build_id, load_base, image_size);
@@ -51,41 +51,24 @@ StandardVmCallbacks::StandardVmCallbacks(System& system_, const CheatProcessMeta

 StandardVmCallbacks::~StandardVmCallbacks() = default;

-Kernel::KProcess* StandardVmCallbacks::GetProcess() const {
-    if (cached_process != nullptr && cached_process_id == metadata.process_id) {
-        return cached_process;
-    }
-
-    auto process = system.Kernel().GetProcessByProcessId(metadata.process_id);
-    cached_process = process.IsNull() ? nullptr : process.GetPointerUnsafe();
-    cached_process_id = metadata.process_id;
-    return cached_process;
-}
-
 void StandardVmCallbacks::MemoryReadUnsafe(VAddr address, void* data, u64 size) {
-    auto* const process = this->GetProcess();
-
    // Return zero on invalid address
-    if (process == nullptr || !IsAddressInRange(address) ||
-        !process->GetMemory().IsValidVirtualAddress(address)) {
+    if (!IsAddressInRange(address) || !system.ApplicationMemory().IsValidVirtualAddress(address)) {
        std::memset(data, 0, size);
        return;
    }

-    process->GetMemory().ReadBlock(address, data, size);
+    system.ApplicationMemory().ReadBlock(address, data, size);
 }

 void StandardVmCallbacks::MemoryWriteUnsafe(VAddr address, const void* data, u64 size) {
-    auto* const process = this->GetProcess();
-
    // Skip invalid memory write address
-    if (process == nullptr || !IsAddressInRange(address) ||
-        !process->GetMemory().IsValidVirtualAddress(address)) {
+    if (!IsAddressInRange(address) || !system.ApplicationMemory().IsValidVirtualAddress(address)) {
        return;
    }

-    if (process->GetMemory().WriteBlock(address, data, size)) {
-        Core::InvalidateInstructionCacheRange(process, address, size);
+    if (system.ApplicationMemory().WriteBlock(address, data, size)) {
+        Core::InvalidateInstructionCacheRange(system.ApplicationProcess(), address, size);
    }
 }

@@ -108,16 +91,14 @@ u64 StandardVmCallbacks::HidKeysDown() {
 }

 void StandardVmCallbacks::PauseProcess() {
-    auto* const process = this->GetProcess();
-    if (process != nullptr && !process->IsSuspended()) {
-        process->SetActivity(system.Kernel(), Kernel::Svc::ProcessActivity::Paused);
+    if (!system.ApplicationProcess()->IsSuspended()) {
+        system.ApplicationProcess()->SetActivity(system.Kernel(), Kernel::Svc::ProcessActivity::Paused);
    }
 }

 void StandardVmCallbacks::ResumeProcess() {
-    auto* const process = this->GetProcess();
-    if (process != nullptr && process->IsSuspended()) {
-        process->SetActivity(system.Kernel(), Kernel::Svc::ProcessActivity::Runnable);
+    if (system.ApplicationProcess()->IsSuspended()) {
+        system.ApplicationProcess()->SetActivity(system.Kernel(), Kernel::Svc::ProcessActivity::Runnable);
    }
 }

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

@@ -18,10 +15,6 @@ namespace Core {
 class System;
 }

-namespace Kernel {
-class KProcess;
-}
-
 namespace Core::Timing {
 class CoreTiming;
 struct EventType;
@@ -45,12 +38,8 @@ public:
 private:
    bool IsAddressInRange(VAddr address) const;

-    Kernel::KProcess* GetProcess() const;
-
    const CheatProcessMetadata& metadata;
    Core::System& system;
-    mutable Kernel::KProcess* cached_process{};
-    mutable u64 cached_process_id{};
 };

 // Intermediary class that parses a text file or other disk format for storing cheats into a
@@ -239,7 +239,7 @@ void Reporter::SaveUnimplementedFunctionReport(Service::HLERequestContext& ctx,
    const auto title_id = system.GetApplicationProcessProgramID();
    auto out = GetFullDataAuto(timestamp, title_id, system);

-    auto function_out = GetHLERequestContextData(ctx, ctx.GetMemory());
+    auto function_out = GetHLERequestContextData(ctx, system.ApplicationMemory());
    function_out["command_id"] = command_id;
    function_out["function_name"] = name;
    function_out["service_name"] = service_name;
@@ -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

@@ -65,9 +62,8 @@ void HidbusBase::DisablePollingMode() {
    polling_mode_enabled = false;
 }

-void HidbusBase::SetTransferMemoryAddress(Common::ProcessAddress t_mem, Kernel::KProcess* owner) {
+void HidbusBase::SetTransferMemoryAddress(Common::ProcessAddress t_mem) {
    transfer_memory = t_mem;
-    transfer_memory_owner = owner;
 }

 Kernel::KReadableEvent& HidbusBase::GetSendCommandAsycEvent() const {
@@ -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

@@ -17,7 +14,6 @@ class System;

 namespace Kernel {
 class KEvent;
-class KProcess;
 class KReadableEvent;
 } // namespace Kernel

@@ -142,7 +138,7 @@ public:
    void DisablePollingMode();

    // Called on EnableJoyPollingReceiveMode
-    void SetTransferMemoryAddress(Common::ProcessAddress t_mem, Kernel::KProcess* owner);
+    void SetTransferMemoryAddress(Common::ProcessAddress t_mem);

    Kernel::KReadableEvent& GetSendCommandAsycEvent() const;

@@ -179,7 +175,6 @@ protected:
    ButtonOnlyPollingDataAccessor button_only_data{};

    Common::ProcessAddress transfer_memory{};
-    Kernel::KProcess* transfer_memory_owner{};

    Core::System& system;
    Kernel::KEvent* send_command_async_event;
@@ -6,7 +6,6 @@

 #include "core/core.h"
 #include "core/hle/kernel/k_event.h"
-#include "core/hle/kernel/k_process.h"
 #include "core/hle/kernel/k_readable_event.h"
 #include "core/memory.h"
 #include "hid_core/frontend/emulated_controller.h"
@@ -68,10 +67,8 @@ void RingController::OnUpdate() {
        curr_entry.polling_data.out_size = sizeof(ringcon_value);
        std::memcpy(curr_entry.polling_data.data.data(), &ringcon_value, sizeof(ringcon_value));

-        if (transfer_memory_owner != nullptr) {
-            transfer_memory_owner->GetMemory().WriteBlock(transfer_memory, &enable_sixaxis_data,
-                                                          sizeof(enable_sixaxis_data));
-        }
+        system.ApplicationMemory().WriteBlock(transfer_memory, &enable_sixaxis_data,
+                                              sizeof(enable_sixaxis_data));
        break;
    }
    default:
@@ -1,11 +1,10 @@
-// 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 2022 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

 #include "core/core.h"
-#include "core/hle/kernel/k_process.h"
 #include "core/memory.h"
 #include "hid_core/frontend/emulated_controller.h"
 #include "hid_core/hid_core.h"
@@ -49,12 +48,10 @@ void ImageTransferProcessor::OnControllerUpdate(Core::HID::ControllerTriggerType
    if (type != Core::HID::ControllerTriggerType::IrSensor) {
        return;
    }
-    if (transfer_memory == 0 || transfer_memory_owner == nullptr) {
+    if (transfer_memory == 0) {
        return;
    }

-    auto& memory = transfer_memory_owner->GetMemory();
-
    const auto& camera_data = npad_device->GetCamera();

    // This indicates how much ambient light is present
@@ -64,14 +61,16 @@ void ImageTransferProcessor::OnControllerUpdate(Core::HID::ControllerTriggerType
    if (camera_data.format != current_config.origin_format) {
        LOG_WARNING(Service_IRS, "Wrong Input format {} expected {}", camera_data.format,
                    current_config.origin_format);
-        memory.ZeroBlock(transfer_memory, GetDataSize(current_config.trimming_format));
+        system.ApplicationMemory().ZeroBlock(transfer_memory,
+                                             GetDataSize(current_config.trimming_format));
        return;
    }

    if (current_config.origin_format > current_config.trimming_format) {
        LOG_WARNING(Service_IRS, "Origin format {} is smaller than trimming format {}",
                    current_config.origin_format, current_config.trimming_format);
-        memory.ZeroBlock(transfer_memory, GetDataSize(current_config.trimming_format));
+        system.ApplicationMemory().ZeroBlock(transfer_memory,
+                                             GetDataSize(current_config.trimming_format));
        return;
    }

@@ -88,7 +87,8 @@ void ImageTransferProcessor::OnControllerUpdate(Core::HID::ControllerTriggerType
                    "Trimming area ({}, {}, {}, {}) is outside of origin area ({}, {})",
                    current_config.trimming_start_x, current_config.trimming_start_y,
                    trimming_width, trimming_height, origin_width, origin_height);
-        memory.ZeroBlock(transfer_memory, GetDataSize(current_config.trimming_format));
+        system.ApplicationMemory().ZeroBlock(transfer_memory,
+                                             GetDataSize(current_config.trimming_format));
        return;
    }

@@ -102,8 +102,8 @@ void ImageTransferProcessor::OnControllerUpdate(Core::HID::ControllerTriggerType
        }
    }

-    memory.WriteBlock(transfer_memory, window_data.data(),
-                      GetDataSize(current_config.trimming_format));
+    system.ApplicationMemory().WriteBlock(transfer_memory, window_data.data(),
+                                          GetDataSize(current_config.trimming_format));

    if (!IsProcessorActive()) {
        StartProcessor();
@@ -143,19 +143,14 @@ void ImageTransferProcessor::SetConfig(
    npad_device->SetCameraFormat(current_config.origin_format);
 }

-void ImageTransferProcessor::SetTransferMemoryAddress(Common::ProcessAddress t_mem,
-                                                      Kernel::KProcess* owner) {
+void ImageTransferProcessor::SetTransferMemoryAddress(Common::ProcessAddress t_mem) {
    transfer_memory = t_mem;
-    transfer_memory_owner = owner;
 }

 Core::IrSensor::ImageTransferProcessorState ImageTransferProcessor::GetState(
    std::span<u8> data) const {
-    if (transfer_memory_owner == nullptr)
-        return processor_state;
-
    const auto size = (std::min)(GetDataSize(current_config.trimming_format), data.size());
-    transfer_memory_owner->GetMemory().ReadBlock(transfer_memory, data.data(), size);
+    system.ApplicationMemory().ReadBlock(transfer_memory, data.data(), size);
    return processor_state;
 }

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

@@ -12,10 +9,6 @@
 #include "hid_core/irsensor/irs_types.h"
 #include "hid_core/irsensor/processor_base.h"

-namespace Kernel {
-class KProcess;
-}
-
 namespace Core {
 class System;
 }
@@ -46,7 +39,7 @@ public:
    void SetConfig(Core::IrSensor::PackedImageTransferProcessorExConfig config);

    // Transfer memory where the image data will be stored
-    void SetTransferMemoryAddress(Common::ProcessAddress t_mem, Kernel::KProcess* owner);
+    void SetTransferMemoryAddress(Common::ProcessAddress t_mem);

    Core::IrSensor::ImageTransferProcessorState GetState(std::span<u8> data) const;

@@ -82,6 +75,5 @@ private:

    Core::System& system;
    Common::ProcessAddress transfer_memory{};
-    Kernel::KProcess* transfer_memory_owner{};
 };
 } // namespace Service::IRS
@@ -1,6 +1,3 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later

@@ -9,7 +6,6 @@
 #include "core/core.h"
 #include "core/core_timing.h"
 #include "core/frontend/emu_window.h"
-#include "core/hle/kernel/k_process.h"
 #include "core/memory.h"
 #include "hid_core/frontend/emulated_console.h"
 #include "hid_core/frontend/emulated_devices.h"
@@ -28,7 +24,7 @@ void SevenSixAxis::OnInit() {}
 void SevenSixAxis::OnRelease() {}

 void SevenSixAxis::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
-    if (!IsControllerActivated() || transfer_memory == 0 || transfer_memory_owner == nullptr) {
+    if (!IsControllerActivated() || transfer_memory == 0) {
        seven_sixaxis_lifo.buffer_count = 0;
        seven_sixaxis_lifo.buffer_tail = 0;
        return;
@@ -55,13 +51,12 @@ void SevenSixAxis::OnUpdate(const Core::Timing::CoreTiming& core_timing) {
    };

    seven_sixaxis_lifo.WriteNextEntry(next_seven_sixaxis_state);
-    transfer_memory_owner->GetMemory().WriteBlock(transfer_memory, &seven_sixaxis_lifo,
-                                                  sizeof(seven_sixaxis_lifo));
+    system.ApplicationMemory().WriteBlock(transfer_memory, &seven_sixaxis_lifo,
+                                          sizeof(seven_sixaxis_lifo));
 }

-void SevenSixAxis::SetTransferMemoryAddress(Common::ProcessAddress t_mem, Kernel::KProcess* owner) {
+void SevenSixAxis::SetTransferMemoryAddress(Common::ProcessAddress t_mem) {
    transfer_memory = t_mem;
-    transfer_memory_owner = owner;
 }

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

@@ -12,10 +9,6 @@
 #include "hid_core/resources/controller_base.h"
 #include "hid_core/resources/ring_lifo.h"

-namespace Kernel {
-class KProcess;
-}
-
 namespace Core {
 class System;
 } // namespace Core
@@ -40,7 +33,7 @@ public:
    void OnUpdate(const Core::Timing::CoreTiming& core_timing) override;

    // Called on InitializeSevenSixAxisSensor
-    void SetTransferMemoryAddress(Common::ProcessAddress t_mem, Kernel::KProcess* owner);
+    void SetTransferMemoryAddress(Common::ProcessAddress t_mem);

    // Called on ResetSevenSixAxisSensorTimestamp
    void ResetTimestamp();
@@ -65,7 +58,6 @@ private:

    SevenSixAxisState next_seven_sixaxis_state{};
    Common::ProcessAddress transfer_memory{};
-    Kernel::KProcess* transfer_memory_owner{};
    Core::HID::EmulatedConsole* console = nullptr;

    Core::System& system;
@@ -548,18 +548,8 @@ void TouchResource::OnTouchUpdate(s64 timestamp) {
            }

            auto& touch_shared = applet_data->shared_memory_format->touch_screen;
-
-            if (applet_data->flag.enable_touchscreen) {
-                StorePreviousTouchState(previous_touch_state, data.finger_map, current_touch_state, true);
-                touch_shared.touch_screen_lifo.WriteNextEntry(current_touch_state);
-            } else {
-                TouchScreenState denied{};
-                denied.sampling_number = current_touch_state.sampling_number;
-                denied.entry_count = 0;
-                data.finger_map.finger_count = 0;
-                data.finger_map.finger_ids = {};
-                touch_shared.touch_screen_lifo.WriteNextEntry(denied);
-            }
+            StorePreviousTouchState(previous_touch_state, data.finger_map, current_touch_state, bool(applet_data->flag.enable_touchscreen));
+            touch_shared.touch_screen_lifo.WriteNextEntry(current_touch_state);
        }
    }
 }
@@ -522,9 +522,6 @@ std::unique_ptr<ComboboxTranslationMap> ComboboxEnumeration(QObject* parent) {
                              PAIR(AnisotropyMode, X4, tr("4x")),
                              PAIR(AnisotropyMode, X8, tr("8x")),
                              PAIR(AnisotropyMode, X16, tr("16x")),
-                              PAIR(AnisotropyMode, X32, tr("32x")),
-                              PAIR(AnisotropyMode, X64, tr("64x")),
-                              PAIR(AnisotropyMode, None, tr("None")),
                          }});
    translations->insert(
        {Settings::EnumMetadata<Settings::Language>::Index(),
@@ -51,18 +51,7 @@ void EmuThread::run() {
            QtCommon::system->Run();
            m_stopped.Reset();

-            m_should_run_cv.wait(lk, stop_token, [&] {
-                return !m_should_run || m_pending_shader_cache_title.has_value();
-            });
-
-            if (m_should_run && m_pending_shader_cache_title.has_value()) {
-                const u64 program_id = *m_pending_shader_cache_title;
-                m_pending_shader_cache_title.reset();
-
-                lk.unlock();
-                this->ReloadDiskShaderCache(program_id);
-                lk.lock();
-            }
+            m_should_run_cv.wait(lk, stop_token, [&] { return !m_should_run; });
        } else {
            QtCommon::system->Pause();
            m_stopped.Set();
@@ -78,32 +67,6 @@ void EmuThread::run() {
    QtCommon::system->ShutdownMainProcess();
 }

-void EmuThread::ReloadDiskShaderCache(u64 program_id) {
-    if (!Settings::values.use_disk_shader_cache.GetValue()) {
-        return;
-    }
-
-    LOG_INFO(Frontend, "Reloading disk shader cache for {:016X}", program_id);
-
-    auto& system = *QtCommon::system;
-    auto& gpu = system.GPU();
-
-    system.Pause();
-    gpu.WaitForIdle();
-    gpu.ObtainContext();
-
-    emit ShaderCacheReloadStarted();
-    emit LoadProgress(VideoCore::LoadCallbackStage::Prepare, 0, 0);
-    system.Renderer().ReadRasterizer()->LoadDiskResources(program_id, m_stop_source.get_token(),
-        [this](VideoCore::LoadCallbackStage stage, std::size_t value, std::size_t total) {
-            emit LoadProgress(stage, value, total);
-        });
-    emit LoadProgress(VideoCore::LoadCallbackStage::Complete, 0, 0);
-    emit ShaderCacheReloadFinished();
-
-    gpu.ReleaseContext();
-}
-
 // Unlock while emitting signals so that the main thread can
 // continue pumping events.

@@ -3,10 +3,7 @@

 #pragma once

-#include <optional>
-
 #include <QThread>
-#include "common/common_types.h"
 #include "common/logging.h"
 #include "common/thread.h"

@@ -66,19 +63,9 @@ public:
        m_stop_source.request_stop();
    }

-    /**
-     * Requests that the disk shader cache be reloaded for a different title.
-     */
-    void RequestDiskShaderCacheReload(u64 program_id) {
-        std::unique_lock run_lk{m_should_run_mutex};
-        m_pending_shader_cache_title = program_id;
-        m_should_run_cv.notify_one();
-    }
-
 private:
    void EmulationPaused(std::unique_lock<std::mutex>& lk);
    void EmulationResumed(std::unique_lock<std::mutex>& lk);
-    void ReloadDiskShaderCache(u64 program_id);

 private:
    std::stop_source m_stop_source;
@@ -86,7 +73,6 @@ private:
    std::condition_variable_any m_should_run_cv;
    Common::Event m_stopped;
    bool m_should_run{true};
-    std::optional<u64> m_pending_shader_cache_title;

 signals:
    /**
@@ -108,7 +94,4 @@ signals:
    void DebugModeLeft();

    void LoadProgress(VideoCore::LoadCallbackStage stage, std::size_t value, std::size_t total);
-
-    void ShaderCacheReloadStarted();
-    void ShaderCacheReloadFinished();
 };
@@ -335,7 +335,7 @@ void SetupDenormControl(const Profile& profile, const IR::Program& program, Emit
    if (info.uses_fp32_denorms_flush && info.uses_fp32_denorms_preserve) {
        LOG_DEBUG(Shader_SPIRV, "Fp32 denorm flush and preserve on the same shader");
    } else if (info.uses_fp32_denorms_flush) {
-        if (profile.support_fp32_denorm_flush) {
+        if (profile.support_fp32_denorm_flush && !profile.has_broken_fp32_denorm_flush) {
            ctx.AddCapability(spv::Capability::DenormFlushToZero);
            ctx.AddExecutionMode(main_func, spv::ExecutionMode::DenormFlushToZero, 32U);
        } else {
@@ -86,6 +86,8 @@ struct Profile {
    bool has_broken_signed_operations{};
    /// Float controls break when fp16 is enabled
    bool has_broken_fp16_float_controls{};
+    /// Declaring fp32 denorm flush to zero miscompiles on some drivers
+    bool has_broken_fp32_denorm_flush{};
    /// Dynamic vec4 indexing is broken on some OpenGL drivers
    bool has_gl_component_indexing_bug{};
    /// The precise type qualifier is broken in the fragment stage of some drivers
@@ -1,35 +1,11 @@
-// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
-// SPDX-License-Identifier: GPL-3.0-or-later
-
 // SPDX-FileCopyrightText: Copyright 2024 yuzu Emulator Project
 // SPDX-License-Identifier: GPL-2.0-or-later

-#include <algorithm>
-
 #include "common/assert.h"
 #include "video_core/framebuffer_config.h"

 namespace Tegra {

-std::span<const FramebufferConfig> FilterLayerStack(
-    std::span<const FramebufferConfig> layers, Service::Nvnflinger::LayerStackId stack,
-    std::vector<FramebufferConfig>& scratch) {
-    const u32 bit = Service::Nvnflinger::LayerStackBit(stack);
-
-    if (std::ranges::all_of(layers,
-                            [bit](const auto& layer) { return (layer.layer_stack_mask & bit) != 0; }))
-        return layers;
-
-    scratch.clear();
-    for (const auto& layer : layers) {
-        if ((layer.layer_stack_mask & bit) != 0) {
-            scratch.push_back(layer);
-        }
-    }
-
-    return scratch;
-}
-
 Common::Rectangle<f32> NormalizeCrop(const FramebufferConfig& framebuffer, u32 texture_width,
                                     u32 texture_height) {
    f32 left, top, right, bottom;
@@ -1,18 +1,11 @@
-// 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

 #pragma once

-#include <span>
-#include <vector>
-
 #include "common/common_types.h"
 #include "common/math_util.h"
 #include "core/hle/service/nvnflinger/buffer_transform_flags.h"
-#include "core/hle/service/nvnflinger/hwc_layer.h"
 #include "core/hle/service/nvnflinger/pixel_format.h"
 #include "core/hle/service/nvnflinger/ui/fence.h"

@@ -37,17 +30,9 @@ struct FramebufferConfig {
    Service::android::BufferTransformFlags transform_flags{};
    Common::Rectangle<int> crop_rect{};
    BlendMode blending{};
-    u32 layer_stack_mask{Service::Nvnflinger::DefaultLayerStackMask};
 };

 Common::Rectangle<f32> NormalizeCrop(const FramebufferConfig& framebuffer, u32 texture_width,
                                     u32 texture_height);

-/**
- * Returns the subset of layers belonging to a stack.
- */
-std::span<const FramebufferConfig> FilterLayerStack(std::span<const FramebufferConfig> layers,
-                                                    Service::Nvnflinger::LayerStackId stack,
-                                                    std::vector<FramebufferConfig>& scratch);
-
 } // namespace Tegra
@@ -144,12 +144,6 @@ struct GPU::Impl {
        sync_request_cv.wait(lck, [this, fence] { return CurrentSyncRequestFence() >= fence; });
    }

-    void WaitForIdle() {
-        const u64 fence = RequestSyncOperation([] {});
-        gpu_thread.TickGPU(is_async);
-        WaitForSyncOperation(fence);
-    }
-
    /// Tick pending requests within the GPU.
    void TickWork() {
        std::unique_lock lck{sync_request_mutex};
@@ -490,10 +484,6 @@ void GPU::NotifyShutdown() {
    impl->NotifyShutdown();
 }

-void GPU::WaitForIdle() {
-    impl->WaitForIdle();
-}
-
 void GPU::ObtainContext() {
    impl->ObtainContext();
 }
@@ -168,8 +168,6 @@ public:

    void WaitForSyncOperation(u64 fence);

-    void WaitForIdle();
-
    /// Tick pending requests within the GPU.
    void TickWork();

@@ -18,6 +18,7 @@ set(SHADER_FILES
    ${CMAKE_CURRENT_SOURCE_DIR}/blit_color_float.frag
    ${CMAKE_CURRENT_SOURCE_DIR}/block_linear_unswizzle_2d.comp
    ${CMAKE_CURRENT_SOURCE_DIR}/blit_color_msaa.frag
+    ${CMAKE_CURRENT_SOURCE_DIR}/blit_depth.frag
    ${CMAKE_CURRENT_SOURCE_DIR}/blit_depth_msaa.frag
    ${CMAKE_CURRENT_SOURCE_DIR}/blit_depth_stencil_msaa.frag
    ${CMAKE_CURRENT_SOURCE_DIR}/block_linear_unswizzle_3d.comp
@@ -30,8 +31,12 @@ set(SHADER_FILES
    ${CMAKE_CURRENT_SOURCE_DIR}/convert_float_to_depth.frag
    ${CMAKE_CURRENT_SOURCE_DIR}/convert_msaa_to_non_msaa.comp
    ${CMAKE_CURRENT_SOURCE_DIR}/convert_msaa_to_non_msaa.frag
+    ${CMAKE_CURRENT_SOURCE_DIR}/convert_msaa_to_non_msaa_depth.frag
+    ${CMAKE_CURRENT_SOURCE_DIR}/convert_msaa_to_non_msaa_depth_stencil.frag
    ${CMAKE_CURRENT_SOURCE_DIR}/convert_non_msaa_to_msaa.comp
    ${CMAKE_CURRENT_SOURCE_DIR}/convert_non_msaa_to_msaa.frag
+    ${CMAKE_CURRENT_SOURCE_DIR}/convert_non_msaa_to_msaa_depth.frag
+    ${CMAKE_CURRENT_SOURCE_DIR}/convert_non_msaa_to_msaa_depth_stencil.frag
    ${CMAKE_CURRENT_SOURCE_DIR}/convert_s8d24_to_abgr8.frag
    ${CMAKE_CURRENT_SOURCE_DIR}/full_screen_triangle.vert
    ${CMAKE_CURRENT_SOURCE_DIR}/fxaa.frag
@@ -163,6 +168,44 @@ foreach(SOURCE_FILE IN ITEMS ${SHADER_FILES})
    endif()
 endforeach()

+# Integer variants of the MSAA conversion shaders. They only differ from the float
+# source in the sampler and output types, so they are generated from it via defines.
+set(SHADER_TYPE_VARIANTS
+    "convert_msaa_to_non_msaa.frag|sint|isampler2DMS|ivec4"
+    "convert_msaa_to_non_msaa.frag|uint|usampler2DMS|uvec4"
+    "convert_non_msaa_to_msaa.frag|sint|isampler2D|ivec4"
+    "convert_non_msaa_to_msaa.frag|uint|usampler2D|uvec4"
+)
+
+foreach(VARIANT IN ITEMS ${SHADER_TYPE_VARIANTS})
+    string(REPLACE "|" ";" VARIANT_PARTS ${VARIANT})
+    list(GET VARIANT_PARTS 0 VARIANT_FILENAME)
+    list(GET VARIANT_PARTS 1 VARIANT_SUFFIX)
+    list(GET VARIANT_PARTS 2 VARIANT_SAMPLER)
+    list(GET VARIANT_PARTS 3 VARIANT_TEXEL)
+
+    set(VARIANT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/${VARIANT_FILENAME})
+    get_filename_component(VARIANT_STEM ${VARIANT_FILENAME} NAME_WE)
+    get_filename_component(VARIANT_EXT ${VARIANT_FILENAME} EXT)
+    string(REPLACE "." "" VARIANT_EXT ${VARIANT_EXT})
+    set(VARIANT_NAME ${VARIANT_STEM}_${VARIANT_SUFFIX}_${VARIANT_EXT})
+
+    string(TOUPPER ${VARIANT_NAME}_SPV VARIANT_VARIABLE_NAME)
+    set(VARIANT_HEADER_FILE ${SHADER_DIR}/${VARIANT_NAME}_spv.h)
+    add_custom_command(
+        OUTPUT
+            ${VARIANT_HEADER_FILE}
+        COMMAND
+            ${GLSLANGVALIDATOR} -V ${QUIET_FLAG} -I"${FIDELITYFX_INCLUDE_DIR}" ${GLSL_FLAGS}
+            -DSAMPLER_TYPE=${VARIANT_SAMPLER} -DTEXEL_TYPE=${VARIANT_TEXEL}
+            --variable-name ${VARIANT_VARIABLE_NAME} -o ${VARIANT_HEADER_FILE} ${VARIANT_SOURCE}
+            --target-env ${SPIR_V_VERSION}
+        MAIN_DEPENDENCY
+            ${VARIANT_SOURCE}
+    )
+    set(SHADER_HEADERS ${SHADER_HEADERS} ${VARIANT_HEADER_FILE})
+endforeach()
+
 foreach(FILEPATH IN ITEMS ${FIDELITYFX_FILES})
    get_filename_component(FILENAME ${FILEPATH} NAME)
    string(REPLACE "." "_" HEADER_NAME ${FILENAME})
@@ -0,0 +1,12 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#version 450 core
+
+layout(binding = 0) uniform sampler2D depth_tex;
+
+layout(location = 0) in vec2 texcoord;
+
+void main() {
+    gl_FragDepth = textureLod(depth_tex, texcoord, 0).r;
+}
@@ -8,5 +8,5 @@ layout(binding = 0) uniform sampler2DMS depth_tex;
 layout(location = 0) in vec2 texcoord;

 void main() {
-    gl_FragDepth = texelFetch(depth_tex, ivec2(texcoord), 0).r;
+    gl_FragDepth = texelFetch(depth_tex, ivec2(texcoord), gl_SampleID).r;
 }
@@ -10,6 +10,6 @@ layout(binding = 1) uniform usampler2DMS stencil_tex;
 layout(location = 0) in vec2 texcoord;

 void main() {
-    gl_FragDepth = texelFetch(depth_tex, ivec2(texcoord), 0).r;
-    gl_FragStencilRefARB = int(texelFetch(stencil_tex, ivec2(texcoord), 0).r);
+    gl_FragDepth = texelFetch(depth_tex, ivec2(texcoord), gl_SampleID).r;
+    gl_FragStencilRefARB = int(texelFetch(stencil_tex, ivec2(texcoord), gl_SampleID).r);
 }
@@ -3,7 +3,14 @@

 #version 450 core

-layout(binding = 0) uniform sampler2DMS msaa_in;
+#ifndef SAMPLER_TYPE
+#define SAMPLER_TYPE sampler2DMS
+#endif
+#ifndef TEXEL_TYPE
+#define TEXEL_TYPE vec4
+#endif
+
+layout(binding = 0) uniform SAMPLER_TYPE msaa_in;

 layout(push_constant) uniform PushConstants {
    ivec2 dst_offset;
@@ -11,7 +18,7 @@ layout(push_constant) uniform PushConstants {
    ivec2 scale;
 };

-layout(location = 0) out vec4 frag_color;
+layout(location = 0) out TEXEL_TYPE frag_color;

 void main() {
    const ivec2 coord = ivec2(gl_FragCoord.xy) - dst_offset + src_offset;
@@ -0,0 +1,20 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#version 450 core
+
+layout(binding = 0) uniform sampler2DMS msaa_in;
+
+layout(push_constant) uniform PushConstants {
+    ivec2 dst_offset;
+    ivec2 src_offset;
+    ivec2 scale;
+};
+
+void main() {
+    const ivec2 coord = ivec2(gl_FragCoord.xy) - dst_offset + src_offset;
+    const ivec2 msaa_coord = coord / scale;
+    const ivec2 sample_offset = coord % scale;
+    const int sample_id = sample_offset.x + scale.x * sample_offset.y;
+    gl_FragDepth = texelFetch(msaa_in, msaa_coord, sample_id).r;
+}
@@ -0,0 +1,23 @@
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#version 450 core
+#extension GL_ARB_shader_stencil_export : require
+
+layout(binding = 0) uniform sampler2DMS depth_tex;
+layout(binding = 1) uniform usampler2DMS stencil_tex;
+
+layout(push_constant) uniform PushConstants {
+    ivec2 dst_offset;
+    ivec2 src_offset;
+    ivec2 scale;
+};
+
+void main() {
+    const ivec2 coord = ivec2(gl_FragCoord.xy) - dst_offset + src_offset;
+    const ivec2 msaa_coord = coord / scale;
+    const ivec2 sample_offset = coord % scale;
+    const int sample_id = sample_offset.x + scale.x * sample_offset.y;
+    gl_FragDepth = texelFetch(depth_tex, msaa_coord, sample_id).r;
+    gl_FragStencilRefARB = int(texelFetch(stencil_tex, msaa_coord, sample_id).r);
+}
@@ -3,7 +3,14 @@

 #version 450 core

-layout(binding = 0) uniform sampler2D img_in;
+#ifndef SAMPLER_TYPE
+#define SAMPLER_TYPE sampler2D
+#endif
+#ifndef TEXEL_TYPE
+#define TEXEL_TYPE vec4
+#endif
+
+layout(binding = 0) uniform SAMPLER_TYPE img_in;

 layout(push_constant) uniform PushConstants {
    ivec2 dst_offset;
@@ -11,7 +18,7 @@ layout(push_constant) uniform PushConstants {
    ivec2 scale;
 };

-layout(location = 0) out vec4 frag_color;
+layout(location = 0) out TEXEL_TYPE frag_color;

 void main() {
    const ivec2 msaa_coord = ivec2(gl_FragCoord.xy) - dst_offset;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
CamilleLaVey	6cb83a9c32	[vulkan, qcom] Fix shader float controls on QCOM driver	2026-08-23 23:55:22 -04:00
lizzie	d9336ce6ce	[common, settings] Fixes misaligned Aniso levels (#4295 ) PR/Commit Owner: CamilleLaVey Just quick fixes to ANISO bugged level selector, removes x32 and x64 from choices, also fixes the none value to actully use default. Co-authored-by: CamilleLaVey <camillelavey99@gmail.com> Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4295 Reviewed-by: Maufeat <sahyno1996@gmail.com> Reviewed-by: CamilleLaVey <camillelavey99@gmail.com>	2026-08-24 00:06:11 +02:00
PavelBARABANOV	4eb8dd1458	partial revert `a41a98028a` (#4292 ) - [x] I have read and followed the [Contribution Guidelines](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/CONTRIBUTING.md#code-contributions). - [x] I have read and followed the [AI Policy](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/policies/AI.md) - [x] I have read and followed the [Coding Guidelines](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/policies/Coding.md) to the best of my ability. ------------------- This commit fix launch Assassin's creed 3 changes nvdrv:a - break launch with fw 20+ changes ldr:ro - break skip loading menu with all fw Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4292 Reviewed-by: CamilleLaVey <camillelavey99@gmail.com> Reviewed-by: Maufeat <sahyno1996@gmail.com>	2026-08-24 00:01:21 +02:00
PavelBARABANOV	4a3cc9a3c2	[android] Fix Nvdec None (#4288 ) - [x] I have read and followed the [Contribution Guidelines](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/CONTRIBUTING.md#code-contributions). - [x] I have read and followed the [AI Policy](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/policies/AI.md) - [x] I have read and followed the [Coding Guidelines](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/policies/Coding.md) to the best of my ability. ------------------- Nvdec None is working now; I removed the unnecessary comments — the variable names make everything clear enough. Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4288 Reviewed-by: Samuel <lizzie@eden-emu.dev> Reviewed-by: CamilleLaVey <camillelavey99@gmail.com>	2026-08-23 23:58:50 +02:00
Samuel	86ba79b1ba	[vulkan, sgsr] Adjustments to SGSR implementation (#4293 ) PR/ Commit Owner: CamiileLaVey This change has specified fixes on the SGSR initial implementation, it brought a wider sharpening level limits and better image quality. Co-authored-by: CamilleLaVey <camillelavey99@gmail.com> Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4293 Reviewed-by: CamilleLaVey <camillelavey99@gmail.com> Reviewed-by: crueter <crueter@eden-emu.dev>	2026-08-23 23:36:24 +02:00
lizzie	b610b03d29	[common/logging] eliminate uneeded std::string{} allocations per each logging (#4273 ) Signed-off-by: lizzie <lizzie@eden-emu.dev> - [x] I have read and followed the [Contribution Guidelines](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/CONTRIBUTING.md#code-contributions). - [x] I have read and followed the [AI Policy](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/policies/AI.md) - [x] I have read and followed the [Coding Guidelines](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/policies/Coding.md) to the best of my ability. ------------------- the idea is simple, `std::string{}` adds pressure to the memory allocator so whats the best next thing we can do? well of course use our stack its plenty, but we shouldn't be greedy either, BUFSIZ should be a fair amount of space for any would-be messages anyways the main idea behind this PR is to remove std::string{} allocations done with libfmt, that way we have 0-allocs per logging entry this should 100% remove pressure uneeded from the memory allocator we should only allocate things that are important, we can use our trusty fast stack for any string manip we need to do not await/global lock or do evil things with the memory allocator obviously stack is thread local already sooo... this is even better than having to deal with malloc()/free() in any capacity whatsoever and no clang can't heap ellide this (how would you even?) Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4273 Reviewed-by: Maufeat <sahyno1996@gmail.com> Reviewed-by: CamilleLaVey <camillelavey99@gmail.com>	2026-08-23 22:37:17 +02:00
lizzie	421e0b834c	Revert "[dynarmic] Remove Ignore Global Monitor from CPU Accuracy Auto (#3846 )" (#4276 ) This reverts commit `3a823de605`. - [x] I have read and followed the [Contribution Guidelines](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/CONTRIBUTING.md#code-contributions). - [x] I have read and followed the [AI Policy](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/policies/AI.md) - [x] I have read and followed the [Coding Guidelines](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/policies/Coding.md) to the best of my ability. ------------------- kills performance and doesn't fix graphical glitches (according to gido) "It improved nothing but kills performance on default setting" Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4276 Reviewed-by: Maufeat <sahyno1996@gmail.com> Reviewed-by: CamilleLaVey <camillelavey99@gmail.com>	2026-08-23 22:10:22 +02:00
John	55acf5d260	[Vulkan] Apply MK8D Buffer Fix to Linux (#4289 ) - [x] I have read and followed the [Contribution Guidelines](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/CONTRIBUTING.md#code-contributions). - [x] I have read and followed the [AI Policy](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/policies/AI.md) - [x] I have read and followed the [Coding Guidelines](https://git.eden-emu.dev/eden-emu/eden/src/branch/master/docs/policies/Coding.md) to the best of my ability. ------------------- Credit: MaranBR - Adds the Rainbow Graphics Bug Fix to Linux as the game needs MAX_STREAM_BUFFER_SIZE = 256_MiB ![image](/attachments/722d4014-9449-47a0-be47-730b99e0b464) Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4289 Reviewed-by: Maufeat <sahyno1996@gmail.com> Reviewed-by: Samuel <lizzie@eden-emu.dev>	2026-08-23 17:43:35 +02:00
crueter	3e07b466eb	[vulkan] Adjustments on MSAA and BlitHelpers (#4287 ) PR/Commit Owner: CamilleLaVey This PR contains changes complementary to the MSAA refactor from some weeks ago, adds proper shader convert to depth, stencil for msaa and non msaa convertions; removes redundant helpers and unify paths on the resolve functions, just to make the readability and maintainability better; includes fixes for the blit operations on Nvidia, Intel/Windows (previously banned) and ensures Linux retain the fix without extra burden; fixes the QCOM driver bug on resolution upscaling on any games above x1 (includes turnip on A8xx series) and fixes crashes/ resolution upscaled bugs on certain games that used to have wrong viewporting effect on screen or directly device loss on Vulkan. Adds fixes for regressions caused by previous MSAA refactor on games as Fire Emblem: Engage. Special Thanks 1.- Big Smolio (@Gidoly) Co-authored-by: CamilleLaVey <camillelavey99@gmail.com> Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4287 Reviewed-by: CamilleLaVey <camillelavey99@gmail.com> Reviewed-by: Samuel <lizzie@eden-emu.dev>	2026-08-23 17:31:09 +02:00