update compiling document

partial properties are from C# 13 but weren't usable for these properties

.gitignore

@@ -18,8 +18,6 @@ build/
 [Oo]bj/
 AppDir/
 publish_appimage/
-publish_ava/
-publish_tmp_ava/
 
 # Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
 !packages/*/build/

assets/locales.json

@@ -225,7 +225,7 @@
         "el_GR": "Χωρίς Ελέγχους (γρηγορότερο, μη ασφαλές)",
         "en_US": "Host Unchecked (Fastest, Unsafe)",
         "es_ES": "Host Sin Verificación (Más rápido, Inseguro)",
-        "fr_FR": "Hôte Non Vérifié (Plus Rapide, Non Sécurisé)",
+        "fr_FR": "Hôte Non Vérifié (plus rapide, non sécurisé)",
         "he_IL": "מארח לא מבוקר (המהיר ביותר, לא בטוח)",
         "it_IT": "Host senza verifica (più veloce, non sicura)",
         "ja_JP": "ホスト, チェックなし (最高速, 安全でない)",
@@ -3350,7 +3350,7 @@
         "el_GR": "Ερώτημα",
         "en_US": "Prompt",
         "es_ES": "Al Inicio",
-        "fr_FR": "Demander",
+        "fr_FR": "Demande",
         "he_IL": "הודעה",
         "it_IT": "Domanda",
         "ja_JP": "プロンプト",
@@ -4800,7 +4800,7 @@
         "el_GR": "Backend Ήχου:",
         "en_US": "Audio Backend:",
         "es_ES": "Motor de Audio:",
-        "fr_FR": "Moteur Audio :",
+        "fr_FR": "Bibliothèque Audio :",
         "he_IL": "אחראי שמע:",
         "it_IT": "Backend audio:",
         "ja_JP": "音声バックエンド:",
@@ -5700,7 +5700,7 @@
         "el_GR": "Έκταση σε όλο το παράθυρο",
         "en_US": "Stretch to Fit Window",
         "es_ES": "Estirar a la Ventana",
-        "fr_FR": "Adapter à la Taille de la Fenêtre",
+        "fr_FR": "Ajuster à la Taille de la Fenêtre",
         "he_IL": "מתח לגודל חלון",
         "it_IT": "Adatta alla finestra",
         "ja_JP": "ウインドウサイズに合わせる",
@@ -5750,7 +5750,7 @@
         "el_GR": "Τοποθεσία Shaders Γραφικών:",
         "en_US": "Graphics Shader Dump Path:",
         "es_ES": "Directorio de Volcado de Sombreadores:",
-        "fr_FR": "Chemin du dump des shaders graphiques :",
+        "fr_FR": "Chemin du Dossier de Copie des Shaders :",
         "he_IL": "",
         "it_IT": "Percorso di dump degli shader:",
         "ja_JP": "グラフィックス シェーダー ダンプパス:",
@@ -15000,7 +15000,7 @@
         "el_GR": "Πολυνηματική Επεξεργασία Γραφικών:",
         "en_US": "Graphics Backend Multithreading:",
         "es_ES": "Multihilado del Motor Gráfico:",
-        "fr_FR": "Interface Graphique Multithread :",
+        "fr_FR": "Interface graphique multithread :",
         "he_IL": "אחראי גרפיקה רב-תהליכי:",
         "it_IT": "Multithreading del backend grafico:",
         "ja_JP": "グラフィックスバックエンドのマルチスレッド実行:",
@@ -16598,9 +16598,9 @@
         "ar_SA": "",
         "de_DE": "Diese Option überspringt den Dialog 'Benutzerprofile verwalten' während des Spiels und verwendet ein voreingestelltes Profil.\n\nDie Profilumschaltung finden Sie unter 'Einstellungen' - 'Benutzerprofile verwalten'. Wählen Sie das gewünschte Profil aus, bevor Sie das Spiel laden.",
         "el_GR": "Αυτή η επιλογή παρακάμπτει το παράθυρο διαλόγου 'Διαχειριστής Προφίλ Χρήστη' κατά τη διάρκεια του παιχνιδιού, χρησιμοποιώντας ένα προεπιλεγμένο προφίλ.\n\nΗ εναλλαγή προφίλ βρίσκεται στις 'Ρυθμίσεις' - 'Διαχειριστής Προφίλ Χρήστη'. Επιλέξτε το επιθυμητό προφίλ πριν φορτώσετε το παιχνίδι.",
-        "en_US": "This option skips the 'Manage User Profiles' dialog during gameplay, using a pre-selected profile.\n\nProfile switching is found in 'Options' - 'User Profiles'. Select the desired profile before loading the game.",
-        "es_ES": "Esta opción omite el diálogo de 'Gestionar perfiles de usuario' durante el juego, utilizando un perfil preseleccionado.\n\nEl cambio de perfil se encuentra en 'Opciones' - 'Perfiles de Usuario'. Seleccione el perfil deseado antes de cargar el juego.",
-        "fr_FR": "Cette option permet de passer le dialogue 'Gérer les profils d'utilisateurs' pendant le jeu, en utilisant un profil pré-sélectionné.\n\nLa sélection du profil se trouve dans 'Options' - 'Profils d'Utilisateurs'. Sélectionnez le profil souhaité avant de lancer le jeu.",
+        "en_US": "This option skips the 'Manage User Profiles' dialog during gameplay, using a pre-selected profile.\n\nProfile switching is found in 'Settings' - 'Manager User Profiles'. Select the desired profile before loading the game.",
+        "es_ES": "Esta opción omite el diálogo de 'Gestionar perfiles de usuario' durante el juego, utilizando un perfil preseleccionado.\n\nEl cambio de perfil se encuentra en 'Configuración' - 'Gestionar perfiles de usuario'. Seleccione el perfil deseado antes de cargar el juego.",
+        "fr_FR": "Cette option permet d'éviter le dialogue du 'Gérer les profils d'utilisateurs' pendant le jeu, en utilisant un profil pré-sélectionné.\n\nLa sélection du profil se trouve dans 'Paramètres' - 'Gérer les profils d'utilisateurs'. Sélectionnez le profil souhaité avant de lancer le jeu.",
         "he_IL": "",
         "it_IT": "Questa opzione salta la finestra di dialogo 'Gestisci i profili utente' durante il gioco, utilizzando un profilo pre-selezionato.\n\nIl cambio del profilo si trova in 'Impostazioni' - 'Gestisci i profili utente'. Seleziona il profilo desiderato prima di caricare il gioco.",
         "ja_JP": "このオプションは、ゲームプレイ中に「ユーザプロファイルを管理」ダイアログをスキップし、事前に選択されたプロファイルを使用します。\n\nプロファイルの切り替えは、「設定」-「ユーザプロファイルを管理」で見つけることができます。ゲームのロード前に目的のプロファイルをを選択してください。",
@@ -22520,26 +22520,26 @@
     {
       "ID": "MultiplayerModeTooltip",
       "Translations": {
-        "ar_SA": "تغيير وضع LDN متعدد اللاعبين.\n\nسوف يقوم ldn_mitm بتعديل وظيفة اللعب المحلية/اللاسلكية المحلية في الألعاب لتعمل كما لو كانت شبكة LAN، مما يسمح باتصالات الشبكة المحلية نفسها مع محاكيات ريوجينكس الأخرى وأجهزة نينتندو سويتش المخترقة التي تم تثبيت وحدة ldn_mitm عليها.\n\nيتطلب وضع اللاعبين المتعددين أن يكون جميع اللاعبين على نفس إصدار اللعبة (على سبيل المثال، يتعذر على الإصدار 13.0.1 من سوبر سماش برذرز ألتميت الاتصال بالإصدار 13.0.0).\n\nاتركه معطلا إذا لم تكن متأكدا.",
-        "de_DE": "Ändert den LDN-Mehrspielermodus.\n\nldn_mitm ändert die lokale drahtlose/lokale Spielfunktionalität in Spielen so, dass sie wie ein LAN funktioniert und lokale, netzwerkgleiche Verbindungen mit anderen Ryujinx-Instanzen und gehackten Nintendo Switch-Konsolen ermöglicht, auf denen das ldn_mitm-Modul installiert ist.\n\nMultiplayer erfordert, dass alle Spieler die gleiche Spielversion verwenden (d.h. Super Smash Bros. Ultimate v13.0.1 kann sich nicht mit v13.0.0 verbinden).\n\nIm Zweifelsfall auf DISABLED lassen.",
+        "ar_SA": "تغيير وضع LDN متعدد اللاعبين.\n\nسوف يقوم LdnMitm بتعديل وظيفة اللعب المحلية/اللاسلكية المحلية في الألعاب لتعمل كما لو كانت شبكة LAN، مما يسمح باتصالات الشبكة المحلية نفسها مع محاكيات ريوجينكس الأخرى وأجهزة نينتندو سويتش المخترقة التي تم تثبيت وحدة ldn_mitm عليها.\n\nيتطلب وضع اللاعبين المتعددين أن يكون جميع اللاعبين على نفس إصدار اللعبة (على سبيل المثال، يتعذر على الإصدار 13.0.1 من سوبر سماش برذرز ألتميت الاتصال بالإصدار 13.0.0).\n\nاتركه معطلا إذا لم تكن متأكدا.",
+        "de_DE": "Ändert den LDN-Mehrspielermodus.\n\nLdnMitm ändert die lokale drahtlose/lokale Spielfunktionalität in Spielen so, dass sie wie ein LAN funktioniert und lokale, netzwerkgleiche Verbindungen mit anderen Ryujinx-Instanzen und gehackten Nintendo Switch-Konsolen ermöglicht, auf denen das ldn_mitm-Modul installiert ist.\n\nMultiplayer erfordert, dass alle Spieler die gleiche Spielversion verwenden (d.h. Super Smash Bros. Ultimate v13.0.1 kann sich nicht mit v13.0.0 verbinden).\n\nIm Zweifelsfall auf DISABLED lassen.",
         "el_GR": "",
-        "en_US": "Change LDN multiplayer mode.\n\nldn_mitm will modify local wireless/local play functionality in games to function as if it were LAN, allowing for local, same-network connections with other Ryujinx instances and hacked Nintendo Switch consoles that have the ldn_mitm module installed.\n\nMultiplayer requires all players to be on the same game version (i.e. Super Smash Bros. Ultimate v13.0.1 can't connect to v13.0.0).\n\nLeave DISABLED if unsure.",
-        "es_ES": "Cambiar modo LDN multijugador.\n\nldn_mitm modificará la funcionalidad local de juego inalámbrico para funcionar como si fuera LAN, permitiendo locales conexiones de la misma red con otras instancias de Ryujinx y consolas hackeadas de Nintendo Switch que tienen instalado el módulo ldn_mitm.\n\nMultijugador requiere que todos los jugadores estén en la misma versión del juego (por ejemplo, Super Smash Bros. Ultimate v13.0.1 no se puede conectar a v13.0.0).\n\nDejar DESACTIVADO si no está seguro.",
-        "fr_FR": "Change le mode multijoueur LDN.\n\nldn_mitm modifiera la fonctionnalité de jeu sans fil local/jeu local dans les jeux pour fonctionner comme s'il s'agissait d'un LAN, permettant des connexions locales sur le même réseau avec d'autres instances de Ryujinx et des consoles Nintendo Switch piratées ayant le module ldn_mitm installé.\n\nLe multijoueur nécessite que tous les joueurs soient sur la même version du jeu (par exemple, Super Smash Bros. Ultimate v13.0.1 ne peut pas se connecter à v13.0.0).\n\nLaissez DÉSACTIVÉ si vous n'êtes pas sûr.",
+        "en_US": "Change LDN multiplayer mode.\n\nLdnMitm will modify local wireless/local play functionality in games to function as if it were LAN, allowing for local, same-network connections with other Ryujinx instances and hacked Nintendo Switch consoles that have the ldn_mitm module installed.\n\nMultiplayer requires all players to be on the same game version (i.e. Super Smash Bros. Ultimate v13.0.1 can't connect to v13.0.0).\n\nLeave DISABLED if unsure.",
+        "es_ES": "Cambiar modo LDN multijugador.\n\nLdnMitm modificará la funcionalidad local de juego inalámbrico para funcionar como si fuera LAN, permitiendo locales conexiones de la misma red con otras instancias de Ryujinx y consolas hackeadas de Nintendo Switch que tienen instalado el módulo ldn_mitm.\n\nMultijugador requiere que todos los jugadores estén en la misma versión del juego (por ejemplo, Super Smash Bros. Ultimate v13.0.1 no se puede conectar a v13.0.0).\n\nDejar DESACTIVADO si no está seguro.",
+        "fr_FR": "Change le mode multijoueur LDN.\n\nLdnMitm modifiera la fonctionnalité de jeu sans fil local/jeu local dans les jeux pour fonctionner comme s'il s'agissait d'un LAN, permettant des connexions locales sur le même réseau avec d'autres instances de Ryujinx et des consoles Nintendo Switch piratées ayant le module ldn_mitm installé.\n\nLe multijoueur nécessite que tous les joueurs soient sur la même version du jeu (par exemple, Super Smash Bros. Ultimate v13.0.1 ne peut pas se connecter à v13.0.0).\n\nLaissez DÉSACTIVÉ si vous n'êtes pas sûr.",
         "he_IL": "",
-        "it_IT": "Cambia la modalità multigiocatore LDN.\n\nldn_mitm modificherà la funzionalità locale wireless/local play nei giochi per funzionare come se fosse in modalità LAN, consentendo connessioni locali sulla stessa rete con altre istanze di Ryujinx e console Nintendo Switch modificate che hanno il modulo ldn_mitm installato.\n\nLa modalità multigiocatore richiede che tutti i giocatori usino la stessa versione del gioco (es. Super Smash Bros. Ultimate v13.0.1 non può connettersi con la v13.0.0).\n\nNel dubbio, lascia l'opzione su Disabilitato.",
+        "it_IT": "Cambia la modalità multigiocatore LDN.\n\nLdnMitm modificherà la funzionalità locale wireless/local play nei giochi per funzionare come se fosse in modalità LAN, consentendo connessioni locali sulla stessa rete con altre istanze di Ryujinx e console Nintendo Switch modificate che hanno il modulo ldn_mitm installato.\n\nLa modalità multigiocatore richiede che tutti i giocatori usino la stessa versione del gioco (es. Super Smash Bros. Ultimate v13.0.1 non può connettersi con la v13.0.0).\n\nNel dubbio, lascia l'opzione su Disabilitato.",
         "ja_JP": "LDNマルチプレイヤーモードを変更します.\n\nldn_mitmモジュールがインストールされた, 他のRyujinxインスタンスや,ハックされたNintendo Switchコンソールとのローカル/同一ネットワーク接続を可能にします.\n\nマルチプレイでは, すべてのプレイヤーが同じゲームバージョンである必要があります（例：Super Smash Bros. Ultimate v13.0.1はv13.0.0に接続できません）.\n\n不明な場合は｢無効｣のままにしてください.",
-        "ko_KR": "LDN 멀티플레이어 모드를 변경합니다.\n\nldn_mitm은 게임의 로컬 무선/로컬 플레이 기능을 LAN처럼 작동하도록 수정하여 다른 Ryujinx 인스턴스나 ldn_mitm 모듈이 설치된 해킹된 Nintendo Switch 콘솔과 로컬, 동일 네트워크 연결이 가능합니다.\n\n멀티플레이어는 모든 플레이어가 동일한 게임 버전을 사용해야 합니다(예 : 슈퍼 스매시브라더스 얼티밋 v13.0.1은 v13.0.0에 연결할 수 없음).\n\n모르면 비활성화 상태로 두세요.",
-        "no_NO": "Endre LDN flerspillermodus.\n\nldn_mitm vil endre lokal trådløst/lokal spillfunksjonalitet i spill som skal fungere som om den var LAN, noe som tillater lokal, samme nettverk forbindelser med andre Ryujinx instanser og hacket Nintendo Switch konsoller som har installert ldn_mitm-modulen.\n\nFlerspiller krever at alle spillerne er på samme versjon (dvs. Super Smash Bros. Ultimat v13.0.1 kan ikke koble til v13.0.0).\n\nForlat DEAKTIVERT hvis usikker.",
+        "ko_KR": "LDN 멀티플레이어 모드를 변경합니다.\n\nLdnMitm은 게임의 로컬 무선/로컬 플레이 기능을 LAN처럼 작동하도록 수정하여 다른 Ryujinx 인스턴스나 ldn_mitm 모듈이 설치된 해킹된 Nintendo Switch 콘솔과 로컬, 동일 네트워크 연결이 가능합니다.\n\n멀티플레이어는 모든 플레이어가 동일한 게임 버전을 사용해야 합니다(예 : 슈퍼 스매시브라더스 얼티밋 v13.0.1은 v13.0.0에 연결할 수 없음).\n\n모르면 비활성화 상태로 두세요.",
+        "no_NO": "Endre LDN flerspillermodus.\n\nLdnMitm vil endre lokal trådløst/lokal spillfunksjonalitet i spill som skal fungere som om den var LAN, noe som tillater lokal, samme nettverk forbindelser med andre Ryujinx instanser og hacket Nintendo Switch konsoller som har installert ldn_mitm-modulen.\n\nFlerspiller krever at alle spillerne er på samme versjon (dvs. Super Smash Bros. Ultimat v13.0.1 kan ikke koble til v13.0.0).\n\nForlat DEAKTIVERT hvis usikker.",
         "pl_PL": "",
-        "pt_BR": "Alterar o modo multiplayer LDN.\n\nldn_mitm modificará a funcionalidade de jogo sem fio/local nos jogos para funcionar como se fosse LAN, permitindo conexões locais, na mesma rede, com outras instâncias do Ryujinx e consoles Nintendo Switch hackeados que possuem o módulo ldn_mitm instalado.\n\nO multiplayer exige que todos os jogadores estejam na mesma versão do jogo (ex.: Super Smash Bros. Ultimate v13.0.1 não consegue se conectar à v13.0.0).\n\nDeixe DESATIVADO se estiver em dúvida.",
-        "ru_RU": "Меняет многопользовательский режим LDN.\n\nldn_mitm модифицирует функциональность локальной беспроводной игры на одном устройстве в играх, позволяя играть с другими пользователями Ryujinx или взломанными консолями Nintendo Switch с установленным модулем ldn_mitm, находящимися в одной локальной сети друг с другом.\n\nМногопользовательская игра требует наличия у всех игроков одной и той же версии игры (т.е. Super Smash Bros. Ultimate v13.0.1 не может подключиться к v13.0.0).\n\nРекомендуется оставить выключенным.",
-        "sv_SE": "Ändra LDN-flerspelarläge\n\nldn_mitm kommer att ändra lokal funktionalitet för trådlös/lokalt spel att fungera som om det vore ett LAN, vilket ger stöd för anslutningar med local och same-network med andra Ryujinx-instanser och hackade Nintendo Switch-konsoller som har modulen ldn_mitm installerad.\n\nFlerspelare kräver att alla spelare har samma spelversion (t.ex. Super Smash Bros. Ultimate v13.0.1 kan inte ansluta till v13.0.0).\n\nLämna INAKTIVERAD om du är osäker.",
-        "th_TH": "เปลี่ยนโหมดผู้เล่นหลายคนของ LDN\n\nldn_mitm จะปรับเปลี่ยนฟังก์ชันการเล่นแบบไร้สาย/ภายใน จะให้เกมทำงานเหมือนกับว่าเป็น LAN ช่วยให้สามารถเชื่อมต่อภายในเครือข่ายเดียวกันกับอินสแตนซ์ Ryujinx อื่น ๆ และคอนโซล Nintendo Switch ที่ถูกแฮ็กซึ่งมีโมดูล ldn_mitm ติดตั้งอยู่\n\nผู้เล่นหลายคนต้องการให้ผู้เล่นทุกคนอยู่ในเกมเวอร์ชันเดียวกัน (เช่น Super Smash Bros. Ultimate v13.0.1 ไม่สามารถเชื่อมต่อกับ v13.0.0)\n\nปล่อยให้ปิดการใช้งานหากไม่แน่ใจ",
+        "pt_BR": "Alterar o modo multiplayer LDN.\n\nLdnMitm modificará a funcionalidade de jogo sem fio/local nos jogos para funcionar como se fosse LAN, permitindo conexões locais, na mesma rede, com outras instâncias do Ryujinx e consoles Nintendo Switch hackeados que possuem o módulo ldn_mitm instalado.\n\nO multiplayer exige que todos os jogadores estejam na mesma versão do jogo (ex.: Super Smash Bros. Ultimate v13.0.1 não consegue se conectar à v13.0.0).\n\nDeixe DESATIVADO se estiver em dúvida.",
+        "ru_RU": "Меняет многопользовательский режим LDN.\n\nLdnMitm модифицирует функциональность локальной беспроводной игры на одном устройстве в играх, позволяя играть с другими пользователями Ryujinx или взломанными консолями Nintendo Switch с установленным модулем ldn_mitm, находящимися в одной локальной сети друг с другом.\n\nМногопользовательская игра требует наличия у всех игроков одной и той же версии игры (т.е. Super Smash Bros. Ultimate v13.0.1 не может подключиться к v13.0.0).\n\nРекомендуется оставить выключенным.",
+        "sv_SE": "Ändra LDN-flerspelarläge\n\nLdnMitm kommer att ändra lokal funktionalitet för trådlös/lokalt spel att fungera som om det vore ett LAN, vilket ger stöd för anslutningar med local och same-network med andra Ryujinx-instanser och hackade Nintendo Switch-konsoller som har modulen ldn_mitm installerad.\n\nFlerspelare kräver att alla spelare har samma spelversion (t.ex. Super Smash Bros. Ultimate v13.0.1 kan inte ansluta till v13.0.0).\n\nLämna INAKTIVERAD om du är osäker.",
+        "th_TH": "เปลี่ยนโหมดผู้เล่นหลายคนของ LDN\n\nLdnMitm จะปรับเปลี่ยนฟังก์ชันการเล่นแบบไร้สาย/ภายใน จะให้เกมทำงานเหมือนกับว่าเป็น LAN ช่วยให้สามารถเชื่อมต่อภายในเครือข่ายเดียวกันกับอินสแตนซ์ Ryujinx อื่น ๆ และคอนโซล Nintendo Switch ที่ถูกแฮ็กซึ่งมีโมดูล ldn_mitm ติดตั้งอยู่\n\nผู้เล่นหลายคนต้องการให้ผู้เล่นทุกคนอยู่ในเกมเวอร์ชันเดียวกัน (เช่น Super Smash Bros. Ultimate v13.0.1 ไม่สามารถเชื่อมต่อกับ v13.0.0)\n\nปล่อยให้ปิดการใช้งานหากไม่แน่ใจ",
         "tr_TR": "",
-        "uk_UA": "Змінити LDN мультиплеєру.\n\nldn_mitm змінить функціонал бездротової/локальної гри в іграх, щоб вони працювали так, ніби це LAN, що дозволяє локальні підключення в тій самій мережі з іншими екземплярами Ryujinx та хакнутими консолями Nintendo Switch, які мають встановлений модуль ldn_mitm.\n\nМультиплеєр вимагає, щоб усі гравці були на одній і тій же версії гри (наприклад Super Smash Bros. Ultimate v13.0.1 не зможе під'єднатися до v13.0.0).\n\nЗалиште на \"Вимкнено\", якщо не впевнені.",
+        "uk_UA": "Змінити LDN мультиплеєру.\n\nLdnMitm змінить функціонал бездротової/локальної гри в іграх, щоб вони працювали так, ніби це LAN, що дозволяє локальні підключення в тій самій мережі з іншими екземплярами Ryujinx та хакнутими консолями Nintendo Switch, які мають встановлений модуль ldn_mitm.\n\nМультиплеєр вимагає, щоб усі гравці були на одній і тій же версії гри (наприклад Super Smash Bros. Ultimate v13.0.1 не зможе під'єднатися до v13.0.0).\n\nЗалиште на \"Вимкнено\", якщо не впевнені.",
         "zh_CN": "修改 LDN 多人联机游玩模式。\n\nldn_mitm 联机插件将修改游戏中的本地无线和本地游玩功能，使其表现得像局域网一样，允许和其他安装了 ldn_mitm 插件的 Ryujinx 模拟器和破解的任天堂 Switch 主机在同一网络下进行本地连接，实现多人联机游玩。\n\n多人联机游玩要求所有玩家必须运行相同的游戏版本（例如，游戏版本 v13.0.1 无法与 v13.0.0 联机）。\n\n如果不确定，请保持为“禁用”。",
-        "zh_TW": "變更 LDN 多人遊戲模式。\n\nldn_mitm 將修改遊戲中的本機無線/本機遊戲功能，使其如同區域網路一樣執行，允許與其他安裝了 ldn_mitm 模組的 Ryujinx 實例和已破解的 Nintendo Switch 遊戲機進行本機同網路連線。\n\n多人遊戲要求所有玩家使用相同的遊戲版本 (例如，Super Smash Bros. Ultimate v13.0.1 無法連接 v13.0.0)。\n\n如果不確定，請保持 Disabled (停用) 狀態。"
+        "zh_TW": "變更 LDN 多人遊戲模式。\n\nLdnMitm 將修改遊戲中的本機無線/本機遊戲功能，使其如同區域網路一樣執行，允許與其他安裝了 ldn_mitm 模組的 Ryujinx 實例和已破解的 Nintendo Switch 遊戲機進行本機同網路連線。\n\n多人遊戲要求所有玩家使用相同的遊戲版本 (例如，Super Smash Bros. Ultimate v13.0.1 無法連接 v13.0.0)。\n\n如果不確定，請保持 Disabled (停用) 狀態。"
       }
     },
     {
@@ -22800,7 +22800,7 @@
         "el_GR": "",
         "en_US": "Generates a new passphrase, which can be shared with other players.",
         "es_ES": "Genera una nueva frase de contraseña, que puede ser compartida con otros jugadores.",
-        "fr_FR": "Génère un nouveau mot de passe, qui peut être partagé avec les autres.",
+        "fr_FR": "Génére un nouveau mot de passe, qui peut être partagé avec les autres.",
         "he_IL": "",
         "it_IT": "Genera una nuova passphrase, che può essere condivisa con altri giocatori.",
         "ja_JP": "",

distribution/macos/Info.plist

@@ -10,8 +10,6 @@
     <string>Ryujinx</string>
     <key>CFBundleIconFile</key>
     <string>Ryujinx.icns</string>
-    <key>CFBundleIconName</key>
-    <string>Ryujinx</string>
 	<key>CFBundleDocumentTypes</key>
 	<array>
 		<dict>
@@ -42,7 +40,7 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>1.3</string>
+    <string>1.2</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleVersion</key>

distribution/macos/create_app_bundle.sh

@@ -25,7 +25,6 @@ cp "$PUBLISH_DIRECTORY"/*.dylib "$APP_BUNDLE_DIRECTORY/Contents/Frameworks"
 cp Info.plist "$APP_BUNDLE_DIRECTORY/Contents"
 cp Ryujinx.icns "$APP_BUNDLE_DIRECTORY/Contents/Resources/Ryujinx.icns"
 cp updater.sh "$APP_BUNDLE_DIRECTORY/Contents/Resources/updater.sh"
-cp Assets.car "$APP_BUNDLE_DIRECTORY/Contents/Resources/Assets.car"
 cp -r "$PUBLISH_DIRECTORY/THIRDPARTY.md" "$APP_BUNDLE_DIRECTORY/Contents/Resources"
 
 echo -n "APPL????" > "$APP_BUNDLE_DIRECTORY/Contents/PkgInfo"

distribution/macos/create_macos_build_headless.sh

@@ -0,0 +1,124 @@
+#!/bin/bash
+
+set -e
+
+if [ "$#" -lt 8 ]; then
+    echo "usage <BASE_DIR> <TEMP_DIRECTORY> <OUTPUT_DIRECTORY> <ENTITLEMENTS_FILE_PATH> <VERSION> <SOURCE_REVISION_ID> <CONFIGURATION> <CANARY>"
+    exit 1
+fi
+
+mkdir -p "$1"
+mkdir -p "$2"
+mkdir -p "$3"
+
+BASE_DIR=$(readlink -f "$1")
+TEMP_DIRECTORY=$(readlink -f "$2")
+OUTPUT_DIRECTORY=$(readlink -f "$3")
+ENTITLEMENTS_FILE_PATH=$(readlink -f "$4")
+VERSION=$5
+SOURCE_REVISION_ID=$6
+CONFIGURATION=$7
+CANARY=$8
+
+if [[ "$(uname)" == "Darwin" ]]; then
+    echo "Clearing xattr on all dot undercsore files"
+    find "$BASE_DIR" -type f -name "._*" -exec sh -c '
+    for f; do
+        dir=$(dirname "$f")
+        base=$(basename "$f")
+        orig="$dir/${base#._}"
+        [ -f "$orig" ] && xattr -c "$orig" || true
+    done
+    ' sh {} +
+fi
+
+if [ "$CANARY" == "1" ]; then
+  RELEASE_TAR_FILE_NAME=nogui-ryujinx-canary-$VERSION-macos_universal.tar
+elif [ "$VERSION" == "1.1.0" ]; then
+  RELEASE_TAR_FILE_NAME=nogui-ryujinx-$CONFIGURATION-$VERSION+$SOURCE_REVISION_ID-macos_universal.tar
+else
+  RELEASE_TAR_FILE_NAME=nogui-ryujinx-$VERSION-macos_universal.tar
+fi
+
+ARM64_OUTPUT="$TEMP_DIRECTORY/publish_arm64"
+X64_OUTPUT="$TEMP_DIRECTORY/publish_x64"
+UNIVERSAL_OUTPUT="$OUTPUT_DIRECTORY/publish"
+EXECUTABLE_SUB_PATH=Ryujinx.Headless.SDL3
+
+rm -rf "$TEMP_DIRECTORY"
+mkdir -p "$TEMP_DIRECTORY"
+
+DOTNET_COMMON_ARGS=(-p:DebugType=embedded -p:Version="$VERSION" -p:SourceRevisionId="$SOURCE_REVISION_ID" --self-contained true $EXTRA_ARGS)
+
+dotnet restore
+dotnet build -c "$CONFIGURATION" src/Ryujinx.Headless.SDL3
+dotnet publish -c "$CONFIGURATION" -r osx-arm64 -o "$TEMP_DIRECTORY/publish_arm64" "${DOTNET_COMMON_ARGS[@]}" src/Ryujinx.Headless.SDL3
+dotnet publish -c "$CONFIGURATION" -r osx-x64 -o "$TEMP_DIRECTORY/publish_x64" "${DOTNET_COMMON_ARGS[@]}" src/Ryujinx.Headless.SDL3
+
+# Get rid of the support library for ARMeilleure for x64 (that's only for arm64)
+rm -rf "$TEMP_DIRECTORY/publish_x64/libarmeilleure-jitsupport.dylib"
+
+# Get rid of libsoundio from arm64 builds as we don't have a arm64 variant
+# TODO: remove this once done
+rm -rf "$TEMP_DIRECTORY/publish_arm64/libsoundio.dylib"
+
+rm -rf "$OUTPUT_DIRECTORY"
+mkdir -p "$OUTPUT_DIRECTORY"
+
+# Let's copy one of the two different outputs and remove the executable
+cp -R "$ARM64_OUTPUT/" "$UNIVERSAL_OUTPUT"
+rm "$UNIVERSAL_OUTPUT/$EXECUTABLE_SUB_PATH"
+
+# Make its libraries universal
+python3 "$BASE_DIR/distribution/macos/construct_universal_dylib.py" "$ARM64_OUTPUT" "$X64_OUTPUT" "$UNIVERSAL_OUTPUT" "**/*.dylib"
+
+if ! [ -x "$(command -v lipo)" ];
+then
+    if ! [ -x "$(command -v llvm-lipo-17)" ];
+    then
+        LIPO=llvm-lipo
+    else
+        LIPO=llvm-lipo-17
+    fi
+else
+    LIPO=lipo
+fi
+
+# Make the executable universal
+$LIPO "$ARM64_OUTPUT/$EXECUTABLE_SUB_PATH" "$X64_OUTPUT/$EXECUTABLE_SUB_PATH" -output "$UNIVERSAL_OUTPUT/$EXECUTABLE_SUB_PATH" -create
+
+# Now sign it
+if ! [ -x "$(command -v codesign)" ];
+then
+    if ! [ -x "$(command -v rcodesign)" ];
+    then
+        echo "Cannot find rcodesign on your system, please install rcodesign."
+        exit 1
+    fi
+
+    # NOTE: Currently require https://github.com/indygreg/apple-platform-rs/pull/44 to work on other OSes.
+    # cargo install --git "https://github.com/marysaka/apple-platform-rs" --branch "fix/adhoc-app-bundle" apple-codesign --bin "rcodesign"
+    echo "Using rcodesign for ad-hoc signing"
+    for FILE in "$UNIVERSAL_OUTPUT"/*; do
+        if [[ $(file "$FILE") == *"Mach-O"* ]]; then
+            rcodesign sign --entitlements-xml-path "$ENTITLEMENTS_FILE_PATH" "$FILE"
+        fi
+    done  
+else
+    echo "Using codesign for ad-hoc signing"
+    for FILE in "$UNIVERSAL_OUTPUT"/*; do
+        if [[ $(file "$FILE") == *"Mach-O"* ]]; then
+            codesign --entitlements "$ENTITLEMENTS_FILE_PATH" -f -s - "$FILE"
+        fi
+    done    
+fi
+
+echo "Creating archive"
+pushd "$OUTPUT_DIRECTORY"
+tar --exclude "publish/Ryujinx.Headless.SDL3" -cvf "$RELEASE_TAR_FILE_NAME" publish 1> /dev/null
+python3 "$BASE_DIR/distribution/misc/add_tar_exec.py" "$RELEASE_TAR_FILE_NAME" "publish/Ryujinx.Headless.SDL3" "publish/Ryujinx.Headless.SDL3"
+gzip -9 < "$RELEASE_TAR_FILE_NAME" > "$RELEASE_TAR_FILE_NAME.gz"
+rm "$RELEASE_TAR_FILE_NAME"
+popd
+
+echo "Done"

docs/compatibility.csv

@@ -2275,12 +2275,12 @@
 010018E011D92000,"Pokémon™ Shining Pearl",gpu;ldn-works,ingame,2024-08-28 13:26:35
 010015F008C54000,"Pokémon™ HOME",Needs Update;crash;services,menus,2020-12-06 06:01:51
 01001F5010DFA000,"Pokémon™ Legends: Arceus",gpu;Needs Update;ldn-works,ingame,2024-09-19 10:02:02
-0100F43008C44000,"Pokémon™ Legends: Z-A",gpu;crash;ldn-works,ingame,2025-11-16 00:30:00
 01005D100807A000,"Pokémon™ Quest",,playable,2022-02-22 16:12:32
 0100A3D008C5C000,"Pokémon™ Scarlet",gpu;nvdec;ldn-works;amd-vendor-bug,ingame,2023-12-14 13:18:29
 01008F6008C5E000,"Pokémon™ Violet",gpu;nvdec;ldn-works;amd-vendor-bug;mac-bug,ingame,2024-07-30 02:51:48
 0100187003A36000,"Pokémon™: Let’s Go, Eevee!",crash;nvdec;online-broken;ldn-broken,ingame,2024-06-01 15:03:04
 010003F003A34000,"Pokémon™: Let’s Go, Pikachu!",crash;nvdec;online-broken;ldn-broken,ingame,2024-03-15 07:55:41
+0100F43008C44000,"Pokémon Legends: Z-A",gpu;crash;ldn-broken,ingame,2025-10-16 19:13:00
 0100B3F000BE2000,"Pokkén Tournament™ DX",nvdec;ldn-works;opengl-backend-bug;LAN;amd-vendor-bug;intel-vendor-bug,playable,2024-07-18 23:11:08
 010030D005AE6000,"Pokkén Tournament™ DX Demo",demo;opengl-backend-bug,playable,2022-08-10 12:03:19
 0100A3500B4EC000,"Polandball: Can Into Space",,playable,2020-06-25 15:13:26

src/ARMeilleure/Instructions/InstEmitException.cs

@@ -19,7 +19,7 @@ namespace ARMeilleure.Instructions
 
             context.LoadFromContext();
 
-            InstEmitFlowHelper.EmitReturn(context, Const(op.Address));
+            context.Return(Const(op.Address));
         }
 
         public static void Svc(ArmEmitterContext context)
@@ -49,7 +49,7 @@ namespace ARMeilleure.Instructions
 
             context.LoadFromContext();
 
-            InstEmitFlowHelper.EmitReturn(context, Const(op.Address));
+            context.Return(Const(op.Address));
         }
     }
 }

src/ARMeilleure/Instructions/InstEmitException32.cs

@@ -33,7 +33,7 @@ namespace ARMeilleure.Instructions
 
             context.LoadFromContext();
 
-            InstEmitFlowHelper.EmitReturn(context, Const(context.CurrOp.Address));
+            context.Return(Const(context.CurrOp.Address));
         }
     }
 }

src/ARMeilleure/Instructions/InstEmitFlow.cs

@@ -66,7 +66,7 @@ namespace ARMeilleure.Instructions
         {
             OpCodeBReg op = (OpCodeBReg)context.CurrOp;
 
-            EmitReturn(context, GetIntOrZR(context, op.Rn));
+            context.Return(GetIntOrZR(context, op.Rn));
         }
 
         public static void Tbnz(ArmEmitterContext context) => EmitTb(context, onNotZero: true);

src/ARMeilleure/Instructions/InstEmitFlowHelper.cs

@@ -13,10 +13,6 @@ namespace ARMeilleure.Instructions
 {
     static class InstEmitFlowHelper
     {
-        // How many calls we can have in our call stack before we give up and return to the dispatcher.
-        // This prevents stack overflows caused by deep recursive calls.
-        private const int MaxCallDepth = 200;
-
         public static void EmitCondBranch(ArmEmitterContext context, Operand target, Condition cond)
         {
             if (cond != Condition.Al)
@@ -186,7 +182,12 @@ namespace ARMeilleure.Instructions
         {
             if (isReturn || context.IsSingleStep)
             {
-                EmitReturn(context, target);
+                if (target.Type == OperandType.I32)
+                {
+                    target = context.ZeroExtend32(OperandType.I64, target);
+                }
+
+                context.Return(target);
             }
             else
             {
@@ -194,19 +195,6 @@ namespace ARMeilleure.Instructions
             }
         }
 
-        public static void EmitReturn(ArmEmitterContext context, Operand target)
-        {
-            Operand nativeContext = context.LoadArgument(OperandType.I64, 0);
-            DecreaseCallDepth(context, nativeContext);
-
-            if (target.Type == OperandType.I32)
-            {
-                target = context.ZeroExtend32(OperandType.I64, target);
-            }
-
-            context.Return(target);
-        }
-
         private static void EmitTableBranch(ArmEmitterContext context, Operand guestAddress, bool isJump)
         {
             context.StoreToContext();
@@ -269,8 +257,6 @@ namespace ARMeilleure.Instructions
 
             if (isJump)
             {
-                DecreaseCallDepth(context, nativeContext);
-
                 context.Tailcall(hostAddress, nativeContext);
             }
             else
@@ -292,42 +278,8 @@ namespace ARMeilleure.Instructions
                 Operand lblContinue = context.GetLabel(nextAddr.Value);
                 context.BranchIf(lblContinue, returnAddress, nextAddr, Comparison.Equal, BasicBlockFrequency.Cold);
 
-                DecreaseCallDepth(context, nativeContext);
-
                 context.Return(returnAddress);
             }
         }
-
-        public static void EmitCallDepthCheckAndIncrement(EmitterContext context, Operand guestAddress)
-        {
-            if (!Optimizations.EnableDeepCallRecursionProtection)
-            {
-                return;
-            }
-
-            Operand nativeContext = context.LoadArgument(OperandType.I64, 0);
-            Operand callDepthAddr = context.Add(nativeContext, Const((ulong)NativeContext.GetCallDepthOffset()));
-            Operand currentCallDepth = context.Load(OperandType.I32, callDepthAddr);
-            Operand lblDoCall = Label();
-
-            context.BranchIf(lblDoCall, currentCallDepth, Const(MaxCallDepth), Comparison.LessUI);
-            context.Store(callDepthAddr, context.Subtract(currentCallDepth, Const(1)));
-            context.Return(guestAddress);
-
-            context.MarkLabel(lblDoCall);
-            context.Store(callDepthAddr, context.Add(currentCallDepth, Const(1)));
-        }
-
-        private static void DecreaseCallDepth(EmitterContext context, Operand nativeContext)
-        {
-            if (!Optimizations.EnableDeepCallRecursionProtection)
-            {
-                return;
-            }
-
-            Operand callDepthAddr = context.Add(nativeContext, Const((ulong)NativeContext.GetCallDepthOffset()));
-            Operand currentCallDepth = context.Load(OperandType.I32, callDepthAddr);
-            context.Store(callDepthAddr, context.Subtract(currentCallDepth, Const(1)));
-        }
     }
 }

src/ARMeilleure/Optimizations.cs

@@ -13,7 +13,6 @@ namespace ARMeilleure
         public static bool AllowLcqInFunctionTable { get; set; } = true;
         public static bool UseUnmanagedDispatchLoop { get; set; } = true;
         public static bool EnableDebugging { get; set; } = false;
-        public static bool EnableDeepCallRecursionProtection { get; set; } = true;
 
         public static bool UseAdvSimdIfAvailable { get; set; } = true;
         public static bool UseArm64AesIfAvailable { get; set; } = true;

src/ARMeilleure/State/ExecutionContext.cs

@@ -134,11 +134,6 @@ namespace ARMeilleure.State
         public bool GetFPstateFlag(FPState flag) => _nativeContext.GetFPStateFlag(flag);
         public void SetFPstateFlag(FPState flag, bool value) => _nativeContext.SetFPStateFlag(flag, value);
 
-        internal void ResetCallDepth()
-        {
-            _nativeContext.ResetCallDepth();
-        }
-
         internal void CheckInterrupt()
         {
             if (Interrupted)

src/ARMeilleure/State/NativeContext.cs

@@ -22,7 +22,6 @@ namespace ARMeilleure.State
             public ulong ExclusiveValueHigh;
             public int Running;
             public long Tpidr2El0;
-            public int CallDepth;
             
             /// <summary>
             /// Precise PC value used for debugging.
@@ -200,8 +199,6 @@ namespace ARMeilleure.State
         public bool GetRunning() => GetStorage().Running != 0;
         public void SetRunning(bool value) => GetStorage().Running = value ? 1 : 0;
 
-        public void ResetCallDepth() => GetStorage().CallDepth = 0;
-
         public unsafe static int GetRegisterOffset(Register reg)
         {
             if (reg.Type == RegisterType.Integer)
@@ -287,11 +284,6 @@ namespace ARMeilleure.State
             return StorageOffset(ref _dummyStorage, ref _dummyStorage.DebugPrecisePc);
         }
 
-        public static int GetCallDepthOffset()
-        {
-            return StorageOffset(ref _dummyStorage, ref _dummyStorage.CallDepth);
-        }
-
         private static int StorageOffset<T>(ref NativeCtxStorage storage, ref T target)
         {
             return (int)Unsafe.ByteOffset(ref Unsafe.As<NativeCtxStorage, T>(ref storage), ref target);

src/ARMeilleure/Translation/IntervalTree.cs

@@ -361,7 +361,10 @@ namespace ARMeilleure.Translation
 
             IntervalTreeNode<TK, TV> tmp = LeftOf(replacementNode) ?? RightOf(replacementNode);
 
-            tmp?.Parent = ParentOf(replacementNode);
+            if (tmp != null)
+            {
+                tmp.Parent = ParentOf(replacementNode);
+            }
 
             if (ParentOf(replacementNode) == null)
             {
@@ -579,7 +582,10 @@ namespace ARMeilleure.Translation
             {
                 IntervalTreeNode<TK, TV> right = RightOf(node);
                 node.Right = LeftOf(right);
-                node.Right?.Parent = node;
+                if (node.Right != null)
+                {
+                    node.Right.Parent = node;
+                }
 
                 IntervalTreeNode<TK, TV> nodeParent = ParentOf(node);
                 right.Parent = nodeParent;
@@ -609,7 +615,10 @@ namespace ARMeilleure.Translation
             {
                 IntervalTreeNode<TK, TV> left = LeftOf(node);
                 node.Left = RightOf(left);
-                node.Left?.Parent = node;
+                if (node.Left != null)
+                {
+                    node.Left.Parent = node;
+                }
 
                 IntervalTreeNode<TK, TV> nodeParent = ParentOf(node);
                 left.Parent = nodeParent;
@@ -658,7 +667,10 @@ namespace ARMeilleure.Translation
         /// <param name="color">Color (Boolean)</param>
         private static void SetColor(IntervalTreeNode<TK, TV> node, bool color)
         {
-            node?.Color = color;
+            if (node != null)
+            {
+                node.Color = color;
+            }
         }
 
         /// <summary>

src/ARMeilleure/Translation/PTC/Ptc.cs

@@ -33,7 +33,7 @@ namespace ARMeilleure.Translation.PTC
         private const string OuterHeaderMagicString = "PTCohd\0\0";
         private const string InnerHeaderMagicString = "PTCihd\0\0";
 
-        private const uint InternalVersion = 7010; //! To be incremented manually for each change to the ARMeilleure project.
+        private const uint InternalVersion = 7009; //! To be incremented manually for each change to the ARMeilleure project.
 
         private const string ActualDir = "0";
         private const string BackupDir = "1";

src/ARMeilleure/Translation/Translator.cs

@@ -186,7 +186,6 @@ namespace ARMeilleure.Translation
 
             Statistics.StartTimer();
 
-            context.ResetCallDepth();
             ulong nextAddr = func.Execute(Stubs.ContextWrapper, context);
 
             Statistics.StopTimer(address);
@@ -261,7 +260,6 @@ namespace ARMeilleure.Translation
 
             Logger.StartPass(PassName.Translation);
 
-            InstEmitFlowHelper.EmitCallDepthCheckAndIncrement(context, Const(address));
             EmitSynchronization(context);
 
             if (blocks[0].Address != address)

src/ARMeilleure/Translation/TranslatorStubs.cs

@@ -262,18 +262,10 @@ namespace ARMeilleure.Translation
 
             Operand runningAddress = context.Add(nativeContext, Const((ulong)NativeContext.GetRunningOffset()));
             Operand dispatchAddress = context.Add(nativeContext, Const((ulong)NativeContext.GetDispatchAddressOffset()));
-            Operand callDepthAddress = context.Add(nativeContext, Const((ulong)NativeContext.GetCallDepthOffset()));
 
             EmitSyncFpContext(context, nativeContext, true);
 
             context.MarkLabel(beginLbl);
-
-            if (Optimizations.EnableDeepCallRecursionProtection)
-            {
-                // Reset the call depth counter, since this is our first guest function call.
-                context.Store(callDepthAddress, Const(0));
-            }
-
             context.Store(dispatchAddress, guestAddress);
             context.Copy(guestAddress, context.Call(Const((ulong)DispatchStub), OperandType.I64, nativeContext));
             context.BranchIfFalse(endLbl, guestAddress);

src/Ryujinx.Audio/Renderer/Dsp/Command/DeviceSinkCommand.cs

@@ -92,7 +92,6 @@ namespace Ryujinx.Audio.Renderer.Dsp.Command
                 }
 
                 short[] outputBuffer = ArrayPool<short>.Shared.Rent((int)inputCount * SampleCount);
-                Array.Fill(outputBuffer, (short)0, 0, (int)inputCount * SampleCount);
 
                 for (int i = 0; i < bufferCount; i++)
                 {

src/Ryujinx.Audio/Renderer/Parameter/Effect/BiquadFilterEffectParameter2.cs

@@ -19,11 +19,6 @@ namespace Ryujinx.Audio.Renderer.Parameter.Effect
         /// The output channel indices that will be used by the <see cref="Dsp.AudioProcessor"/>.
         /// </summary>
         public Array6<byte> Output;
-        
-        /// <summary>
-        /// Reserved/unused.
-        /// </summary>
-        private readonly uint _padding;
 
         /// <summary>
         /// Biquad filter numerator (b0, b1, b2).

src/Ryujinx.Common/Collections/IntervalTree.cs

@@ -386,7 +386,10 @@ namespace Ryujinx.Common.Collections
 
             IntervalTreeNode<TKey, TValue> tmp = LeftOf(replacementNode) ?? RightOf(replacementNode);
 
-            tmp?.Parent = ParentOf(replacementNode);
+            if (tmp != null)
+            {
+                tmp.Parent = ParentOf(replacementNode);
+            }
 
             if (ParentOf(replacementNode) == null)
             {

src/Ryujinx.Common/Collections/IntrusiveRedBlackTree.cs

@@ -235,7 +235,10 @@ namespace Ryujinx.Common.Collections
                 parent = ParentOf(element);
                 color = ColorOf(element);
 
-                child?.Parent = parent;
+                if (child != null)
+                {
+                    child.Parent = parent;
+                }
 
                 if (parent == null)
                 {
@@ -255,7 +258,8 @@ namespace Ryujinx.Common.Collections
                 element.Right = old.Right;
                 element.Parent = old.Parent;
                 element.Predecessor = old.Predecessor;
-                element.Predecessor?.Successor = element;
+                if (element.Predecessor != null)
+                    element.Predecessor.Successor = element;
 
                 if (ParentOf(old) == null)
                 {
@@ -288,7 +292,10 @@ namespace Ryujinx.Common.Collections
             parent = ParentOf(nodeToDelete);
             color = ColorOf(nodeToDelete);
 
-            child?.Parent = parent;
+            if (child != null)
+            {
+                child.Parent = parent;
+            }
 
             if (parent == null)
             {
@@ -307,9 +314,11 @@ namespace Ryujinx.Common.Collections
             {
                 RestoreBalanceAfterRemoval(child);
             }
-
-            old.Successor?.Predecessor = old.Predecessor;
-            old.Predecessor?.Successor = old.Successor;
+            
+            if (old.Successor != null)
+                old.Successor.Predecessor = old.Predecessor;
+            if (old.Predecessor != null)
+                old.Predecessor.Successor = old.Successor;
 
             return old;
         }

src/Ryujinx.Common/Collections/IntrusiveRedBlackTreeImpl.cs

@@ -250,7 +250,10 @@ namespace Ryujinx.Common.Collections
             {
                 T right = RightOf(node);
                 node.Right = LeftOf(right);
-                node.Right?.Parent = node;
+                if (node.Right != null)
+                {
+                    node.Right.Parent = node;
+                }
 
                 T nodeParent = ParentOf(node);
                 right.Parent = nodeParent;
@@ -278,7 +281,10 @@ namespace Ryujinx.Common.Collections
             {
                 T left = LeftOf(node);
                 node.Left = RightOf(left);
-                node.Left?.Parent = node;
+                if (node.Left != null)
+                {
+                    node.Left.Parent = node;
+                }
 
                 T nodeParent = ParentOf(node);
                 left.Parent = nodeParent;
@@ -323,7 +329,10 @@ namespace Ryujinx.Common.Collections
         /// <param name="color">Color (Boolean)</param>
         protected static void SetColor(T node, bool color)
         {
-            node?.Color = color;
+            if (node != null)
+            {
+                node.Color = color;
+            }
         }
 
         /// <summary>

src/Ryujinx.Common/Collections/TreeDictionary.cs

@@ -328,7 +328,10 @@ namespace Ryujinx.Common.Collections
 
             Node<TKey, TValue> tmp = LeftOf(replacementNode) ?? RightOf(replacementNode);
 
-            tmp?.Parent = ParentOf(replacementNode);
+            if (tmp != null)
+            {
+                tmp.Parent = ParentOf(replacementNode);
+            }
 
             if (ParentOf(replacementNode) == null)
             {

src/Ryujinx.Common/Logging/LogClass.cs

@@ -35,7 +35,6 @@ namespace Ryujinx.Common.Logging
         ServiceBsd,
         ServiceBtm,
         ServiceCaps,
-        ServiceEctx,
         ServiceFatal,
         ServiceFriend,
         ServiceFs,

src/Ryujinx.Common/Memory/MemoryStreamManager.cs

@@ -7,9 +7,6 @@ namespace Ryujinx.Common.Memory
     {
         private static readonly RecyclableMemoryStreamManager _shared = new();
 
-        private static readonly ObjectPool<RecyclableMemoryStream> _streamPool =
-            new(() => new RecyclableMemoryStream(_shared, Guid.NewGuid(), null, 0));
-
         /// <summary>
         /// We don't expose the <c>RecyclableMemoryStreamManager</c> directly because version 2.x
         /// returns them as <c>MemoryStream</c>. This Shared class is here to a) offer only the GetStream() versions we use
@@ -22,12 +19,7 @@ namespace Ryujinx.Common.Memory
             /// </summary>
             /// <returns>A <c>RecyclableMemoryStream</c></returns>
             public static RecyclableMemoryStream GetStream()
-            {
-                RecyclableMemoryStream stream = _streamPool.Allocate();
-                stream.SetLength(0);
-
-                return stream;
-            }
+                => new(_shared);
 
             /// <summary>
             /// Retrieve a new <c>MemoryStream</c> object with the contents copied from the provided
@@ -63,8 +55,7 @@ namespace Ryujinx.Common.Memory
                 RecyclableMemoryStream stream = null;
                 try
                 {
-                    stream = _streamPool.Allocate();
-                    stream.SetLength(0);
+                    stream = new RecyclableMemoryStream(_shared, id, tag, buffer.Length);
                     stream.Write(buffer);
                     stream.Position = 0;
                     return stream;
@@ -92,8 +83,7 @@ namespace Ryujinx.Common.Memory
                 RecyclableMemoryStream stream = null;
                 try
                 {
-                    stream = _streamPool.Allocate();
-                    stream.SetLength(0);
+                    stream = new RecyclableMemoryStream(_shared, id, tag, count);
                     stream.Write(buffer, offset, count);
                     stream.Position = 0;
                     return stream;
@@ -104,11 +94,6 @@ namespace Ryujinx.Common.Memory
                     throw;
                 }
             }
-
-            public static void ReleaseStream(RecyclableMemoryStream stream)
-            {
-                _streamPool.Release(stream);
-            }
         }
     }
 }

src/Ryujinx.Common/Utilities/OsUtils.cs

@@ -20,21 +20,5 @@ namespace Ryujinx.Common.Utilities
                 Debug.Assert(res != -1);
             }
         }
-
-        // "dumpable" attribute of the calling process
-        private const int PR_SET_DUMPABLE = 4;
-
-        [DllImport("libc", SetLastError = true)]
-        private static extern int prctl(int option, int arg2);
-
-        public static void SetCoreDumpable(bool dumpable)
-        {
-            if (OperatingSystem.IsLinux())
-            {
-                int dumpableInt = dumpable ? 1 : 0;
-                int result = prctl(PR_SET_DUMPABLE, dumpableInt);
-                Debug.Assert(result == 0);
-            }
-        }
     }
 }

src/Ryujinx.Graphics.GAL/IPipeline.cs

@@ -82,7 +82,7 @@ namespace Ryujinx.Graphics.GAL
         void SetRasterizerDiscard(bool discard);
 
         void SetRenderTargetColorMasks(ReadOnlySpan<uint> componentMask);
-        void SetRenderTargets(Span<ITexture> colors, ITexture depthStencil);
+        void SetRenderTargets(ITexture[] colors, ITexture depthStencil);
 
         void SetScissors(ReadOnlySpan<Rectangle<int>> regions);
 

src/Ryujinx.Graphics.GAL/Multithreading/Commands/SetRenderTargetsCommand.cs

@@ -1,6 +1,5 @@
 using Ryujinx.Graphics.GAL.Multithreading.Model;
 using Ryujinx.Graphics.GAL.Multithreading.Resources;
-using System;
 using System.Buffers;
 
 namespace Ryujinx.Graphics.GAL.Multithreading.Commands
@@ -9,13 +8,11 @@ namespace Ryujinx.Graphics.GAL.Multithreading.Commands
     {
         public static readonly ArrayPool<ITexture> ArrayPool = ArrayPool<ITexture>.Create(512, 50);
         public readonly CommandType CommandType => CommandType.SetRenderTargets;
-        private int _colorsCount;
         private TableRef<ITexture[]> _colors;
         private TableRef<ITexture> _depthStencil;
 
-        public void Set(int colorsCount, TableRef<ITexture[]> colors, TableRef<ITexture> depthStencil)
+        public void Set(TableRef<ITexture[]> colors, TableRef<ITexture> depthStencil)
         {
-            _colorsCount = colorsCount;
             _colors = colors;
             _depthStencil = depthStencil;
         }
@@ -23,15 +20,16 @@ namespace Ryujinx.Graphics.GAL.Multithreading.Commands
         public static void Run(ref SetRenderTargetsCommand command, ThreadedRenderer threaded, IRenderer renderer)
         {
             ITexture[] colors = command._colors.Get(threaded);
-            Span<ITexture> colorsSpan = colors.AsSpan(0, command._colorsCount);
+            ITexture[] colorsCopy = ArrayPool.Rent(colors.Length);
 
-            for (int i = 0; i < colorsSpan.Length; i++)
+            for (int i = 0; i < colors.Length; i++)
             {
-                colorsSpan[i] = ((ThreadedTexture)colorsSpan[i])?.Base;
+                colorsCopy[i] = ((ThreadedTexture)colors[i])?.Base;
             }
             
-            renderer.Pipeline.SetRenderTargets(colorsSpan, command._depthStencil.GetAs<ThreadedTexture>(threaded)?.Base);
+            renderer.Pipeline.SetRenderTargets(colorsCopy, command._depthStencil.GetAs<ThreadedTexture>(threaded)?.Base);
             
+            ArrayPool.Return(colorsCopy);
             ArrayPool.Return(colors);
         }
     }

src/Ryujinx.Graphics.GAL/Multithreading/ThreadedPipeline.cs

@@ -267,12 +267,12 @@ namespace Ryujinx.Graphics.GAL.Multithreading
             _renderer.QueueCommand();
         }
 
-        public unsafe void SetRenderTargets(Span<ITexture> colors, ITexture depthStencil)
+        public unsafe void SetRenderTargets(ITexture[] colors, ITexture depthStencil)
         {
             ITexture[] colorsCopy = SetRenderTargetsCommand.ArrayPool.Rent(colors.Length);
-            colors.CopyTo(colorsCopy.AsSpan());
+            colors.CopyTo(colorsCopy, 0);
             
-            _renderer.New<SetRenderTargetsCommand>()->Set(colors.Length, Ref(colorsCopy), Ref(depthStencil));
+            _renderer.New<SetRenderTargetsCommand>()->Set(Ref(colorsCopy), Ref(depthStencil));
             _renderer.QueueCommand();
         }
 

src/Ryujinx.Graphics.GAL/Multithreading/ThreadedRenderer.cs

@@ -22,7 +22,7 @@ namespace Ryujinx.Graphics.GAL.Multithreading
     /// </summary>
     public class ThreadedRenderer : IRenderer
     {
-        private const int SpanPoolBytes = 8 * 1024 * 1024;
+        private const int SpanPoolBytes = 4 * 1024 * 1024;
         private const int MaxRefsPerCommand = 2;
         private const int QueueCount = 10000;
 

src/Ryujinx.Graphics.Gpu/Memory/Buffer.cs

@@ -15,7 +15,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
     /// <summary>
     /// Buffer, used to store vertex and index data, uniform and storage buffers, and others.
     /// </summary>
-    class Buffer : INonOverlappingRange<Buffer>, ISyncActionHandler, IDisposable
+    class Buffer : INonOverlappingRange, ISyncActionHandler, IDisposable
     {
         private const ulong GranularBufferThreshold = 4096;
 
@@ -41,9 +41,6 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// End address of the buffer in guest memory.
         /// </summary>
         public ulong EndAddress => Address + Size;
-        
-        public Buffer Next { get; set; }
-        public Buffer Previous { get; set; }
 
         /// <summary>
         /// Increments when the buffer is (partially) unmapped or disposed.
@@ -90,7 +87,6 @@ namespace Ryujinx.Graphics.Gpu.Memory
 
         private readonly bool _useGranular;
         private bool _syncActionRegistered;
-        private bool _bufferInherited;
 
         private int _referenceCount = 1;
 
@@ -117,7 +113,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
             ulong size,
             BufferStage stage,
             bool sparseCompatible,
-            Buffer[] baseBuffers)
+            RangeItem<Buffer>[] baseBuffers)
         {
             _context = context;
             _physicalMemory = physicalMemory;
@@ -138,15 +134,15 @@ namespace Ryujinx.Graphics.Gpu.Memory
             if (baseBuffers.Length != 0)
             {
                 baseHandles = new List<IRegionHandle>();
-                foreach (Buffer item in baseBuffers)
+                foreach (RangeItem<Buffer> item in baseBuffers)
                 {
-                    if (item._useGranular)
+                    if (item.Value._useGranular)
                     {
-                        baseHandles.AddRange(item._memoryTrackingGranular.Handles);
+                        baseHandles.AddRange(item.Value._memoryTrackingGranular.Handles);
                     }
                     else
                     {
-                        baseHandles.Add(item._memoryTracking);
+                        baseHandles.Add(item.Value._memoryTracking);
                     }
                 }
             }
@@ -251,14 +247,14 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// Checks if a given range overlaps with the buffer.
         /// </summary>
         /// <param name="address">Start address of the range</param>
-        /// <param name="endAddress">End address of the range</param>
+        /// <param name="size">Size in bytes of the range</param>
         /// <returns>True if the range overlaps, false otherwise</returns>
-        public bool OverlapsWith(ulong address, ulong endAddress)
+        public bool OverlapsWith(ulong address, ulong size)
         {
-            return Address < endAddress && address < EndAddress;
+            return Address < address + size && address < EndAddress;
         }
 
-        public INonOverlappingRange<Buffer> Split(ulong splitAddress)
+        public INonOverlappingRange Split(ulong splitAddress)
         {
             throw new NotImplementedException();
         }
@@ -430,13 +426,10 @@ namespace Ryujinx.Graphics.Gpu.Memory
         {
             _syncActionRegistered = false;
 
-            if (_bufferInherited)
-            {
-                return true;
-            }
-
             if (_useGranular)
             {
+                
+
                 _modifiedRanges?.GetRanges(Address, Size, _syncRangeAction);
             }
             else
@@ -460,8 +453,6 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// <param name="from">The buffer to inherit from</param>
         public void InheritModifiedRanges(Buffer from)
         {
-            from._bufferInherited = true;
-            
             if (from._modifiedRanges is { HasRanges: true })
             {
                 if (from._syncActionRegistered && !_syncActionRegistered)

src/Ryujinx.Graphics.Gpu/Memory/BufferBackingState.cs

@@ -56,7 +56,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// <param name="parent">Parent buffer</param>
         /// <param name="stage">Initial buffer stage</param>
         /// <param name="baseBuffers">Buffers to inherit state from</param>
-        public BufferBackingState(GpuContext context, Buffer parent, BufferStage stage, Buffer[] baseBuffers)
+        public BufferBackingState(GpuContext context, Buffer parent, BufferStage stage, RangeItem<Buffer>[] baseBuffers)
         {
             _size = (int)parent.Size;
             _systemMemoryType = context.Capabilities.MemoryType;
@@ -102,9 +102,9 @@ namespace Ryujinx.Graphics.Gpu.Memory
 
                 if (baseBuffers.Length != 0)
                 {
-                    foreach (Buffer item in baseBuffers)
+                    foreach (RangeItem<Buffer> item in baseBuffers)
                     {
-                        CombineState(item.BackingState);
+                        CombineState(item.Value.BackingState);
                     }
                 }
             }

src/Ryujinx.Graphics.Gpu/Memory/BufferCache.cs

@@ -79,13 +79,16 @@ namespace Ryujinx.Graphics.Gpu.Memory
             for (int index = 0; index < range.Count; index++)
             {
                 MemoryRange subRange = range.GetSubRange(index);
-
-                ReadOnlySpan<Buffer> overlaps = _buffers.FindOverlapsAsSpan(subRange.Address, subRange.Size);
+                
+                _buffers.Lock.EnterReadLock();
+                Span<RangeItem<Buffer>> overlaps = _buffers.FindOverlapsAsSpan(subRange.Address, subRange.Size);
 
                 for (int i = 0; i < overlaps.Length; i++)
                 {
-                    overlaps[i].Unmapped(subRange.Address, subRange.Size);
+                    overlaps[i].Value.Unmapped(subRange.Address, subRange.Size);
                 }
+
+                _buffers.Lock.ExitReadLock();
             }
         }
 
@@ -325,7 +328,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
                         ulong alignedEndAddress = (endAddress + alignmentMask) & ~alignmentMask;
                         ulong alignedSize = alignedEndAddress - alignedAddress;
 
-                        Buffer buffer = _buffers.FindOverlap(alignedAddress, alignedSize);
+                        Buffer buffer = _buffers.FindOverlap(alignedAddress, alignedSize).Value;
                         BufferRange bufferRange = buffer.GetRange(alignedAddress, alignedSize, false);
 
                         alignedSubRanges[i] = new MemoryRange(alignedAddress, alignedSize);
@@ -392,7 +395,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
 
                 if (subRange.Address != MemoryManager.PteUnmapped)
                 {
-                    Buffer buffer = _buffers.FindOverlap(subRange.Address, subRange.Size);
+                    Buffer buffer = _buffers.FindOverlap(subRange.Address, subRange.Size).Value;
 
                     virtualBuffer.AddPhysicalDependency(buffer, subRange.Address, dstOffset, subRange.Size);
                     physicalBuffers.Add(buffer);
@@ -484,7 +487,10 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// <param name="stage">The type of usage that created the buffer</param>
         private void CreateBufferAligned(ulong address, ulong size, BufferStage stage)
         {
-            ReadOnlySpan<Buffer> overlaps = _buffers.FindOverlapsAsSpan(address, size);
+            Buffer newBuffer = null;
+            
+            _buffers.Lock.EnterWriteLock();
+            Span<RangeItem<Buffer>> overlaps = _buffers.FindOverlapsAsSpan(address, size);
 
             if (overlaps.Length != 0)
             {
@@ -515,7 +521,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
                     {
                         // Try to grow the buffer by 1.5x of its current size.
                         // This improves performance in the cases where the buffer is resized often by small amounts.
-                        ulong existingSize = overlaps[0].Size;
+                        ulong existingSize = overlaps[0].Value.Size;
                         ulong growthSize = (existingSize + Math.Min(existingSize >> 1, MaxDynamicGrowthSize)) & ~BufferAlignmentMask;
 
                         size = Math.Max(size, growthSize);
@@ -529,22 +535,39 @@ namespace Ryujinx.Graphics.Gpu.Memory
                     
                     for (int i = 0; i < overlaps.Length; i++)
                     {
-                        anySparseCompatible |= overlaps[i].SparseCompatible;
+                        anySparseCompatible |= overlaps[i].Value.SparseCompatible;
                     }
 
-                    Buffer[] overlapsArray = overlaps.ToArray();
+                    RangeItem<Buffer>[] overlapsArray = overlaps.ToArray();
                     
                     _buffers.RemoveRange(overlaps[0], overlaps[^1]);
                     
+                    _buffers.Lock.ExitWriteLock();
+                    
                     ulong newSize = endAddress - address;
 
-                    _buffers.Add(CreateBufferAligned(address, newSize, stage, anySparseCompatible, overlapsArray));
+                    newBuffer = CreateBufferAligned(address, newSize, stage, anySparseCompatible, overlapsArray);
+                }
+                else
+                {
+                    _buffers.Lock.ExitWriteLock();
                 }
             }
             else
             {
+                _buffers.Lock.ExitWriteLock();
+                
                 // No overlap, just create a new buffer.
-                _buffers.Add(new(_context, _physicalMemory, address, size, stage, sparseCompatible: false, []));
+                newBuffer = new(_context, _physicalMemory, address, size, stage, sparseCompatible: false, []);
+            }
+
+            if (newBuffer is not null)
+            {
+                _buffers.Lock.EnterWriteLock();
+                
+                _buffers.Add(newBuffer);
+                
+                _buffers.Lock.ExitWriteLock();
             }
         }
 
@@ -560,8 +583,10 @@ namespace Ryujinx.Graphics.Gpu.Memory
         private void CreateBufferAligned(ulong address, ulong size, BufferStage stage, ulong alignment)
         {
             bool sparseAligned = alignment >= SparseBufferAlignmentSize;
+            Buffer newBuffer = null;
             
-            ReadOnlySpan<Buffer> overlaps = _buffers.FindOverlapsAsSpan(address, size);
+            _buffers.Lock.EnterWriteLock();
+            Span<RangeItem<Buffer>> overlaps = _buffers.FindOverlapsAsSpan(address, size);
 
             if (overlaps.Length != 0)
             {
@@ -573,7 +598,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
                 if (overlaps[0].Address > address ||
                     overlaps[0].EndAddress < endAddress ||
                     (overlaps[0].Address & (alignment - 1)) != 0 ||
-                    (!overlaps[0].SparseCompatible && sparseAligned))
+                    (!overlaps[0].Value.SparseCompatible && sparseAligned))
                 {
                     // We need to make sure the new buffer is properly aligned.
                     // However, after the range is aligned, it is possible that it
@@ -597,18 +622,35 @@ namespace Ryujinx.Graphics.Gpu.Memory
 
                     ulong newSize = endAddress - address;
                     
-                    Buffer[] overlapsArray = overlaps.ToArray();
+                    RangeItem<Buffer>[] overlapsArray = overlaps.ToArray();
                     
                     _buffers.RemoveRange(overlaps[0], overlaps[^1]);
                     
-                    _buffers.Add(CreateBufferAligned(address, newSize, stage, sparseAligned, overlapsArray));
+                    _buffers.Lock.ExitWriteLock();
+                    
+                    newBuffer = CreateBufferAligned(address, newSize, stage, sparseAligned, overlapsArray);
+                }
+                else
+                {
+                    _buffers.Lock.ExitWriteLock();
                 }
             }
             else
             {
+                _buffers.Lock.ExitWriteLock();
+                
                 // No overlap, just create a new buffer.
-                _buffers.Add(new(_context, _physicalMemory, address, size, stage, sparseAligned, []));
-            } 
+                newBuffer = new(_context, _physicalMemory, address, size, stage, sparseAligned, []);
+            }
+
+            if (newBuffer is not null)
+            {
+                _buffers.Lock.EnterWriteLock();
+                
+                _buffers.Add(newBuffer);
+                
+                _buffers.Lock.ExitWriteLock();
+            }
         }
 
         /// <summary>
@@ -621,13 +663,13 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// <param name="stage">The type of usage that created the buffer</param>
         /// <param name="sparseCompatible">Indicates if the buffer can be used in a sparse buffer mapping</param>
         /// <param name="overlaps">Buffers overlapping the range</param>
-        private Buffer CreateBufferAligned(ulong address, ulong size, BufferStage stage, bool sparseCompatible, Buffer[] overlaps)
+        private Buffer CreateBufferAligned(ulong address, ulong size, BufferStage stage, bool sparseCompatible, RangeItem<Buffer>[] overlaps)
         {
             Buffer newBuffer = new(_context, _physicalMemory, address, size, stage, sparseCompatible, overlaps);
 
             for (int index = 0; index < overlaps.Length; index++)
             {
-                Buffer buffer = overlaps[index];
+                Buffer buffer = overlaps[index].Value;
 
                 int dstOffset = (int)(buffer.Address - newBuffer.Address);
 
@@ -855,7 +897,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
             {
                 MemoryRange subRange = range.GetSubRange(i);
 
-                Buffer subBuffer = _buffers.FindOverlap(subRange.Address, subRange.Size);
+                Buffer subBuffer = _buffers.FindOverlap(subRange.Address, subRange.Size).Value;
 
                 subBuffer.SynchronizeMemory(subRange.Address, subRange.Size);
 
@@ -903,7 +945,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
 
             if (size != 0)
             {
-                buffer = _buffers.FindOverlap(address, size);
+                buffer = _buffers.FindOverlap(address, size).Value;
 
                 buffer.CopyFromDependantVirtualBuffers();
                 buffer.SynchronizeMemory(address, size);
@@ -915,7 +957,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
             }
             else
             {
-                buffer = _buffers.FindOverlapFast(address, 1);
+                buffer = _buffers.FindOverlapFast(address, 1).Value;
             }
 
             return buffer;
@@ -953,7 +995,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
         {
             if (size != 0)
             {
-                Buffer buffer = _buffers.FindOverlap(address, size);
+                Buffer buffer = _buffers.FindOverlap(address, size).Value;
 
                 if (copyBackVirtual)
                 {

src/Ryujinx.Graphics.Gpu/Memory/BufferModifiedRangeList.cs

@@ -8,7 +8,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
     /// <summary>
     /// A range within a buffer that has been modified by the GPU.
     /// </summary>
-    class BufferModifiedRange : INonOverlappingRange<BufferModifiedRange>
+    class BufferModifiedRange : INonOverlappingRange
     {
         /// <summary>
         /// Start address of the range in guest memory.
@@ -24,9 +24,6 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// End address of the range in guest memory.
         /// </summary>
         public ulong EndAddress => Address + Size;
-        
-        public BufferModifiedRange Next { get; set; }
-        public BufferModifiedRange Previous { get; set; }
 
         /// <summary>
         /// The GPU sync number at the time of the last modification.
@@ -57,14 +54,14 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// Checks if a given range overlaps with the modified range.
         /// </summary>
         /// <param name="address">Start address of the range</param>
-        /// <param name="endAddress">End address of the range</param>
+        /// <param name="size">Size in bytes of the range</param>
         /// <returns>True if the range overlaps, false otherwise</returns>
-        public bool OverlapsWith(ulong address, ulong endAddress)
+        public bool OverlapsWith(ulong address, ulong size)
         {
-            return Address < endAddress && address < EndAddress;
+            return Address < address + size && address < EndAddress;
         }
 
-        public INonOverlappingRange<BufferModifiedRange> Split(ulong splitAddress)
+        public INonOverlappingRange Split(ulong splitAddress)
         {
             throw new NotImplementedException();
         }
@@ -122,11 +119,11 @@ namespace Ryujinx.Graphics.Gpu.Memory
             // Slices a given region using the modified regions in the list. Calls the action for the new slices.
             Lock.EnterReadLock();
 
-            ReadOnlySpan<BufferModifiedRange> overlaps = FindOverlapsAsSpan(address, size);
+            Span<RangeItem<BufferModifiedRange>> overlaps = FindOverlapsAsSpan(address, size);
 
             for (int i = 0; i < overlaps.Length; i++)
             {
-                BufferModifiedRange overlap = overlaps[i];
+                BufferModifiedRange overlap = overlaps[i].Value;
 
                 if (overlap.Address > address)
                 {
@@ -160,7 +157,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
             ulong syncNumber = _context.SyncNumber;
             // We may overlap with some existing modified regions. They must be cut into by the new entry.
             Lock.EnterWriteLock();
-            (BufferModifiedRange first, BufferModifiedRange last) = FindOverlapsAsNodes(address, size);
+            (RangeItem<BufferModifiedRange> first, RangeItem<BufferModifiedRange> last) = FindOverlapsAsNodes(address, size);
 
             if (first is null)
             {
@@ -173,39 +170,34 @@ namespace Ryujinx.Graphics.Gpu.Memory
             {
                 if (first.Address == address && first.EndAddress == endAddress)
                 {
-                    first.SyncNumber = syncNumber;
-                    first.Parent = this;
+                    first.Value.SyncNumber = syncNumber;
+                    first.Value.Parent = this;
                     Lock.ExitWriteLock();
                     return;
                 }
 
                 if (first.Address < address)
                 {
+                    first.Value.Size = address - first.Address;
+                    Update(first);
+
                     if (first.EndAddress > endAddress)
                     {
                         Add(new BufferModifiedRange(endAddress, first.EndAddress - endAddress,
-                            first.SyncNumber, first.Parent));
+                            first.Value.SyncNumber, first.Value.Parent));
                     }
-                    
-                    first.Size = address - first.Address;
                 }
                 else
                 {
                     if (first.EndAddress > endAddress)
                     {
-                        first.Size = first.EndAddress - endAddress;
-                        first.Address = endAddress;
+                        first.Value.Size = first.EndAddress - endAddress;
+                        first.Value.Address = endAddress;
+                        Update(first);
                     }
                     else
                     {
-                        first.Address = address;
-                        first.Size = size;
-                        first.SyncNumber = syncNumber;
-                        first.Parent = this;
-                        
-                        Lock.ExitWriteLock();
-                        
-                        return;
+                        Remove(first.Value);
                     }
                 }
 
@@ -215,39 +207,38 @@ namespace Ryujinx.Graphics.Gpu.Memory
                 return;
             }
 
+            BufferModifiedRange buffPre = null;
+            BufferModifiedRange buffPost = null;
+            bool extendsPost = false;
+            bool extendsPre = false;
+
             if (first.Address < address)
             {
-                first.Size = address - first.Address;
-                first = first.Next;
+                buffPre = new BufferModifiedRange(first.Address, address - first.Address,
+                    first.Value.SyncNumber, first.Value.Parent);
+                extendsPre = true;
             }
 
             if (last.EndAddress > endAddress)
             {
-                last.Size = last.EndAddress - endAddress;
-                last.Address = endAddress;
-                last = last.Previous;
+                buffPost = new BufferModifiedRange(endAddress, last.EndAddress - endAddress,
+                    last.Value.SyncNumber, last.Value.Parent);
+                extendsPost = true;
             }
 
-            if (first.Address < last.Address)
+            RemoveRange(first, last);
+
+            if (extendsPre)
             {
-                RemoveRange(first.Next, last);
-                first.Address = address;
-                first.Size = size;
-                first.SyncNumber = syncNumber;
-                first.Parent = this;
+                Add(buffPre);
             }
-            else if (first.Address == last.Address)
+
+            if (extendsPost)
             {
-                first.Address = address;
-                first.Size = size;
-                first.SyncNumber = syncNumber;
-                first.Parent = this;
+                Add(buffPost);
             }
-            else
-            {
-                Add(new BufferModifiedRange(address, size, syncNumber, this));
-            }
-            
+
+            Add(new BufferModifiedRange(address, size, syncNumber, this));
             Lock.ExitWriteLock();
         }
 
@@ -261,11 +252,11 @@ namespace Ryujinx.Graphics.Gpu.Memory
         public void GetRangesAtSync(ulong address, ulong size, ulong syncNumber, Action<ulong, ulong> rangeAction)
         {
             Lock.EnterReadLock();
-            ReadOnlySpan<BufferModifiedRange> overlaps = FindOverlapsAsSpan(address, size);
+            Span<RangeItem<BufferModifiedRange>> overlaps = FindOverlapsAsSpan(address, size);
 
             for (int i = 0; i < overlaps.Length; i++)
             {
-                BufferModifiedRange overlap = overlaps[i];
+                BufferModifiedRange overlap = overlaps[i].Value;
 
                 if (overlap.SyncNumber == syncNumber)
                 {
@@ -286,18 +277,18 @@ namespace Ryujinx.Graphics.Gpu.Memory
         {
             // We use the non-span method here because keeping the lock will cause a deadlock.
             Lock.EnterReadLock();
-            BufferModifiedRange[] overlaps = FindOverlapsAsArray(address, size, out int length);
+            RangeItem<BufferModifiedRange>[] overlaps = FindOverlapsAsArray(address, size, out int length);
             Lock.ExitReadLock();
 
             if (length != 0)
             {
                 for (int i = 0; i < length; i++)
                 {
-                    BufferModifiedRange overlap = overlaps[i];
+                    BufferModifiedRange overlap = overlaps[i].Value;
                     rangeAction(overlap.Address, overlap.Size);
                 }
                 
-                ArrayPool<BufferModifiedRange>.Shared.Return(overlaps);
+                ArrayPool<RangeItem<BufferModifiedRange>>.Shared.Return(overlaps);
             }
         }
 
@@ -310,7 +301,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
         public bool HasRange(ulong address, ulong size)
         {
             Lock.EnterReadLock();
-            BufferModifiedRange first = FindOverlapFast(address, size);
+            RangeItem<BufferModifiedRange> first = FindOverlapFast(address, size);
             bool result = first is not null;
             Lock.ExitReadLock();
             return result;
@@ -345,7 +336,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// <param name="address">The start address of the flush range</param>
         /// <param name="endAddress">The end address of the flush range</param>
         private void RemoveRangesAndFlush(
-            BufferModifiedRange[] overlaps,
+            RangeItem<BufferModifiedRange>[] overlaps,
             int rangeCount,
             long highestDiff,
             ulong currentSync,
@@ -358,7 +349,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
 
                 for (int i = 0; i < rangeCount; i++)
                 {
-                    BufferModifiedRange overlap = overlaps[i];
+                    BufferModifiedRange overlap = overlaps[i].Value;
 
                     long diff = (long)(overlap.SyncNumber - currentSync);
 
@@ -367,14 +358,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
                         ulong clampAddress = Math.Max(address, overlap.Address);
                         ulong clampEnd = Math.Min(endAddress, overlap.EndAddress);
 
-                        if (i == 0 || i == rangeCount - 1)
-                        {
-                            ClearPart(overlap, clampAddress, clampEnd);
-                        }
-                        else
-                        {
-                            Remove(overlap);
-                        }
+                        ClearPart(overlap, clampAddress, clampEnd);
 
                         RangeActionWithMigration(clampAddress, clampEnd - clampAddress, waitSync, _flushAction);
                     }
@@ -414,7 +398,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
             
             Lock.EnterWriteLock();
             // We use the non-span method here because the array is partially modified by the code, which would invalidate a span.
-            BufferModifiedRange[] overlaps = FindOverlapsAsArray(address, size, out int rangeCount);
+            RangeItem<BufferModifiedRange>[] overlaps = FindOverlapsAsArray(address, size, out int rangeCount);
 
             if (rangeCount == 0)
             {
@@ -430,7 +414,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
 
             for (int i = 0; i < rangeCount; i++)
             {
-                BufferModifiedRange overlap = overlaps![i];
+                BufferModifiedRange overlap = overlaps![i].Value;
 
                 long diff = (long)(overlap.SyncNumber - currentSync);
 
@@ -452,7 +436,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
 
             RemoveRangesAndFlush(overlaps, rangeCount, highestDiff, currentSync, address, endAddress);
             
-            ArrayPool<BufferModifiedRange>.Shared.Return(overlaps!);
+            ArrayPool<RangeItem<BufferModifiedRange>>.Shared.Return(overlaps!);
             
             Lock.ExitWriteLock();
         }
@@ -468,9 +452,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
         public void InheritRanges(BufferModifiedRangeList ranges, Action<ulong, ulong> registerRangeAction)
         {
             ranges.Lock.EnterReadLock();
-            int rangesCount = ranges.Count;
-            BufferModifiedRange[] inheritRanges = ArrayPool<BufferModifiedRange>.Shared.Rent(ranges.Count);
-            ranges.Items.AsSpan(0, ranges.Count).CopyTo(inheritRanges);
+            BufferModifiedRange[] inheritRanges = ranges.ToArray();
             ranges.Lock.ExitReadLock();
 
             // Copy over the migration from the previous range list
@@ -496,26 +478,22 @@ namespace Ryujinx.Graphics.Gpu.Memory
             ranges._migrationTarget = this;
 
             Lock.EnterWriteLock();
-
-            for (int i = 0; i < rangesCount; i++)
+            
+            foreach (BufferModifiedRange range in inheritRanges)
             {
-                BufferModifiedRange range = inheritRanges[i];
                 Add(range);
             }
 
             Lock.ExitWriteLock();
 
             ulong currentSync = _context.SyncNumber;
-            for (int i = 0; i < rangesCount; i++)
+            foreach (BufferModifiedRange range in inheritRanges)
             {
-                BufferModifiedRange range = inheritRanges[i];
                 if (range.SyncNumber != currentSync)
                 {
                     registerRangeAction(range.Address, range.Size);
                 }
             }
-            
-            ArrayPool<BufferModifiedRange>.Shared.Return(inheritRanges);
         }
 
         /// <summary>
@@ -556,25 +534,18 @@ namespace Ryujinx.Graphics.Gpu.Memory
 
         private void ClearPart(BufferModifiedRange overlap, ulong address, ulong endAddress)
         {
+            Remove(overlap);
+
             // If the overlap extends outside of the clear range, make sure those parts still exist.
 
             if (overlap.Address < address)
             {
-                if (overlap.EndAddress > endAddress)
-                {
-                    Add(new BufferModifiedRange(endAddress, overlap.EndAddress - endAddress, overlap.SyncNumber, overlap.Parent));
-                }
-                
-                overlap.Size = address - overlap.Address;
+                Add(new BufferModifiedRange(overlap.Address, address - overlap.Address, overlap.SyncNumber, overlap.Parent));
             }
-            else if (overlap.EndAddress > endAddress)
+
+            if (overlap.EndAddress > endAddress)
             {
-                overlap.Size = overlap.EndAddress - endAddress;
-                overlap.Address = endAddress;
-            }
-            else
-            {
-                Remove(overlap);
+                Add(new BufferModifiedRange(endAddress, overlap.EndAddress - endAddress, overlap.SyncNumber, overlap.Parent));
             }
         }
 
@@ -587,7 +558,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
         {
             ulong endAddress = address + size;
             Lock.EnterWriteLock();
-            (BufferModifiedRange first, BufferModifiedRange last) = FindOverlapsAsNodes(address, size);
+            (RangeItem<BufferModifiedRange> first, RangeItem<BufferModifiedRange> last) = FindOverlapsAsNodes(address, size);
             
             if (first is null)
             {
@@ -599,24 +570,26 @@ namespace Ryujinx.Graphics.Gpu.Memory
             {
                 if (first.Address < address)
                 {
-                    first.Size = address - first.Address;
+                    first.Value.Size = address - first.Address;
+                    Update(first);
 
                     if (first.EndAddress > endAddress)
                     {
                         Add(new BufferModifiedRange(endAddress, first.EndAddress - endAddress,
-                            first.SyncNumber, first.Parent));
+                            first.Value.SyncNumber, first.Value.Parent));
                     }
                 }
                 else
                 {
                     if (first.EndAddress > endAddress)
                     {
-                        first.Size = first.EndAddress - endAddress;
-                        first.Address = endAddress;
+                        first.Value.Size = first.EndAddress - endAddress;
+                        first.Value.Address = endAddress;
+                        Update(first);
                     }
                     else
                     {
-                        Remove(first);
+                        Remove(first.Value);
                     }
                 }
 
@@ -632,14 +605,14 @@ namespace Ryujinx.Graphics.Gpu.Memory
             if (first.Address < address)
             {
                 buffPre = new BufferModifiedRange(first.Address, address - first.Address,
-                    first.SyncNumber, first.Parent);
+                    first.Value.SyncNumber, first.Value.Parent);
                 extendsPre = true;
             }
 
             if (last.EndAddress > endAddress)
             {
                 buffPost = new BufferModifiedRange(endAddress, last.EndAddress - endAddress,
-                    last.SyncNumber, last.Parent);
+                    last.Value.SyncNumber, last.Value.Parent);
                 extendsPost = true;
             }
 

src/Ryujinx.Graphics.Gpu/Memory/CounterCache.cs

@@ -84,7 +84,10 @@ namespace Ryujinx.Graphics.Gpu.Memory
             for (int i = 0; i < count; i++)
             {
                 ICounterEvent evt = _items[index + i].Event;
-                evt?.Invalid = true;
+                if (evt != null)
+                {
+                    evt.Invalid = true;
+                }
             }
 
             _items.RemoveRange(index, count);

src/Ryujinx.Graphics.Gpu/Memory/VirtualRangeCache.cs

@@ -15,7 +15,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
         /// <summary>
         /// Represents a GPU virtual memory range.
         /// </summary>
-        private class VirtualRange : INonOverlappingRange<VirtualRange>
+        private class VirtualRange : INonOverlappingRange
         {
             /// <summary>
             /// GPU virtual address where the range starts.
@@ -32,9 +32,6 @@ namespace Ryujinx.Graphics.Gpu.Memory
             /// </summary>
             public ulong EndAddress => Address + Size;
 
-            public VirtualRange Next { get; set; }
-            public VirtualRange Previous { get; set; }
-
             /// <summary>
             /// Physical regions where the GPU virtual region is mapped.
             /// </summary>
@@ -57,14 +54,14 @@ namespace Ryujinx.Graphics.Gpu.Memory
             /// Checks if a given range overlaps with the buffer.
             /// </summary>
             /// <param name="address">Start address of the range</param>
-            /// <param name="endAddress">End address of the range</param>
+            /// <param name="size">Size in bytes of the range</param>
             /// <returns>True if the range overlaps, false otherwise</returns>
-            public bool OverlapsWith(ulong address, ulong endAddress)
+            public bool OverlapsWith(ulong address, ulong size)
             {
-                return Address < endAddress && address < EndAddress;
+                return Address < address + size && address < EndAddress;
             }
 
-            public INonOverlappingRange<VirtualRange> Split(ulong splitAddress)
+            public INonOverlappingRange Split(ulong splitAddress)
             {
                 throw new NotImplementedException();
             }
@@ -125,7 +122,7 @@ namespace Ryujinx.Graphics.Gpu.Memory
             ulong originalVa = gpuVa;
 
             _virtualRanges.Lock.EnterWriteLock();
-            (VirtualRange first, VirtualRange last) = _virtualRanges.FindOverlapsAsNodes(gpuVa, size);
+            (RangeItem<VirtualRange> first, RangeItem<VirtualRange> last) = _virtualRanges.FindOverlapsAsNodes(gpuVa, size);
             
             if (first is not null)
             {
@@ -150,8 +147,8 @@ namespace Ryujinx.Graphics.Gpu.Memory
                 }
                 else
                 {
-                    found = first.Range.Count == 1 || IsSparseAligned(first.Range);
-                    range = first.Range.Slice(gpuVa - first.Address, size);
+                    found = first.Value.Range.Count == 1 || IsSparseAligned(first.Value.Range);
+                    range = first.Value.Range.Slice(gpuVa - first.Address, size);
                 }
             }
             else

src/Ryujinx.Graphics.OpenGL/Pipeline.cs

@@ -1166,7 +1166,7 @@ namespace Ryujinx.Graphics.OpenGL
             }
         }
 
-        public void SetRenderTargets(Span<ITexture> colors, ITexture depthStencil)
+        public void SetRenderTargets(ITexture[] colors, ITexture depthStencil)
         {
             EnsureFramebuffer();
 

src/Ryujinx.Graphics.Shader/Translation/Optimizations/BranchElimination.cs

@@ -26,8 +26,12 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations
             // - Both branches are jumping to the same location.
             // In this case, the branch on the current block can be removed,
             // as the next block is going to jump to the same place anyway.
+            if (nextBlock == null)
+            {
+                return false;
+            }
 
-            if (nextBlock?.Operations.First?.Value is not Operation next)
+            if (nextBlock.Operations.First?.Value is not Operation next)
             {
                 return false;
             }

src/Ryujinx.Graphics.Vulkan/FramebufferParams.cs

@@ -71,31 +71,17 @@ namespace Ryujinx.Graphics.Vulkan
             HasDepthStencil = isDepthStencil;
         }
 
-        public FramebufferParams(Device device, ReadOnlySpan<ITexture> colors, ITexture depthStencil)
+        public FramebufferParams(Device device, ITexture[] colors, ITexture depthStencil)
         {
             _device = device;
 
-            int colorsCount = 0;
-            _colorsCanonical = new TextureView[colors.Length];
-
-            for (int i = 0; i < colors.Length; i++)
-            {
-                ITexture color = colors[i];
-                if (color is TextureView { Valid: true } view)
-                {
-                    colorsCount++;
-                    _colorsCanonical[i] = view;
-                }
-                else
-                {
-                    _colorsCanonical[i] = null;
-                }
-            }
+            int colorsCount = colors.Count(IsValidTextureView);
 
             int count = colorsCount + (IsValidTextureView(depthStencil) ? 1 : 0);
 
             _attachments = new Auto<DisposableImageView>[count];
             _colors = new TextureView[colorsCount];
+            _colorsCanonical = colors.Select(color => color is TextureView view && view.Valid ? view : null).ToArray();
 
             AttachmentSamples = new uint[count];
             AttachmentFormats = new VkFormat[count];
@@ -179,17 +165,9 @@ namespace Ryujinx.Graphics.Vulkan
             _totalCount = colors.Length;
         }
         
-        public FramebufferParams Update(ReadOnlySpan<ITexture> colors, ITexture depthStencil)
+        public FramebufferParams Update(ITexture[] colors, ITexture depthStencil)
         {
-            int colorsCount = 0;
-            
-            foreach (ITexture color in colors)
-            {
-                if (IsValidTextureView(color))
-                {
-                    colorsCount++;
-                }
-            }
+            int colorsCount = colors.Count(IsValidTextureView);
 
             int count = colorsCount + (IsValidTextureView(depthStencil) ? 1 : 0);
             

src/Ryujinx.Graphics.Vulkan/MultiFenceHolder.cs

@@ -1,7 +1,7 @@
-using Ryujinx.Common;
 using Ryujinx.Common.Memory;
 using Silk.NET.Vulkan;
 using System;
+using System.Buffers;
 
 namespace Ryujinx.Graphics.Vulkan
 {
@@ -10,8 +10,6 @@ namespace Ryujinx.Graphics.Vulkan
     /// </summary>
     class MultiFenceHolder
     {
-        public static readonly ObjectPool<FenceHolder[]> FencePool = new(() => new FenceHolder[CommandBufferPool.MaxCommandBuffers]);
-        
         private const int BufferUsageTrackingGranularity = 4096;
 
         public FenceHolder[] Fences { get; }
@@ -22,7 +20,7 @@ namespace Ryujinx.Graphics.Vulkan
         /// </summary>
         public MultiFenceHolder()
         {
-            Fences = FencePool.Allocate();
+            Fences = ArrayPool<FenceHolder>.Shared.Rent(CommandBufferPool.MaxCommandBuffers);
         }
 
         /// <summary>
@@ -31,7 +29,7 @@ namespace Ryujinx.Graphics.Vulkan
         /// <param name="size">Size of the buffer</param>
         public MultiFenceHolder(int size)
         {
-            Fences = FencePool.Allocate();
+            Fences = ArrayPool<FenceHolder>.Shared.Rent(CommandBufferPool.MaxCommandBuffers);
             _bufferUsageBitmap = new BufferUsageBitmap(size, BufferUsageTrackingGranularity);
         }
 

src/Ryujinx.Graphics.Vulkan/PipelineBase.cs

@@ -1035,7 +1035,7 @@ namespace Ryujinx.Graphics.Vulkan
             }
         }
 
-        private void SetRenderTargetsInternal(Span<ITexture> colors, ITexture depthStencil, bool filterWriteMasked)
+        private void SetRenderTargetsInternal(ITexture[] colors, ITexture depthStencil, bool filterWriteMasked)
         {
             CreateFramebuffer(colors, depthStencil, filterWriteMasked);
             CreateRenderPass();
@@ -1043,7 +1043,7 @@ namespace Ryujinx.Graphics.Vulkan
             SignalAttachmentChange();
         }
 
-        public void SetRenderTargets(Span<ITexture> colors, ITexture depthStencil)
+        public void SetRenderTargets(ITexture[] colors, ITexture depthStencil)
         {
             _framebufferUsingColorWriteMask = false;
             SetRenderTargetsInternal(colors, depthStencil, Gd.IsTBDR);
@@ -1389,7 +1389,7 @@ namespace Ryujinx.Graphics.Vulkan
             _currentPipelineHandle = 0;
         }
 
-        private void CreateFramebuffer(Span<ITexture> colors, ITexture depthStencil, bool filterWriteMasked)
+        private void CreateFramebuffer(ITexture[] colors, ITexture depthStencil, bool filterWriteMasked)
         {
             if (filterWriteMasked)
             {
@@ -1399,7 +1399,7 @@ namespace Ryujinx.Graphics.Vulkan
                 // Just try to remove duplicate attachments.
                 // Save a copy of the array to rebind when mask changes.
 
-                void MaskOut(ReadOnlySpan<ITexture> colors)
+                void MaskOut()
                 {
                     if (!_framebufferUsingColorWriteMask)
                     {
@@ -1436,12 +1436,12 @@ namespace Ryujinx.Graphics.Vulkan
                             if (vkBlend.ColorWriteMask == 0)
                             {
                                 colors[i] = null;
-                                MaskOut(colors);
+                                MaskOut();
                             }
                             else if (vkBlend2.ColorWriteMask == 0)
                             {
                                 colors[j] = null;
-                                MaskOut(colors);
+                                MaskOut();
                             }
                         }
                     }

src/Ryujinx.Graphics.Vulkan/SyncManager.cs

@@ -1,6 +1,6 @@
 using Ryujinx.Common.Logging;
 using Silk.NET.Vulkan;
-using System;
+using System.Buffers;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -193,8 +193,7 @@ namespace Ryujinx.Graphics.Vulkan
                         {
                             _firstHandle = first.ID + 1;
                             _handles.RemoveAt(0);
-                            Array.Clear(first.Waitable.Fences);
-                            MultiFenceHolder.FencePool.Release(first.Waitable.Fences);
+                            ArrayPool<FenceHolder>.Shared.Return(first.Waitable.Fences);
                             first.Waitable = null;
                         }
                     }

src/Ryujinx.HLE/FileSystem/ContentManager.cs

@@ -483,29 +483,10 @@ namespace Ryujinx.HLE.FileSystem
         {
             if (Directory.Exists(keysSource))
             {
-                string[] keyPaths = Directory.EnumerateFiles(keysSource, "*.keys").ToArray();
-
-                if (keyPaths.Length is 0)
-                    throw new FileNotFoundException($"Directory '{keysSource}' contained no '.keys' files.");
-
-                foreach (string filePath in keyPaths)
+                foreach (string filePath in Directory.EnumerateFiles(keysSource, "*.keys"))
                 {
-                    try
-                    {
-                        VerifyKeysFile(filePath);
-                    }
-                    catch (Exception e)
-                    {
-                        Logger.Error?.Print(LogClass.Application, e.Message);
-                        continue;
-                    }
-
-                    string destPath = Path.Combine(installDirectory, Path.GetFileName(filePath));
-
-                    if (File.Exists(destPath))
-                        File.Delete(destPath);
-
-                    File.Copy(filePath, destPath, true);
+                    VerifyKeysFile(filePath);
+                    File.Copy(filePath, Path.Combine(installDirectory, Path.GetFileName(filePath)), true);
                 }
 
                 return;
@@ -520,25 +501,13 @@ namespace Ryujinx.HLE.FileSystem
 
             using FileStream file = File.OpenRead(keysSource);
 
-            if (info.Extension is not ".keys")
-                throw new InvalidFirmwarePackageException("Input file extension is not .keys");
-
-            try
+            if (info.Extension is ".keys")
             {
                 VerifyKeysFile(keysSource);
-            }
-            catch
-            {
+                File.Copy(keysSource, Path.Combine(installDirectory, info.Name), true);
+            } 
+            else
                 throw new InvalidFirmwarePackageException("Input file is not a valid key package");
-            }
-
-            string dest = Path.Combine(installDirectory, info.Name);
-
-            if (File.Exists(dest))
-                File.Delete(dest);
-
-            // overwrite: true seems to not work on its own? https://github.com/Ryubing/Issues/issues/189
-            File.Copy(keysSource, dest, true);
         }
 
         private void FinishInstallation(string temporaryDirectory, string registeredDirectory)
@@ -1016,8 +985,8 @@ namespace Ryujinx.HLE.FileSystem
         public static void VerifyKeysFile(string filePath)
         {
             // Verify the keys file format refers to https://github.com/Thealexbarney/LibHac/blob/master/KEYS.md
-            string genericPattern = "^[a-z0-9_]+ = [a-z0-9]+$";
-            string titlePattern = "^[a-z0-9]{32} = [a-z0-9]{32}$";
+            string genericPattern = @"^[a-z0-9_]+ = [a-z0-9]+$";
+            string titlePattern = @"^[a-z0-9]{32} = [a-z0-9]{32}$";
 
             if (File.Exists(filePath))
             {
@@ -1025,13 +994,24 @@ namespace Ryujinx.HLE.FileSystem
                 string fileName = Path.GetFileName(filePath);
                 string[] lines = File.ReadAllLines(filePath);
 
-                bool verified = fileName switch
+                bool verified;
+                switch (fileName)
                 {
-                    "prod.keys" or "console.keys" or "dev.keys" => VerifyKeys(lines, genericPattern),
-                    "title.keys" => VerifyKeys(lines, titlePattern),
-                    _ => throw new FormatException(
-                        $"Keys file name \"{fileName}\" not supported. Only \"prod.keys\", \"title.keys\", \"console.keys\", \"dev.keys\" are supported.")
-                };
+                    case "prod.keys":
+                        verified = VerifyKeys(lines, genericPattern);
+                        break;
+                    case "title.keys":
+                        verified = VerifyKeys(lines, titlePattern);
+                        break;
+                    case "console.keys":
+                        verified = VerifyKeys(lines, genericPattern);
+                        break;
+                    case "dev.keys":
+                        verified = VerifyKeys(lines, genericPattern);
+                        break;
+                    default:
+                        throw new FormatException($"Keys file name \"{fileName}\" not supported. Only \"prod.keys\", \"title.keys\", \"console.keys\", \"dev.keys\" are supported.");
+                }
 
                 if (!verified)
                 {

src/Ryujinx.HLE/HOS/Diagnostics/Demangler/Demangler.cs

@@ -891,7 +891,10 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler
                 result = new NestedName(name, prev);
             }
 
-            context?.FinishWithTemplateArguments = false;
+            if (context != null)
+            {
+                context.FinishWithTemplateArguments = false;
+            }
 
             return result;
         }
@@ -1071,7 +1074,10 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler
                                 return null;
                             }
 
-                            context?.CtorDtorConversion = true;
+                            if (context != null)
+                            {
+                                context.CtorDtorConversion = true;
+                            }
 
                             return new ConversionOperatorType(type);
                         default:
@@ -1343,7 +1349,10 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler
 
                 _position++;
 
-                context?.CtorDtorConversion = true;
+                if (context != null)
+                {
+                    context.CtorDtorConversion = true;
+                }
 
                 if (isInherited && ParseName(context) == null)
                 {
@@ -1363,7 +1372,10 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler
 
                 _position++;
 
-                context?.CtorDtorConversion = true;
+                if (context != null)
+                {
+                    context.CtorDtorConversion = true;
+                }
 
                 return new CtorDtorNameType(prev, true);
             }
@@ -2993,10 +3005,16 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler
 
             BaseNode result = null;
             CvType cv = new(ParseCvQualifiers(), null);
-            context?.Cv = cv;
+            if (context != null)
+            {
+                context.Cv = cv;
+            }
 
             SimpleReferenceType Ref = ParseRefQualifiers();
-            context?.Ref = Ref;
+            if (context != null)
+            {
+                context.Ref = Ref;
+            }
 
             if (ConsumeIf("St"))
             {
@@ -3042,7 +3060,10 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler
                     }
 
                     result = new NameTypeWithTemplateArguments(result, templateArgument);
-                    context?.FinishWithTemplateArguments = true;
+                    if (context != null)
+                    {
+                        context.FinishWithTemplateArguments = true;
+                    }
 
                     _substitutionList.Add(result);
                     continue;
@@ -3235,7 +3256,10 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler
                     return null;
                 }
 
-                context?.FinishWithTemplateArguments = true;
+                if (context != null)
+                {
+                    context.FinishWithTemplateArguments = true;
+                }
 
                 return new NameTypeWithTemplateArguments(substitution, templateArguments);
             }
@@ -3255,7 +3279,10 @@ namespace Ryujinx.HLE.HOS.Diagnostics.Demangler
                     return null;
                 }
 
-                context?.FinishWithTemplateArguments = true;
+                if (context != null)
+                {
+                    context.FinishWithTemplateArguments = true;
+                }
 
                 return new NameTypeWithTemplateArguments(result, templateArguments);
             }

src/Ryujinx.HLE/HOS/Ipc/IpcMessage.cs

@@ -2,7 +2,6 @@ using Microsoft.IO;
 using Ryujinx.Common;
 using Ryujinx.Common.Memory;
 using System;
-using System.Buffers;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
@@ -38,7 +37,7 @@ namespace Ryujinx.HLE.HOS.Ipc
 
         public IpcMessage(ReadOnlySpan<byte> data, long cmdPtr)
         {
-            RecyclableMemoryStream ms = MemoryStreamManager.Shared.GetStream(data);
+            using RecyclableMemoryStream ms = MemoryStreamManager.Shared.GetStream(data);
 
             BinaryReader reader = new(ms);
 
@@ -124,8 +123,6 @@ namespace Ryujinx.HLE.HOS.Ipc
             }
 
             ObjectIds = [];
-            
-            MemoryStreamManager.Shared.ReleaseStream(ms);
         }
 
         public RecyclableMemoryStream GetStream(long cmdPtr, ulong recvListAddr)

src/Ryujinx.HLE/HOS/Kernel/Ipc/KBufferDescriptorTable.cs

@@ -20,15 +20,6 @@ namespace Ryujinx.HLE.HOS.Kernel.Ipc
             _exchangeBufferDescriptors = new List<KBufferDescriptor>(MaxInternalBuffersCount);
         }
 
-        public KBufferDescriptorTable Clear()
-        {
-            _sendBufferDescriptors.Clear();
-            _receiveBufferDescriptors.Clear();
-            _exchangeBufferDescriptors.Clear();
-
-            return this;
-        }
-
         public Result AddSendBuffer(ulong src, ulong dst, ulong size, MemoryState state)
         {
             return Add(_sendBufferDescriptors, src, dst, size, state);

src/Ryujinx.HLE/HOS/Kernel/Ipc/KClientSession.cs

@@ -1,4 +1,3 @@
-using Ryujinx.Common;
 using Ryujinx.HLE.HOS.Kernel.Common;
 using Ryujinx.HLE.HOS.Kernel.Process;
 using Ryujinx.HLE.HOS.Kernel.Threading;
@@ -33,7 +32,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Ipc
         {
             KThread currentThread = KernelStatic.GetCurrentThread();
 
-            KSessionRequest request = _parent.ServerSession.RequestPool.Allocate().Set(currentThread, customCmdBuffAddr, customCmdBuffSize);
+            KSessionRequest request = new(currentThread, customCmdBuffAddr, customCmdBuffSize);
 
             KernelContext.CriticalSection.Enter();
 
@@ -56,7 +55,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Ipc
         {
             KThread currentThread = KernelStatic.GetCurrentThread();
 
-            KSessionRequest request = _parent.ServerSession.RequestPool.Allocate().Set(currentThread, customCmdBuffAddr, customCmdBuffSize, asyncEvent);
+            KSessionRequest request = new(currentThread, customCmdBuffAddr, customCmdBuffSize, asyncEvent);
 
             KernelContext.CriticalSection.Enter();
 

src/Ryujinx.HLE/HOS/Kernel/Ipc/KServerSession.cs

@@ -10,8 +10,6 @@ namespace Ryujinx.HLE.HOS.Kernel.Ipc
 {
     class KServerSession : KSynchronizationObject
     {
-        public readonly ObjectPool<KSessionRequest> RequestPool = new(() => new KSessionRequest());
-        
         private static readonly MemoryState[] _ipcMemoryStates =
         [
             MemoryState.IpcBuffer3,
@@ -276,8 +274,6 @@ namespace Ryujinx.HLE.HOS.Kernel.Ipc
                 KernelContext.CriticalSection.Leave();
 
                 WakeClientThread(request, clientResult);
-                
-                RequestPool.Release(request);
             }
 
             if (clientHeader.ReceiveListType < 2 &&
@@ -631,8 +627,6 @@ namespace Ryujinx.HLE.HOS.Kernel.Ipc
                 CloseAllHandles(clientMsg, serverHeader, clientProcess);
 
                 FinishRequest(request, clientResult);
-                
-                RequestPool.Release(request);
             }
 
             if (clientHeader.ReceiveListType < 2 &&
@@ -871,8 +865,6 @@ namespace Ryujinx.HLE.HOS.Kernel.Ipc
 
             // Unmap buffers from server.
             FinishRequest(request, clientResult);
-            
-            RequestPool.Release(request);
 
             return serverResult;
         }
@@ -1106,8 +1098,6 @@ namespace Ryujinx.HLE.HOS.Kernel.Ipc
             foreach (KSessionRequest request in IterateWithRemovalOfAllRequests())
             {
                 FinishRequest(request, KernelResult.PortRemoteClosed);
-                
-                RequestPool.Release(request);
             }
         }
 
@@ -1127,8 +1117,6 @@ namespace Ryujinx.HLE.HOS.Kernel.Ipc
                 {
                     SendResultToAsyncRequestClient(request, KernelResult.PortRemoteClosed);
                 }
-                
-                RequestPool.Release(request);
             }
 
             WakeServerThreads(KernelResult.PortRemoteClosed);

src/Ryujinx.HLE/HOS/Kernel/Ipc/KSessionRequest.cs

@@ -5,18 +5,18 @@ namespace Ryujinx.HLE.HOS.Kernel.Ipc
 {
     class KSessionRequest
     {
-        public KBufferDescriptorTable BufferDescriptorTable { get; private set; }
+        public KBufferDescriptorTable BufferDescriptorTable { get; }
 
-        public KThread ClientThread { get; private set; }
+        public KThread ClientThread { get; }
 
         public KProcess ServerProcess { get; set; }
 
-        public KWritableEvent AsyncEvent { get; private set; }
+        public KWritableEvent AsyncEvent { get; }
 
-        public ulong CustomCmdBuffAddr { get; private set; }
-        public ulong CustomCmdBuffSize { get; private set; }
+        public ulong CustomCmdBuffAddr { get; }
+        public ulong CustomCmdBuffSize { get; }
 
-        public KSessionRequest Set(
+        public KSessionRequest(
             KThread clientThread,
             ulong customCmdBuffAddr,
             ulong customCmdBuffSize,
@@ -27,9 +27,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Ipc
             CustomCmdBuffSize = customCmdBuffSize;
             AsyncEvent = asyncEvent;
 
-            BufferDescriptorTable = BufferDescriptorTable?.Clear() ?? new KBufferDescriptorTable();
-
-            return this;
+            BufferDescriptorTable = new KBufferDescriptorTable();
         }
     }
 }

src/Ryujinx.HLE/HOS/Kernel/Threading/KAddressArbiter.cs

@@ -1,8 +1,10 @@
+using Ryujinx.Common;
 using Ryujinx.HLE.HOS.Kernel.Common;
 using Ryujinx.HLE.HOS.Kernel.Process;
 using Ryujinx.Horizon.Common;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 
 namespace Ryujinx.HLE.HOS.Kernel.Threading
@@ -10,12 +12,12 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
     class KAddressArbiter
     {
         private const int HasListenersMask = 0x40000000;
+        private static readonly ObjectPool<KThread[]> _threadArrayPool = new(() => []);
 
         private readonly KernelContext _context;
 
-        private readonly Dictionary<ulong, List<KThread>> _condVarThreads;
-        private readonly Dictionary<ulong, List<KThread>> _arbiterThreads;
-        private readonly ByDynamicPriority _byDynamicPriority;
+        private readonly List<KThread> _condVarThreads;
+        private readonly List<KThread> _arbiterThreads;
 
         public KAddressArbiter(KernelContext context)
         {
@@ -23,7 +25,6 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
 
             _condVarThreads = [];
             _arbiterThreads = [];
-            _byDynamicPriority = new ByDynamicPriority();
         }
 
         public Result ArbitrateLock(int ownerHandle, ulong mutexAddress, int requesterHandle)
@@ -139,23 +140,9 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
 
             currentThread.MutexAddress = mutexAddress;
             currentThread.ThreadHandleForUserMutex = threadHandle;
+            currentThread.CondVarAddress = condVarAddress;
 
-            if (_condVarThreads.TryGetValue(condVarAddress, out List<KThread> threads))
-            {
-                int i = 0;
-
-                if (threads.Count > 0)
-                {
-                    i = threads.BinarySearch(currentThread, _byDynamicPriority);
-                    if (i < 0) i = ~i;
-                }
-                
-                threads.Insert(i, currentThread);
-            }
-            else
-            {
-                _condVarThreads.Add(condVarAddress, [currentThread]);
-            }
+            _condVarThreads.Add(currentThread);
 
             if (timeout != 0)
             {
@@ -178,7 +165,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
 
             currentThread.MutexOwner?.RemoveMutexWaiter(currentThread);
 
-            _condVarThreads[condVarAddress].Remove(currentThread);
+            _condVarThreads.Remove(currentThread);
 
             _context.CriticalSection.Leave();
 
@@ -213,14 +200,13 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
         {
             _context.CriticalSection.Enter();
 
-            int validThreads = 0;
-            _condVarThreads.TryGetValue(address, out List<KThread> threads);
-
-            if (threads is not null && threads.Count > 0)
+            static bool SignalProcessWideKeyPredicate(KThread thread, ulong address)
             {
-                validThreads = WakeThreads(threads, count, TryAcquireMutex);
+                return thread.CondVarAddress == address;
             }
-            
+
+            int validThreads = WakeThreads(_condVarThreads, count, TryAcquireMutex, SignalProcessWideKeyPredicate, address);
+
             if (validThreads == 0)
             {
                 KernelTransfer.KernelToUser(address, 0);
@@ -329,24 +315,9 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
 
                 currentThread.MutexAddress = address;
                 currentThread.WaitingInArbitration = true;
-                
-                if (_arbiterThreads.TryGetValue(address, out List<KThread> threads))
-                {
-                    int i = 0;
 
-                    if (threads.Count > 0)
-                    {
-                        i = threads.BinarySearch(currentThread, _byDynamicPriority);
-                        if (i < 0) i = ~i;
-                    }
-                
-                    threads.Insert(i, currentThread);
-                }
-                else
-                {
-                    _arbiterThreads.Add(address, [currentThread]);
-                }
-                
+                _arbiterThreads.Add(currentThread);
+
                 currentThread.Reschedule(ThreadSchedState.Paused);
 
                 if (timeout > 0)
@@ -365,7 +336,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
 
                 if (currentThread.WaitingInArbitration)
                 {
-                    _arbiterThreads[address].Remove(currentThread);
+                    _arbiterThreads.Remove(currentThread);
 
                     currentThread.WaitingInArbitration = false;
                 }
@@ -421,24 +392,9 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
 
                 currentThread.MutexAddress = address;
                 currentThread.WaitingInArbitration = true;
-                
-                if (_arbiterThreads.TryGetValue(address, out List<KThread> threads))
-                {
-                    int i = 0;
 
-                    if (threads.Count > 0)
-                    {
-                        i = threads.BinarySearch(currentThread, _byDynamicPriority);
-                        if (i < 0) i = ~i;
-                    }
-                
-                    threads.Insert(i, currentThread);
-                }
-                else
-                {
-                    _arbiterThreads.Add(address, [currentThread]);
-                }
-                
+                _arbiterThreads.Add(currentThread);
+
                 currentThread.Reschedule(ThreadSchedState.Paused);
 
                 if (timeout > 0)
@@ -457,7 +413,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
 
                 if (currentThread.WaitingInArbitration)
                 {
-                    _arbiterThreads[address].Remove(currentThread);
+                    _arbiterThreads.Remove(currentThread);
 
                     currentThread.WaitingInArbitration = false;
                 }
@@ -529,7 +485,16 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
             // The value is decremented if the number of threads waiting is less
             // or equal to the Count of threads to be signaled, or Count is zero
             // or negative. It is incremented if there are no threads waiting.
-            int waitingCount = _arbiterThreads[address].Count;
+            int waitingCount = 0;
+
+            foreach (KThread thread in _arbiterThreads)
+            {
+                if (thread.MutexAddress == address && 
+                    ++waitingCount >= count)
+                {
+                    break;
+                }
+            }
 
             if (waitingCount > 0)
             {
@@ -596,38 +561,55 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
                 thread.WaitingInArbitration = false;
             }
 
-            _arbiterThreads.TryGetValue(address, out List<KThread> threads);
-
-            if (threads is not null && threads.Count > 0)
+            static bool ArbiterThreadPredecate(KThread thread, ulong address)
             {
-                WakeThreads(threads, count, RemoveArbiterThread);
+                return thread.MutexAddress == address;
             }
+
+            WakeThreads(_arbiterThreads, count, RemoveArbiterThread, ArbiterThreadPredecate, address);
         }
 
         private static int WakeThreads(
             List<KThread> threads,
             int count,
-            Action<KThread> removeCallback)
+            Action<KThread> removeCallback,
+            Func<KThread, ulong, bool> predicate,
+            ulong address = 0)
         {
-            int validCount = count > 0 ? Math.Min(count, threads.Count) : threads.Count;
-
-            for (int i = 0; i < validCount; i++)
+            KThread[] candidates = _threadArrayPool.Allocate();
+            if (candidates.Length < threads.Count)
             {
-                KThread thread = threads[i];
-                removeCallback(thread);
+                Array.Resize(ref candidates, threads.Count);
             }
             
-            threads.RemoveRange(0, validCount);
-
-            return validCount;
-        }
-        
-        private class ByDynamicPriority : IComparer<KThread>
-        {
-            public int Compare(KThread x, KThread y)
+            int validCount = 0;
+            
+            for (int i = 0; i < threads.Count; i++)
             {
-                return x!.DynamicPriority.CompareTo(y!.DynamicPriority);
+                if (predicate(threads[i], address))
+                {
+                    candidates[validCount++] = threads[i];
+                }
             }
+            
+            Span<KThread> candidatesSpan = candidates.AsSpan(..validCount);
+            
+            candidatesSpan.Sort((x, y) => (x.DynamicPriority.CompareTo(y.DynamicPriority)));
+
+            if (count > 0)
+            {
+                candidatesSpan = candidatesSpan[..Math.Min(count, candidatesSpan.Length)];
+            }
+
+            foreach (KThread thread in candidatesSpan)
+            {
+                removeCallback(thread);
+                threads.Remove(thread);
+            }
+            
+            _threadArrayPool.Release(candidates);
+            
+            return validCount;
         }
     }
 }

src/Ryujinx.HLE/HOS/Kernel/Threading/KScheduler.cs

@@ -174,7 +174,10 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
 
             if (previousThread != nextThread)
             {
-                previousThread?.LastScheduledTime = PerformanceCounter.ElapsedTicks;
+                if (previousThread != null)
+                {
+                    previousThread.LastScheduledTime = PerformanceCounter.ElapsedTicks;
+                }
 
                 _state.SelectedThread = nextThread;
                 _state.NeedsScheduling = true;

src/Ryujinx.HLE/HOS/Kernel/Threading/KThread.cs

@@ -61,6 +61,8 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
 
         public KSynchronizationObject SignaledObj { get; set; }
 
+        public ulong CondVarAddress { get; set; }
+
         private ulong _entrypoint;
         private ThreadStart _customThreadStart;
         private bool _forcedUnschedulable;

src/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/SystemAppletProxy/ISelfController.cs

@@ -416,7 +416,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Sys
                 return ResultCode.InvalidParameters;
             }
 
-            context.Device.UIHandler.TakeScreenshot();
+            Logger.Stub?.PrintStub(LogClass.ServiceAm, new { albumReportOption });
 
             return ResultCode.Success;
         }

src/Ryujinx.HLE/HOS/Services/Ectx/IContextRegistrar.cs

@@ -1,32 +0,0 @@
-using System;
-using Ryujinx.Common.Logging;
-using Ryujinx.Horizon.Common;
-
-namespace Ryujinx.HLE.HOS.Services.Ectx
-{
-    class IContextRegistrar : DisposableIpcService
-    {
-        public IContextRegistrar(ServiceCtx context) { }
-
-        [CommandCmif(0)] // 11.0.0+
-        // Complete(nn::Result result, buffer<bytes, 5> raw_context) -> (i32 context_descriptor)
-        public ResultCode Complete(ServiceCtx context)
-        {
-            Result result = new(context.RequestData.ReadInt32());
-            ulong rawContextPosition = context.Request.SendBuff[0].Position;
-            ulong rawContextSize = context.Request.SendBuff[0].Size;
-
-            byte[] rawContext = new byte[rawContextSize];
-
-            context.Memory.Read(rawContextPosition, rawContext);
-
-            context.ResponseData.Write(0); // TODO: return context_descriptor
-
-            Logger.Stub?.PrintStub(LogClass.ServiceEctx, $"Result: {result}, rawContext: {Convert.ToHexString(rawContext)}" );
-
-            return ResultCode.Success;
-        }
-
-        protected override void Dispose(bool isDisposing) { }
-    }
-}

src/Ryujinx.HLE/HOS/Services/Ectx/IWriterForApplication.cs

@@ -4,14 +4,5 @@ namespace Ryujinx.HLE.HOS.Services.Ectx
     class IWriterForApplication : IpcService
     {
         public IWriterForApplication(ServiceCtx context) { }
-
-        [CommandCmif(0)]
-        // CreateContextRegistrar() -> object<nn::err::context::IContextRegistrar>
-        public ResultCode CreateContextRegistrar(ServiceCtx context)
-        {
-            MakeObject(context, new IContextRegistrar(context));
-
-            return ResultCode.Success;
-        }
     }
 }

src/Ryujinx.HLE/HOS/Services/IpcService.cs

@@ -23,9 +23,6 @@ namespace Ryujinx.HLE.HOS.Services
         private int _selfId;
         private bool _isDomain;
 
-        // cache array so we don't recreate it all the time
-        private object[] _parameters = [null];
-
         public IpcService(ServerBase server = null, bool registerTipc = false)
         {
             Stopwatch sw = Stopwatch.StartNew();
@@ -149,9 +146,7 @@ namespace Ryujinx.HLE.HOS.Services
                 {
                     Logger.Trace?.Print(LogClass.KernelIpc, $"{service.GetType().Name}: {processRequest.Name}");
 
-                    _parameters[0] = context;
-                    
-                    result = (ResultCode)processRequest.Invoke(service, _parameters);
+                    result = (ResultCode)processRequest.Invoke(service, [context]);
                 }
                 else
                 {
@@ -201,9 +196,7 @@ namespace Ryujinx.HLE.HOS.Services
                 {
                     Logger.Debug?.Print(LogClass.KernelIpc, $"{GetType().Name}: {processRequest.Name}");
 
-                    _parameters[0] = context;
-                    
-                    result = (ResultCode)processRequest.Invoke(this, _parameters);
+                    result = (ResultCode)processRequest.Invoke(this, [context]);
                 }
                 else
                 {

src/Ryujinx.HLE/HOS/Services/Nv/INvDrvServices.cs

@@ -59,10 +59,6 @@ namespace Ryujinx.HLE.HOS.Services.Nv
 
         // TODO: This should call set:sys::GetDebugModeFlag
         private readonly bool _debugModeEnabled = false;
-        
-        private byte[] _ioctl2Buffer = [];
-        private byte[] _ioctlArgumentBuffer = [];
-        private byte[] _ioctl3Buffer = [];
 
         public INvDrvServices(ServiceCtx context) : base(context.Device.System.NvDrvServer)
         {
@@ -132,38 +128,27 @@ namespace Ryujinx.HLE.HOS.Services.Nv
 
                 if (!context.Memory.TryReadUnsafe(inputDataPosition, (int)inputDataSize, out arguments))
                 {
-                    if (_ioctlArgumentBuffer.Length < (int)inputDataSize)
-                    {
-                        Array.Resize(ref _ioctlArgumentBuffer, (int)inputDataSize);
-                    }
-                    
-                    arguments = _ioctlArgumentBuffer.AsSpan(0, (int)inputDataSize);
-
+                    arguments = new byte[inputDataSize];
                     context.Memory.Read(inputDataPosition, arguments);
                 }
+                else
+                {
+                    arguments = arguments.ToArray();
+                }
             }
             else if (isWrite)
             {
-                if (_ioctlArgumentBuffer.Length < (int)outputDataSize)
-                {
-                    Array.Resize(ref _ioctlArgumentBuffer, (int)outputDataSize);
-                }
-                    
-                arguments = _ioctlArgumentBuffer.AsSpan(0, (int)outputDataSize);
+                byte[] outputData = new byte[outputDataSize];
+
+                arguments = new Span<byte>(outputData);
             }
             else
             {
-                if (!context.Memory.TryReadUnsafe(inputDataPosition, (int)inputDataSize, out arguments))
-                {
-                    if (_ioctlArgumentBuffer.Length < (int)inputDataSize)
-                    {
-                        Array.Resize(ref _ioctlArgumentBuffer, (int)inputDataSize);
-                    }
-                    
-                    arguments = _ioctlArgumentBuffer.AsSpan(0, (int)inputDataSize);
+                byte[] temp = new byte[inputDataSize];
 
-                    context.Memory.Read(inputDataPosition, arguments);
-                }
+                context.Memory.Read(inputDataPosition, temp);
+
+                arguments = new Span<byte>(temp);
             }
 
             return NvResult.Success;
@@ -285,7 +270,7 @@ namespace Ryujinx.HLE.HOS.Services.Nv
 
                         if ((ioctlCommand.DirectionValue & NvIoctl.Direction.Write) != 0)
                         {
-                            context.Memory.Write(context.Request.GetBufferType0x22(0).Position, arguments);
+                            context.Memory.Write(context.Request.GetBufferType0x22(0).Position, arguments.ToArray());
                         }
                     }
                 }
@@ -489,15 +474,13 @@ namespace Ryujinx.HLE.HOS.Services.Nv
 
                 errorCode = GetIoctlArgument(context, ioctlCommand, out Span<byte> arguments);
                 
+                byte[] inlineInBuffer = null;
+                
                 if (!context.Memory.TryReadUnsafe(inlineInBufferPosition, (int)inlineInBufferSize, out Span<byte> inlineInBufferSpan))
                 {
-                    if (_ioctl2Buffer.Length < (int)inlineInBufferSize)
-                    {
-                        Array.Resize(ref _ioctl2Buffer, (int)inlineInBufferSize);
-                    }
-                    
-                    inlineInBufferSpan = _ioctl2Buffer.AsSpan(0, (int)inlineInBufferSize);
-                    context.Memory.Read(inlineInBufferPosition, inlineInBufferSpan);
+                    inlineInBuffer = _byteArrayPool.Rent((int)inlineInBufferSize);
+                    inlineInBufferSpan = inlineInBuffer;
+                    context.Memory.Read(inlineInBufferPosition, inlineInBufferSpan[..(int)inlineInBufferSize]);
                 }
 
                 if (errorCode == NvResult.Success)
@@ -506,7 +489,7 @@ namespace Ryujinx.HLE.HOS.Services.Nv
 
                     if (errorCode == NvResult.Success)
                     {
-                        NvInternalResult internalResult = deviceFile.Ioctl2(ioctlCommand, arguments, inlineInBufferSpan);
+                        NvInternalResult internalResult = deviceFile.Ioctl2(ioctlCommand, arguments, inlineInBufferSpan[..(int)inlineInBufferSize]);
 
                         if (internalResult == NvInternalResult.NotImplemented)
                         {
@@ -517,10 +500,15 @@ namespace Ryujinx.HLE.HOS.Services.Nv
 
                         if ((ioctlCommand.DirectionValue & NvIoctl.Direction.Write) != 0)
                         {
-                            context.Memory.Write(context.Request.GetBufferType0x22(0).Position, arguments);
+                            context.Memory.Write(context.Request.GetBufferType0x22(0).Position, arguments.ToArray());
                         }
                     }
                 }
+                
+                if (inlineInBuffer is not null)
+                {
+                    _byteArrayPool.Return(inlineInBuffer);
+                }
             }
 
             context.ResponseData.Write((uint)errorCode);
@@ -543,15 +531,13 @@ namespace Ryujinx.HLE.HOS.Services.Nv
 
                 errorCode = GetIoctlArgument(context, ioctlCommand, out Span<byte> arguments);
                 
+                byte[] inlineOutBuffer = null;
+                
                 if (!context.Memory.TryReadUnsafe(inlineOutBufferPosition, (int)inlineOutBufferSize, out Span<byte> inlineOutBufferSpan))
                 {
-                    if (_ioctl3Buffer.Length < (int)inlineOutBufferSize)
-                    {
-                        Array.Resize(ref _ioctl3Buffer, (int)inlineOutBufferSize);
-                    }
-                    
-                    inlineOutBufferSpan = _ioctl3Buffer.AsSpan(0, (int)inlineOutBufferSize);
-                    context.Memory.Read(inlineOutBufferPosition, inlineOutBufferSpan);
+                    inlineOutBuffer = _byteArrayPool.Rent((int)inlineOutBufferSize);
+                    inlineOutBufferSpan = inlineOutBuffer;
+                    context.Memory.Read(inlineOutBufferPosition, inlineOutBufferSpan[..(int)inlineOutBufferSize]);
                 }
 
                 if (errorCode == NvResult.Success)
@@ -560,7 +546,7 @@ namespace Ryujinx.HLE.HOS.Services.Nv
 
                     if (errorCode == NvResult.Success)
                     {
-                        NvInternalResult internalResult = deviceFile.Ioctl3(ioctlCommand, arguments, inlineOutBufferSpan);
+                        NvInternalResult internalResult = deviceFile.Ioctl3(ioctlCommand, arguments, inlineOutBufferSpan[..(int)inlineOutBufferSize]);
 
                         if (internalResult == NvInternalResult.NotImplemented)
                         {
@@ -571,11 +557,16 @@ namespace Ryujinx.HLE.HOS.Services.Nv
 
                         if ((ioctlCommand.DirectionValue & NvIoctl.Direction.Write) != 0)
                         {
-                            context.Memory.Write(context.Request.GetBufferType0x22(0).Position, arguments);
-                            context.Memory.Write(inlineOutBufferPosition, inlineOutBufferSpan);
+                            context.Memory.Write(context.Request.GetBufferType0x22(0).Position, arguments.ToArray());
+                            context.Memory.Write(inlineOutBufferPosition, inlineOutBufferSpan[..(int)inlineOutBufferSize].ToArray());
                         }
                     }
                 }
+                
+                if (inlineOutBuffer is not null)
+                {
+                    _byteArrayPool.Return(inlineOutBuffer);
+                }
             }
 
             context.ResponseData.Write((uint)errorCode);

src/Ryujinx.HLE/HOS/Services/ServerBase.cs

@@ -454,9 +454,8 @@ namespace Ryujinx.HLE.HOS.Services
 
                 response.RawData = _responseDataStream.ToArray();
 
-                RecyclableMemoryStream responseStream = response.GetStreamTipc();
+                using RecyclableMemoryStream responseStream = response.GetStreamTipc();
                 _selfProcess.CpuMemory.Write(_selfThread.TlsAddress, responseStream.GetReadOnlySequence());
-                MemoryStreamManager.Shared.ReleaseStream(responseStream);
             }
             else
             {
@@ -465,9 +464,8 @@ namespace Ryujinx.HLE.HOS.Services
 
             if (!isTipcCommunication)
             {
-                RecyclableMemoryStream responseStream = response.GetStream((long)_selfThread.TlsAddress, recvListAddr | ((ulong)PointerBufferSize << 48));
+                using RecyclableMemoryStream responseStream = response.GetStream((long)_selfThread.TlsAddress, recvListAddr | ((ulong)PointerBufferSize << 48));
                 _selfProcess.CpuMemory.Write(_selfThread.TlsAddress, responseStream.GetReadOnlySequence());
-                MemoryStreamManager.Shared.ReleaseStream(responseStream);
             }
 
             return shouldReply;

src/Ryujinx.HLE/HOS/Services/Sockets/Bsd/IClient.cs

@@ -1169,7 +1169,9 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
 
         public override void DestroyAtExit()
         {
-            _context?.Dispose();
+            if (_context != null) {
+                _context.Dispose();
+            }
         }
     }
 }

src/Ryujinx.HLE/UI/IHostUIHandler.cs

@@ -68,10 +68,5 @@ namespace Ryujinx.HLE.UI
         /// Displays the player select dialog and returns the selected profile.
         /// </summary>
         UserProfile ShowPlayerSelectDialog();
-        
-        /// <summary>
-        /// Takes a screenshot from the current renderer and saves it in the screenshots folder.
-        /// </summary>
-        void TakeScreenshot();
     }
 }

src/Ryujinx.Horizon/Sdk/OsTypes/Impl/MultiWaitImpl.cs

@@ -19,9 +19,6 @@ namespace Ryujinx.Horizon.Sdk.OsTypes.Impl
         private int _waitingThreadHandle;
 
         private MultiWaitHolderBase _signaledHolder;
-        
-        ObjectPool<int[]> _objectHandlePool = new(() => new int[64]);
-        ObjectPool<MultiWaitHolderBase[]> _objectPool = new(() => new MultiWaitHolderBase[64]);
 
         public long CurrentTime { get; private set; }
 
@@ -79,15 +76,11 @@ namespace Ryujinx.Horizon.Sdk.OsTypes.Impl
 
         private MultiWaitHolderBase WaitAnyHandleImpl(bool infinite, long timeout)
         {
-            int[] objectHandles = _objectHandlePool.Allocate();
-            Span<int> objectHandlesSpan = objectHandles;
-            objectHandlesSpan.Clear();
+            Span<int> objectHandles = new int[64];
 
-            MultiWaitHolderBase[] objects = _objectPool.Allocate();
-            Span<MultiWaitHolderBase> objectsSpan = objects;
-            objectsSpan.Clear();
+            Span<MultiWaitHolderBase> objects = new MultiWaitHolderBase[64];
 
-            int count = FillObjectsArray(objectHandlesSpan, objectsSpan);
+            int count = FillObjectsArray(objectHandles, objects);
 
             long endTime = infinite ? long.MaxValue : PerformanceCounter.ElapsedMilliseconds * 1000000;
 
@@ -105,7 +98,7 @@ namespace Ryujinx.Horizon.Sdk.OsTypes.Impl
                 }
                 else
                 {
-                    index = WaitSynchronization(objectHandlesSpan[..count], minTimeout);
+                    index = WaitSynchronization(objectHandles[..count], minTimeout);
 
                     DebugUtil.Assert(index != WaitInvalid);
                 }
@@ -123,18 +116,12 @@ namespace Ryujinx.Horizon.Sdk.OsTypes.Impl
                                 {
                                     _signaledHolder = minTimeoutObject;
 
-                                    _objectHandlePool.Release(objectHandles);
-                                    _objectPool.Release(objects);
-                                    
                                     return _signaledHolder;
                                 }
                             }
                         }
                         else
                         {
-                            _objectHandlePool.Release(objectHandles);
-                            _objectPool.Release(objects);
-                            
                             return null;
                         }
 
@@ -144,9 +131,6 @@ namespace Ryujinx.Horizon.Sdk.OsTypes.Impl
                         {
                             if (_signaledHolder != null)
                             {
-                                _objectHandlePool.Release(objectHandles);
-                                _objectPool.Release(objects);
-                                
                                 return _signaledHolder;
                             }
                         }
@@ -155,11 +139,8 @@ namespace Ryujinx.Horizon.Sdk.OsTypes.Impl
                     default:
                         lock (_lock)
                         {
-                            _signaledHolder = objectsSpan[index];
+                            _signaledHolder = objects[index];
 
-                            _objectHandlePool.Release(objectHandles);
-                            _objectPool.Release(objects);
-                            
                             return _signaledHolder;
                         }
                 }

src/Ryujinx.Input.SDL3/SDL3Gamepad.cs

@@ -22,7 +22,7 @@ namespace Ryujinx.Input.SDL3
 
         private StandardControllerInputConfig _configuration;
 
-        private readonly SDL_GamepadButton[] _buttonsDriverMapping =
+        private static readonly SDL_GamepadButton[] _buttonsDriverMapping =
         [
             // Unbound, ignored.
             SDL_GamepadButton.SDL_GAMEPAD_BUTTON_INVALID,
@@ -88,20 +88,6 @@ namespace Ryujinx.Input.SDL3
             Features = GetFeaturesFlag();
             _triggerThreshold = 0.0f;
 
-            // Face button mapping
-            SDL_GamepadButton[] faceButtons = _buttonsDriverMapping[1..5];
-            foreach (SDL_GamepadButton btn in faceButtons) {
-                int mapId = SDL_GetGamepadButtonLabel(_gamepadHandle, btn) switch {
-                    SDL_GamepadButtonLabel.SDL_GAMEPAD_BUTTON_LABEL_A or SDL_GamepadButtonLabel.SDL_GAMEPAD_BUTTON_LABEL_CROSS => 1,
-                    SDL_GamepadButtonLabel.SDL_GAMEPAD_BUTTON_LABEL_B or SDL_GamepadButtonLabel.SDL_GAMEPAD_BUTTON_LABEL_CIRCLE => 2,
-                    SDL_GamepadButtonLabel.SDL_GAMEPAD_BUTTON_LABEL_X or SDL_GamepadButtonLabel.SDL_GAMEPAD_BUTTON_LABEL_SQUARE => 3,
-                    SDL_GamepadButtonLabel.SDL_GAMEPAD_BUTTON_LABEL_Y or SDL_GamepadButtonLabel.SDL_GAMEPAD_BUTTON_LABEL_TRIANGLE => 4,
-                    _ => -1
-                };
-                if (mapId == -1) { continue; }
-                _buttonsDriverMapping[mapId] = btn;
-            }
-
             // Enable motion tracking
             if ((Features & GamepadFeaturesFlag.Motion) != 0)
             {

src/Ryujinx.Input.SDL3/SDL3GamepadDriver.cs

@@ -65,7 +65,7 @@ namespace Ryujinx.Input.SDL3
 
             string strGuid = new(guidBytes);
 
-            return $"{strGuid[4..6]}{strGuid[6..8]}{strGuid[2..4]}{strGuid[0..2]}-{strGuid[10..12]}{strGuid[8..10]}-{strGuid[12..16]}-{strGuid[16..20]}-{strGuid[20..32]}";
+            return $"{strGuid[0..8]}-{strGuid[8..12]}-{strGuid[12..16]}-{strGuid[16..20]}-{strGuid[20..32]}";
 
         }
 

src/Ryujinx.Input/HLE/NpadController.cs

@@ -532,6 +532,8 @@ namespace Ryujinx.Input.HLE
 
                 hidKeyboard.Modifier |= value << entry.Target;
             }
+            
+            ArrayPool<bool>.Shared.Return(keyboardState.KeysState);
 
             return hidKeyboard;
 

src/Ryujinx.Input/HLE/NpadManager.cs

@@ -20,6 +20,7 @@ namespace Ryujinx.Input.HLE
 {
     public class NpadManager : IDisposable
     {
+        private static readonly ObjectPool<List<SixAxisInput>> _hleMotionStatesPool = new (() => new List<SixAxisInput>(NpadDevices.MaxControllers));
         private readonly CemuHookClient _cemuHookClient;
 
         private readonly Lock _lock = new();
@@ -39,9 +40,6 @@ namespace Ryujinx.Input.HLE
         private bool _enableKeyboard;
         private bool _enableMouse;
         private Switch _device;
-        
-        private readonly List<GamepadInput> _hleInputStates = [];
-        private readonly List<SixAxisInput> _hleMotionStates = new(NpadDevices.MaxControllers);
 
         public NpadManager(IGamepadDriver keyboardDriver, IGamepadDriver gamepadDriver, IGamepadDriver mouseDriver)
         {
@@ -219,8 +217,8 @@ namespace Ryujinx.Input.HLE
         {
             lock (_lock)
             {
-                _hleInputStates.Clear();
-                _hleMotionStates.Clear();
+                List<GamepadInput> hleInputStates = [];
+                List<SixAxisInput> hleMotionStates = _hleMotionStatesPool.Allocate();
 
                 KeyboardInput? hleKeyboardInput = null;
 
@@ -262,14 +260,14 @@ namespace Ryujinx.Input.HLE
                     inputState.PlayerId = playerIndex;
                     motionState.Item1.PlayerId = playerIndex;
 
-                    _hleInputStates.Add(inputState);
-                    _hleMotionStates.Add(motionState.Item1);
+                    hleInputStates.Add(inputState);
+                    hleMotionStates.Add(motionState.Item1);
 
                     if (isJoyconPair && !motionState.Item2.Equals(default))
                     {
                         motionState.Item2.PlayerId = playerIndex;
 
-                        _hleMotionStates.Add(motionState.Item2);
+                        hleMotionStates.Add(motionState.Item2);
                     }
                 }
 
@@ -278,8 +276,8 @@ namespace Ryujinx.Input.HLE
                     hleKeyboardInput = NpadController.GetHLEKeyboardInput(_keyboardDriver);
                 }
 
-                _device.Hid.Npads.Update(_hleInputStates);
-                _device.Hid.Npads.UpdateSixAxis(_hleMotionStates);
+                _device.Hid.Npads.Update(hleInputStates);
+                _device.Hid.Npads.UpdateSixAxis(hleMotionStates);
 
                 if (hleKeyboardInput.HasValue)
                 {
@@ -330,7 +328,9 @@ namespace Ryujinx.Input.HLE
                     _device.Hid.Mouse.Update(0, 0);
                 }
 
-                _device.TamperMachine.UpdateInput(_hleInputStates);
+                _device.TamperMachine.UpdateInput(hleInputStates);
+                
+                _hleMotionStatesPool.Release(hleMotionStates);
             }
         }
 

src/Ryujinx.Input/IKeyboard.cs

@@ -8,8 +8,6 @@ namespace Ryujinx.Input
     /// </summary>
     public interface IKeyboard : IGamepad
     {
-        private static bool[] _keyState;
-
         /// <summary>
         /// Check if a given key is pressed on the keyboard.
         /// </summary>
@@ -31,17 +29,15 @@ namespace Ryujinx.Input
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         static KeyboardStateSnapshot GetStateSnapshot(IKeyboard keyboard)
         {
-            if (_keyState is null)
-            {
-                _keyState = new bool[(int)Key.Count];
-            }
             
+            bool[] keysState = ArrayPool<bool>.Shared.Rent((int)Key.Count);
+
             for (Key key = 0; key < Key.Count; key++)
             {
-                _keyState[(int)key] = keyboard.IsPressed(key);
+                keysState[(int)key] = keyboard.IsPressed(key);
             }
 
-            return new KeyboardStateSnapshot(_keyState);
+            return new KeyboardStateSnapshot(keysState);
         }
     }
 }

src/Ryujinx.Memory/Range/INonOverlappingRange.cs

@@ -3,7 +3,7 @@ namespace Ryujinx.Memory.Range
     /// <summary>
     /// Range of memory that can be split in two.
     /// </summary>
-    public interface INonOverlappingRange<T> : IRangeListRange<T> where T : class, IRangeListRange<T>
+    public interface INonOverlappingRange : IRange
     {
         /// <summary>
         /// Split this region into two, around the specified address. 
@@ -11,6 +11,6 @@ namespace Ryujinx.Memory.Range
         /// </summary>
         /// <param name="splitAddress">Address to split the region around</param>
         /// <returns>The second part of the split region, with start address at the given split.</returns>
-        public INonOverlappingRange<T> Split(ulong splitAddress);
+        public INonOverlappingRange Split(ulong splitAddress);
     }
 }

src/Ryujinx.Memory/Range/IRange.cs

@@ -24,8 +24,8 @@ namespace Ryujinx.Memory.Range
         /// Check if this range overlaps with another.
         /// </summary>
         /// <param name="address">Base address</param>
-        /// <param name="endAddress">EndAddress of the range</param>
+        /// <param name="size">Size of the range</param>
         /// <returns>True if overlapping, false otherwise</returns>
-        bool OverlapsWith(ulong address, ulong endAddress);
+        bool OverlapsWith(ulong address, ulong size);
     }
 }

src/Ryujinx.Memory/Range/NonOverlappingRangeList.cs

@@ -11,7 +11,7 @@ namespace Ryujinx.Memory.Range
     /// A range list that assumes ranges are non-overlapping, with list items that can be split in two to avoid overlaps.
     /// </summary>
     /// <typeparam name="T">Type of the range.</typeparam>
-    public class NonOverlappingRangeList<T> : RangeListBase<T> where T : class, INonOverlappingRange<T>
+    public unsafe class NonOverlappingRangeList<T> : RangeListBase<T> where T : class, INonOverlappingRange
     {
         public readonly ReaderWriterLockSlim Lock = new();
         
@@ -32,18 +32,83 @@ namespace Ryujinx.Memory.Range
         /// <param name="item">The item to be added</param>
         public override void Add(T item)
         {
-            Debug.Assert(item.Address != item.EndAddress);
-            
             int index = BinarySearch(item.Address);
             
             if (index < 0)
             {
                 index = ~index;
             }
+
+            RangeItem<T> rangeItem = _rangeItemPool.Allocate().Set(item);
+            
+            Insert(index, rangeItem);
+        }
+
+        /// <summary>
+        /// Updates an item's end address on the list. Address must be the same.
+        /// </summary>
+        /// <param name="item">The item to be updated</param>
+        /// <returns>True if the item was located and updated, false otherwise</returns>
+        protected override bool Update(T item)
+        {
+            int index = BinarySearch(item.Address);
+
+            if (index >= 0 && Items[index].Value.Equals(item))
+            {
+                RangeItem<T> rangeItem = new(item) { Previous = Items[index].Previous, Next = Items[index].Next };
+                
+                if (index > 0)
+                {
+                    Items[index - 1].Next = rangeItem;
+                }
+
+                if (index < Count - 1)
+                {
+                    Items[index + 1].Previous = rangeItem;
+                }
+                
+                Items[index] = rangeItem;
+
+                return true;
+            }
+
+            return false;
+        }
+        
+        /// <summary>
+        /// Updates an item's end address on the list. Address must be the same.
+        /// </summary>
+        /// <param name="item">The RangeItem to be updated</param>
+        /// <returns>True if the item was located and updated, false otherwise</returns>
+        protected override bool Update(RangeItem<T> item)
+        {
+            int index = BinarySearch(item.Address);
+
+            RangeItem<T> rangeItem = new(item.Value) { Previous = item.Previous, Next = item.Next };
+                
+            if (index > 0)
+            {
+                Items[index - 1].Next = rangeItem;
+            }
+
+            if (index < Count - 1)
+            {
+                Items[index + 1].Previous = rangeItem;
+            }
+                
+            Items[index] = rangeItem;
+
+            return true;
+        }
+        
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private void Insert(int index, RangeItem<T> item)
+        {
+            Debug.Assert(item.Address != item.EndAddress);
             
             if (Count + 1 > Items.Length)
             {
-                Array.Resize(ref Items, (int)(Items.Length * 1.5));
+                Array.Resize(ref Items, Items.Length + BackingGrowthSize);
             }
 
             if (index >= Count)
@@ -80,6 +145,8 @@ namespace Ryujinx.Memory.Range
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private void RemoveAt(int index)
         {
+            _rangeItemPool.Release(Items[index]);
+            
             if (index < Count - 1)
             {
                 Items[index + 1].Previous = index > 0 ? Items[index - 1] : null;
@@ -106,7 +173,7 @@ namespace Ryujinx.Memory.Range
         {
             int index = BinarySearch(item.Address);
 
-            if (index >= 0 && Items[index] == item)
+            if (index >= 0 && Items[index].Value.Equals(item))
             {
                 RemoveAt(index);
                 
@@ -121,7 +188,7 @@ namespace Ryujinx.Memory.Range
         /// </summary>
         /// <param name="startItem">The first item in the range of items to be removed</param>
         /// <param name="endItem">The last item in the range of items to be removed</param>
-        public override void RemoveRange(T startItem, T endItem)
+        public override void RemoveRange(RangeItem<T> startItem, RangeItem<T> endItem)
         {
             if (startItem is null)
             {
@@ -130,7 +197,7 @@ namespace Ryujinx.Memory.Range
 
             if (startItem == endItem)
             {
-                Remove(startItem);
+                Remove(startItem.Value);
                 return;
             }
             
@@ -162,45 +229,42 @@ namespace Ryujinx.Memory.Range
         /// <param name="size">Size of the range</param>
         public void RemoveRange(ulong address, ulong size)
         {
-            (int startIndex, int endIndex) = BinarySearchEdges(address, address + size);
+            int startIndex = BinarySearchLeftEdge(address, address + size);
             
             if (startIndex < 0)
             {
                 return;
             }
             
-            if (startIndex == endIndex - 1)
+            int endIndex = startIndex;
+            
+            while (Items[endIndex] is not null && Items[endIndex].Address < address + size)
             {
-                RemoveAt(startIndex);
-                return;
+                if (endIndex == Count - 1)
+                {
+                    break;
+                }
+                
+                endIndex++;
             }
             
-            RemoveRangeInternal(startIndex, endIndex);
-        }
-
-        /// <summary>
-        /// Removes a range of items from the item list
-        /// </summary>
-        /// <param name="index">Start index of the range</param>
-        /// <param name="endIndex">End index of the range (exclusive)</param>
-        private void RemoveRangeInternal(int index, int endIndex)
-        {
-            if (endIndex < Count)
+            if (endIndex < Count - 1)
             {
-                Items[endIndex].Previous = index > 0 ? Items[index - 1] : null;
+                Items[endIndex + 1].Previous = startIndex > 0 ? Items[startIndex - 1] : null;
             }
 
-            if (index > 0)
+            if (startIndex > 0)
             {
-                Items[index - 1].Next = endIndex < Count ? Items[endIndex] : null;
+                Items[startIndex - 1].Next = endIndex < Count - 1 ? Items[endIndex + 1] : null;
             }
             
-            if (endIndex < Count)
+            
+            if (endIndex < Count - 1)
             {
-                Array.Copy(Items, endIndex, Items, index, Count - endIndex);
+                Array.Copy(Items, endIndex + 1, Items, startIndex, Count - endIndex - 1);
             }
             
-            Count -= endIndex - index;
+            Count -= endIndex - startIndex + 1;
         }
 
         /// <summary>
@@ -232,8 +296,8 @@ namespace Ryujinx.Memory.Range
             // So we need to return both the split 0-1 and 1-2 ranges.
             
             Lock.EnterWriteLock();
-            (T first, T last) = FindOverlapsAsNodes(address, size);
-            list = [];
+            (RangeItem<T> first, RangeItem<T> last) = FindOverlapsAsNodes(address, size);
+            list = new List<T>();
             
             if (first is null)
             {
@@ -247,41 +311,42 @@ namespace Ryujinx.Memory.Range
                 ulong lastAddress = address;
                 ulong endAddress = address + size;
 
-                T current = first;
+                RangeItem<T> current = first;
                 while (last is not null && current is not null && current.Address < endAddress)
                 {
-                    if (first == last && current.Address == address && current.Size == size)
+                    T region = current.Value;
+                    if (first == last && region.Address == address && region.Size == size)
                     {
                         // Exact match, no splitting required.
-                        list.Add(current);
+                        list.Add(region);
                         Lock.ExitWriteLock();
                         return;
                     }
 
-                    if (lastAddress < current.Address)
+                    if (lastAddress < region.Address)
                     {
                         // There is a gap between this region and the last. We need to fill it.
-                        T fillRegion = factory(lastAddress, current.Address - lastAddress);
+                        T fillRegion = factory(lastAddress, region.Address - lastAddress);
                         list.Add(fillRegion);
                         Add(fillRegion);
                     }
 
-                    if (current.Address < address)
+                    if (region.Address < address)
                     {
                         // Split the region around our base address and take the high half.
 
-                        current = Split(current, address);
+                        region = Split(region, address);
                     }
 
-                    if (current.EndAddress > address + size)
+                    if (region.EndAddress > address + size)
                     {
                         // Split the region around our end address and take the low half.
 
-                        Split(current, address + size);
+                        Split(region, address + size);
                     }
 
-                    list.Add(current);
-                    lastAddress = current.EndAddress;
+                    list.Add(region);
+                    lastAddress = region.EndAddress;
                     current = current.Next;
                 }
 
@@ -309,6 +374,7 @@ namespace Ryujinx.Memory.Range
         private T Split(T region, ulong splitAddress)
         {
             T newRegion = (T)region.Split(splitAddress);
+            Update(region);
             Add(newRegion);
             return newRegion;
         }
@@ -320,11 +386,16 @@ namespace Ryujinx.Memory.Range
         /// <param name="size">Size in bytes of the range</param>
         /// <returns>The leftmost overlapping item, or null if none is found</returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public override T FindOverlap(ulong address, ulong size)
+        public override RangeItem<T> FindOverlap(ulong address, ulong size)
         {
             int index = BinarySearchLeftEdge(address, address + size);
 
-            return index < 0 ? null : Items[index];
+            if (index < 0)
+            {
+                return null;
+            }
+
+            return Items[index];
         }
         
         /// <summary>
@@ -334,11 +405,16 @@ namespace Ryujinx.Memory.Range
         /// <param name="size">Size in bytes of the range</param>
         /// <returns>The overlapping item, or null if none is found</returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public override T FindOverlapFast(ulong address, ulong size)
+        public override RangeItem<T> FindOverlapFast(ulong address, ulong size)
         {
             int index = BinarySearch(address, address + size);
 
-            return index < 0 ? null : Items[index];
+            if (index < 0)
+            {
+                return null;
+            }
+
+            return Items[index];
         }
         
         /// <summary>
@@ -348,18 +424,23 @@ namespace Ryujinx.Memory.Range
         /// <param name="size">Size in bytes of the range</param>
         /// <returns>The first and last overlapping items, or null if none are found</returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public (T, T) FindOverlapsAsNodes(ulong address, ulong size)
+        public (RangeItem<T>, RangeItem<T>) FindOverlapsAsNodes(ulong address, ulong size)
         {
             (int index, int endIndex) = BinarySearchEdges(address, address + size);
 
-            return index < 0 ? (null, null) : (Items[index], Items[endIndex - 1]);
+            if (index < 0)
+            {
+                return (null, null);
+            }
+            
+            return (Items[index], Items[endIndex - 1]);
         }
         
-        public T[] FindOverlapsAsArray(ulong address, ulong size, out int length)
+        public RangeItem<T>[] FindOverlapsAsArray(ulong address, ulong size, out int length)
         {
             (int index, int endIndex) = BinarySearchEdges(address, address + size);
 
-            T[] result;
+            RangeItem<T>[] result;
             
             if (index < 0)
             {
@@ -368,20 +449,29 @@ namespace Ryujinx.Memory.Range
             }
             else
             {
-                result = ArrayPool<T>.Shared.Rent(endIndex - index);
+                result = ArrayPool<RangeItem<T>>.Shared.Rent(endIndex - index);
                 length = endIndex - index;
                 
-                Items.AsSpan(index, endIndex - index).CopyTo(result);
+                Array.Copy(Items, index, result, 0, endIndex - index);
             }
             
             return result;
         }
         
-        public ReadOnlySpan<T> FindOverlapsAsSpan(ulong address, ulong size)
+        public Span<RangeItem<T>> FindOverlapsAsSpan(ulong address, ulong size)
         {
             (int index, int endIndex) = BinarySearchEdges(address, address + size);
 
-            ReadOnlySpan<T> result = index < 0 ? [] : Items.AsSpan(index, endIndex - index);
+            Span<RangeItem<T>> result;
+            
+            if (index < 0)
+            {
+                result = [];
+            }
+            else
+            {
+                result = Items.AsSpan().Slice(index, endIndex - index);
+            }
             
             return result;
         }
@@ -390,7 +480,7 @@ namespace Ryujinx.Memory.Range
         {
             for (int i = 0; i < Count; i++)
             {
-                yield return Items[i];
+                yield return Items[i].Value;
             }
         }
     }

src/Ryujinx.Memory/Range/RangeList.cs

@@ -14,14 +14,14 @@ namespace Ryujinx.Memory.Range
     /// startIndex is inclusive.
     /// endIndex is exclusive.
     /// </remarks>
-    public readonly struct OverlapResult<T> where T : class, IRangeListRange<T>
+    public readonly struct OverlapResult<T> where T : IRange
     {
         public readonly int StartIndex = -1;
         public readonly int EndIndex = -1;
-        public readonly T QuickResult;
+        public readonly RangeItem<T> QuickResult;
         public int Count => EndIndex - StartIndex;
 
-        public OverlapResult(int startIndex, int endIndex, T quickResult = null)
+        public OverlapResult(int startIndex, int endIndex, RangeItem<T> quickResult = null)
         {
             this.StartIndex = startIndex;
             this.EndIndex = endIndex;
@@ -33,7 +33,7 @@ namespace Ryujinx.Memory.Range
     /// Sorted list of ranges that supports binary search.
     /// </summary>
     /// <typeparam name="T">Type of the range.</typeparam>
-    public class RangeList<T> : RangeListBase<T> where T : class, IRangeListRange<T>
+    public class RangeList<T> : RangeListBase<T> where T : IRange
     {
         public readonly ReaderWriterLockSlim Lock = new();
 
@@ -61,6 +61,104 @@ namespace Ryujinx.Memory.Range
                 index = ~index;
             }
 
+            Insert(index, new RangeItem<T>(item));
+        }
+
+        /// <summary>
+        /// Updates an item's end address on the list. Address must be the same.
+        /// </summary>
+        /// <param name="item">The item to be updated</param>
+        /// <returns>True if the item was located and updated, false otherwise</returns>
+        protected override bool Update(T item)
+        {
+            int index = BinarySearch(item.Address);
+
+            if (index >= 0)
+            {
+                while (index < Count)
+                {
+                    if (Items[index].Value.Equals(item))
+                    {
+                        RangeItem<T> rangeItem = new(item) { Previous = Items[index].Previous, Next = Items[index].Next };
+                        
+                        if (index > 0)
+                        {
+                            Items[index - 1].Next = rangeItem;
+                        }
+
+                        if (index < Count - 1)
+                        {
+                            Items[index + 1].Previous = rangeItem;
+                        }
+                        
+                        Items[index] = rangeItem;
+
+                        return true;
+                    }
+
+                    if (Items[index].Address > item.Address)
+                    {
+                        break;
+                    }
+
+                    index++;
+                }
+            }
+
+            return false;
+        }
+        
+        /// <summary>
+        /// Updates an item's end address on the list. Address must be the same.
+        /// </summary>
+        /// <param name="item">The RangeItem to be updated</param>
+        /// <returns>True if the item was located and updated, false otherwise</returns>
+        protected override bool Update(RangeItem<T> item)
+        {
+            int index = BinarySearch(item.Address);
+
+            if (index >= 0)
+            {
+                while (index < Count)
+                {
+                    if (Items[index].Equals(item))
+                    {
+                        RangeItem<T> rangeItem = new(item.Value) { Previous = item.Previous, Next = item.Next };
+                        
+                        if (index > 0)
+                        {
+                            Items[index - 1].Next = rangeItem;
+                        }
+
+                        if (index < Count - 1)
+                        {
+                            Items[index + 1].Previous = rangeItem;
+                        }
+                        
+                        Items[index] = rangeItem;
+
+                        return true;
+                    }
+
+                    if (Items[index].Address > item.Address)
+                    {
+                        break;
+                    }
+
+                    index++;
+                }
+            }
+
+            return false;
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private void Insert(int index, RangeItem<T> item)
+        {
+            Debug.Assert(item.Address != item.EndAddress);
+            
+            Debug.Assert(item.Address % 32 == 0);
+            
             if (Count + 1 > Items.Length)
             {
                 Array.Resize(ref Items, Items.Length + BackingGrowthSize);
@@ -122,7 +220,7 @@ namespace Ryujinx.Memory.Range
         /// <param name="startItem">The first item in the range of items to be removed</param>
         /// <param name="endItem">The last item in the range of items to be removed</param>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public override void RemoveRange(T startItem, T endItem)
+        public override void RemoveRange(RangeItem<T> startItem, RangeItem<T> endItem)
         {
             if (startItem is null)
             {
@@ -131,29 +229,30 @@ namespace Ryujinx.Memory.Range
 
             if (startItem == endItem)
             {
-                Remove(startItem);
+                Remove(startItem.Value);
                 return;
             }
             
-            (int index, int endIndex) = BinarySearchEdges(startItem.Address, endItem.EndAddress);
+            int startIndex = BinarySearch(startItem.Address);
+            int endIndex = BinarySearch(endItem.Address);
             
-            if (endIndex < Count)
+            if (endIndex < Count - 1)
             {
-                Items[endIndex].Previous = index > 0 ? Items[index - 1] : null;
+                Items[endIndex + 1].Previous = startIndex > 0 ? Items[startIndex - 1] : null;
             }
 
-            if (index > 0)
+            if (startIndex > 0)
             {
-                Items[index - 1].Next = endIndex < Count ? Items[endIndex] : null;
+                Items[startIndex - 1].Next = endIndex < Count - 1 ? Items[endIndex + 1] : null;
             }
             
             
-            if (endIndex < Count)
+            if (endIndex < Count - 1)
             {
-                Array.Copy(Items, endIndex, Items, index, Count - endIndex);
+                Array.Copy(Items, endIndex + 1, Items, startIndex, Count - endIndex - 1);
             }
             
-            Count -= endIndex - index;
+            Count -= endIndex - startIndex + 1;
         }
 
         /// <summary>
@@ -169,7 +268,7 @@ namespace Ryujinx.Memory.Range
             {
                 while (index < Count)
                 {
-                    if (Items[index] == item)
+                    if (Items[index].Value.Equals(item))
                     {
                         RemoveAt(index);
 
@@ -199,7 +298,7 @@ namespace Ryujinx.Memory.Range
         /// <param name="size">Size in bytes of the range</param>
         /// <returns>The overlapping item, or the default value for the type if none found</returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public override T FindOverlap(ulong address, ulong size)
+        public override RangeItem<T> FindOverlap(ulong address, ulong size)
         {
             int index = BinarySearchLeftEdge(address, address + size);
 
@@ -222,7 +321,7 @@ namespace Ryujinx.Memory.Range
         /// <param name="size">Size in bytes of the range</param>
         /// <returns>The overlapping item, or the default value for the type if none found</returns>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public override T FindOverlapFast(ulong address, ulong size)
+        public override RangeItem<T> FindOverlapFast(ulong address, ulong size)
         {
             int index = BinarySearch(address, address + size);
 
@@ -241,7 +340,7 @@ namespace Ryujinx.Memory.Range
         /// <param name="size">Size in bytes of the range</param>
         /// <param name="output">Output array where matches will be written. It is automatically resized to fit the results</param>
         /// <returns>Range information of overlapping items found</returns>
-        private OverlapResult<T> FindOverlaps(ulong address, ulong size, ref T[] output)
+        private OverlapResult<T> FindOverlaps(ulong address, ulong size, ref RangeItem<T>[] output)
         {
             int outputCount = 0;
 
@@ -254,7 +353,7 @@ namespace Ryujinx.Memory.Range
 
             for (int i = startIndex; i < Count; i++)
             {
-                T item = Items[i];
+                ref RangeItem<T> item = ref Items[i];
 
                 if (item.Address >= endAddress)
                 {
@@ -299,7 +398,7 @@ namespace Ryujinx.Memory.Range
         {
             for (int i = 0; i < Count; i++)
             {
-                yield return Items[i];
+                yield return Items[i].Value;
             }
         }
     }

src/Ryujinx.Memory/Range/RangeListBase.cs

@@ -1,22 +1,56 @@
 using Ryujinx.Common;
-using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 
 namespace Ryujinx.Memory.Range
 {
-    public interface IRangeListRange<TValue> : IRange where TValue : class, IRangeListRange<TValue>
+    public class RangeItem<TValue> where TValue : IRange
     {
-        public TValue Next { get; set; }
-        public TValue Previous { get; set; }
+        public RangeItem<TValue> Next;
+        public RangeItem<TValue> Previous;
+        
+        public ulong Address;
+        public ulong EndAddress;
+
+        public TValue Value;
+        
+        public RangeItem()
+        {
+            
+        }
+        
+        public RangeItem(TValue value)
+        {
+            Address = value.Address;
+            EndAddress = value.Address + value.Size;
+            Value = value;
+        }
+
+        public RangeItem<TValue> Set(TValue value)
+        {
+            Next = null;
+            Previous = null;
+            Address = value.Address;
+            EndAddress = value.Address + value.Size;
+            Value = value;
+            
+            return this;
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public bool OverlapsWith(ulong address, ulong endAddress)
+        {
+            return Address < endAddress && address < EndAddress;
+        }
     }
     
-    public unsafe abstract class RangeListBase<T> : IEnumerable<T> where T : class, IRangeListRange<T>
+    public unsafe abstract class RangeListBase<T> : IEnumerable<T> where T : IRange
     {
+        protected static readonly ObjectPool<RangeItem<T>> _rangeItemPool = new(() => new RangeItem<T>());
         private const int BackingInitialSize = 1024;
 
-        protected T[] Items;
+        protected RangeItem<T>[] Items;
         protected readonly int BackingGrowthSize;
         
         public int Count { get; protected set; }
@@ -28,18 +62,32 @@ namespace Ryujinx.Memory.Range
         protected RangeListBase(int backingInitialSize = BackingInitialSize)
         {
             BackingGrowthSize = backingInitialSize;
-            Items = new T[backingInitialSize];
+            Items = new RangeItem<T>[backingInitialSize];
         }
         
         public abstract void Add(T item);
+
+        /// <summary>
+        /// Updates an item's end address on the list. Address must be the same.
+        /// </summary>
+        /// <param name="item">The item to be updated</param>
+        /// <returns>True if the item was located and updated, false otherwise</returns>
+        protected abstract bool Update(T item);
+        
+        /// <summary>
+        /// Updates an item's end address on the list. Address must be the same.
+        /// </summary>
+        /// <param name="item">The RangeItem to be updated</param>
+        /// <returns>True if the item was located and updated, false otherwise</returns>
+        protected abstract bool Update(RangeItem<T> item);
         
         public abstract bool Remove(T item);
 
-        public abstract void RemoveRange(T startItem, T endItem);
+        public abstract void RemoveRange(RangeItem<T> startItem, RangeItem<T> endItem);
 
-        public abstract T FindOverlap(ulong address, ulong size);
+        public abstract RangeItem<T> FindOverlap(ulong address, ulong size);
         
-        public abstract T FindOverlapFast(ulong address, ulong size);
+        public abstract RangeItem<T> FindOverlapFast(ulong address, ulong size);
 
         /// <summary>
         /// Performs binary search on the internal list of items.
@@ -58,7 +106,7 @@ namespace Ryujinx.Memory.Range
 
                 int middle = left + (range >> 1);
 
-                T item = Items[middle];
+                ref RangeItem<T> item = ref Items[middle];
 
                 if (item.Address == address)
                 {
@@ -96,7 +144,7 @@ namespace Ryujinx.Memory.Range
 
                 int middle = left + (range >> 1);
 
-                T item = Items[middle];
+                ref RangeItem<T> item = ref Items[middle];
 
                 if (item.OverlapsWith(address, endAddress))
                 {
@@ -137,7 +185,7 @@ namespace Ryujinx.Memory.Range
 
                 int middle = left + (range >> 1);
 
-                T item = Items[middle];
+                ref RangeItem<T> item = ref Items[middle];
 
                 bool match = item.OverlapsWith(address, endAddress);
 
@@ -189,7 +237,7 @@ namespace Ryujinx.Memory.Range
 
                 int middle = right - (range >> 1);
 
-                T item = Items[middle];
+                ref RangeItem<T> item = ref Items[middle];
 
                 bool match = item.OverlapsWith(address, endAddress);
 
@@ -234,7 +282,7 @@ namespace Ryujinx.Memory.Range
 
             if (Count == 1)
             {
-                T item = Items[0];
+                ref RangeItem<T> item = ref Items[0];
 
                 if (item.OverlapsWith(address, endAddress))
                 {
@@ -264,7 +312,7 @@ namespace Ryujinx.Memory.Range
 
                 int middle = left + (range >> 1);
 
-                T item = Items[middle];
+                ref RangeItem<T> item = ref Items[middle];
 
                 bool match = item.OverlapsWith(address, endAddress);
 
@@ -321,7 +369,7 @@ namespace Ryujinx.Memory.Range
 
                 int middle = right - (range >> 1);
 
-                T item = Items[middle];
+                ref RangeItem<T> item = ref Items[middle];
 
                 bool match = item.OverlapsWith(address, endAddress);
 

src/Ryujinx.Memory/Tracking/AbstractRegion.cs

@@ -5,7 +5,7 @@ namespace Ryujinx.Memory.Tracking
     /// <summary>
     /// A region of memory.
     /// </summary>
-    abstract class AbstractRegion<T> : INonOverlappingRange<T> where T : class, INonOverlappingRange<T>
+    abstract class AbstractRegion : INonOverlappingRange
     {
         /// <summary>
         /// Base address.
@@ -21,9 +21,6 @@ namespace Ryujinx.Memory.Tracking
         /// End address.
         /// </summary>
         public ulong EndAddress => Address + Size;
-        
-        public T Next { get; set; }
-        public T Previous { get; set; }
 
         /// <summary>
         /// Create a new region.
@@ -40,11 +37,11 @@ namespace Ryujinx.Memory.Tracking
         /// Check if this range overlaps with another.
         /// </summary>
         /// <param name="address">Base address</param>
-        /// <param name="endAddress">End address</param>
+        /// <param name="size">Size of the range</param>
         /// <returns>True if overlapping, false otherwise</returns>
-        public bool OverlapsWith(ulong address, ulong endAddress)
+        public bool OverlapsWith(ulong address, ulong size)
         {
-            return Address < endAddress && address < EndAddress;
+            return Address < address + size && address < EndAddress;
         }
 
         /// <summary>
@@ -71,6 +68,6 @@ namespace Ryujinx.Memory.Tracking
         /// </summary>
         /// <param name="splitAddress">Address to split the region around</param>
         /// <returns>The second part of the split region, with start address at the given split.</returns>
-        public abstract INonOverlappingRange<T> Split(ulong splitAddress);
+        public abstract INonOverlappingRange Split(ulong splitAddress);
     }
 }

src/Ryujinx.Memory/Tracking/MemoryTracking.cs

@@ -81,10 +81,10 @@ namespace Ryujinx.Memory.Tracking
                 {
                     NonOverlappingRangeList<VirtualRegion> regions = type == 0 ? _virtualRegions : _guestVirtualRegions;
                     regions.Lock.EnterReadLock();
-                    ReadOnlySpan<VirtualRegion> overlaps = regions.FindOverlapsAsSpan(va, size);
+                    Span<RangeItem<VirtualRegion>> overlaps = regions.FindOverlapsAsSpan(va, size);
                     for (int i = 0; i < overlaps.Length; i++)
                     {
-                        VirtualRegion region = overlaps[i];
+                        VirtualRegion region = overlaps[i].Value;
 
                         // If the region has been fully remapped, signal that it has been mapped again.
                         bool remapped = _memoryManager.IsRangeMapped(region.Address, region.Size);
@@ -117,11 +117,11 @@ namespace Ryujinx.Memory.Tracking
                 {
                     NonOverlappingRangeList<VirtualRegion> regions = type == 0 ? _virtualRegions : _guestVirtualRegions;
                     regions.Lock.EnterReadLock();
-                    ReadOnlySpan<VirtualRegion> overlaps = regions.FindOverlapsAsSpan(va, size);
+                    Span<RangeItem<VirtualRegion>> overlaps = regions.FindOverlapsAsSpan(va, size);
                     
                     for (int i = 0; i < overlaps.Length; i++)
                     {
-                        overlaps[i].SignalMappingChanged(false);
+                        overlaps[i].Value.SignalMappingChanged(false);
                     }
                     regions.Lock.ExitReadLock();
                 }
@@ -301,7 +301,7 @@ namespace Ryujinx.Memory.Tracking
                 
                 // We use the non-span method here because keeping the lock will cause a deadlock.
                 regions.Lock.EnterReadLock();
-                VirtualRegion[] overlaps = regions.FindOverlapsAsArray(address, size, out int length);
+                RangeItem<VirtualRegion>[] overlaps = regions.FindOverlapsAsArray(address, size, out int length);
                 regions.Lock.ExitReadLock();
 
                 if (length == 0 && !precise)
@@ -327,7 +327,7 @@ namespace Ryujinx.Memory.Tracking
                     
                     for (int i = 0; i < length; i++)
                     {
-                        VirtualRegion region = overlaps[i];
+                        VirtualRegion region = overlaps[i].Value;
 
                         if (precise)
                         {
@@ -341,7 +341,7 @@ namespace Ryujinx.Memory.Tracking
 
                     if (length != 0)
                     {
-                        ArrayPool<VirtualRegion>.Shared.Return(overlaps);
+                        ArrayPool<RangeItem<VirtualRegion>>.Shared.Return(overlaps);
                     }
                 }
             }

src/Ryujinx.Memory/Tracking/SmartMultiRegionHandle.cs

@@ -58,7 +58,10 @@ namespace Ryujinx.Memory.Tracking
         {
             foreach (RegionHandle handle in _handles)
             {
-                handle?.RegisterAction((address, size) => action(handle.Address, handle.Size));
+                if (handle != null)
+                {
+                    handle?.RegisterAction((address, size) => action(handle.Address, handle.Size));
+                }
             }
         }
 
@@ -66,7 +69,10 @@ namespace Ryujinx.Memory.Tracking
         {
             foreach (RegionHandle handle in _handles)
             {
-                handle?.RegisterPreciseAction((address, size, write) => action(handle.Address, handle.Size, write));
+                if (handle != null)
+                {
+                    handle?.RegisterPreciseAction((address, size, write) => action(handle.Address, handle.Size, write));
+                }
             }
         }
 

src/Ryujinx.Memory/Tracking/VirtualRegion.cs

@@ -6,7 +6,7 @@ namespace Ryujinx.Memory.Tracking
     /// <summary>
     /// A region of virtual memory.
     /// </summary>
-    class VirtualRegion : AbstractRegion<VirtualRegion>
+    class VirtualRegion : AbstractRegion
     {
         public List<RegionHandle> Handles = [];
 
@@ -137,7 +137,7 @@ namespace Ryujinx.Memory.Tracking
             }
         }
 
-        public override INonOverlappingRange<VirtualRegion> Split(ulong splitAddress)
+        public override INonOverlappingRange Split(ulong splitAddress)
         {
             VirtualRegion newRegion = new(_tracking, splitAddress, EndAddress - splitAddress, Guest, _lastPermission);
             Size = splitAddress - Address;

src/Ryujinx/Headless/Windows/WindowBase.cs

@@ -580,10 +580,5 @@ namespace Ryujinx.Headless
         {
             return AccountSaveDataManager.GetLastUsedUser();
         }
-        
-        public void TakeScreenshot()
-        {
-            throw new NotImplementedException();
-        }
     }
 }

src/Ryujinx/Program.cs

@@ -17,7 +17,6 @@ using Ryujinx.Common.Configuration;
 using Ryujinx.Common.GraphicsDriver;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.SystemInterop;
-using Ryujinx.Common.Utilities;
 using Ryujinx.Graphics.Vulkan.MoltenVK;
 using Ryujinx.Headless;
 using Ryujinx.SDL3.Common;
@@ -47,7 +46,7 @@ namespace Ryujinx.Ava
         public static int Main(string[] args)
         {
             Version = ReleaseInformation.Version;
-
+            
             if (OperatingSystem.IsWindows())
             {
                 if (!OperatingSystem.IsWindowsVersionAtLeast(10, 0, 19041))
@@ -56,11 +55,8 @@ namespace Ryujinx.Ava
                     return 0;
                 }
 
-                var programFiles = Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles);
-                var programFilesX86 = Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86);
-
-                if (Environment.CurrentDirectory.StartsWithIgnoreCase(programFiles) ||
-                    Environment.CurrentDirectory.StartsWithIgnoreCase(programFilesX86))
+                if (Environment.CurrentDirectory.StartsWithIgnoreCase("C:\\Program Files") || 
+                    Environment.CurrentDirectory.StartsWithIgnoreCase("C:\\Program Files (x86)"))
                 {
                     _ = Win32NativeInterop.MessageBoxA(nint.Zero, "Ryujinx is not intended to be run from the Program Files folder. Please move it out and relaunch.", $"Ryujinx {Version}", MbIconwarning);
                     return 0;
@@ -77,23 +73,11 @@ namespace Ryujinx.Ava
                 }
             }
 
-            bool noGuiArg = ConsumeCommandLineArgument(ref args, "--no-gui") || ConsumeCommandLineArgument(ref args, "nogui");
-            bool coreDumpArg = ConsumeCommandLineArgument(ref args, "--core-dumps");
-
-            // TODO: Ryujinx causes core dumps on Linux when it exits "uncleanly", eg. through an unhandled exception.
-            //       This is undesirable and causes very odd behavior during development (the process stops responding, 
-            //       the .NET debugger freezes or suddenly detaches, /tmp/ gets filled etc.), unless explicitly requested by the user.
-            //       This needs to be investigated, but calling prctl() is better than modifying system-wide settings or leaving this be.
-            if (!coreDumpArg)
-            {
-                OsUtils.SetCoreDumpable(false);
-            }
-
             PreviewerDetached = true;
 
-            if (noGuiArg)
+            if (args.Length > 0 && args[0] is "--no-gui" or "nogui")
             {
-                HeadlessRyujinx.Entrypoint(args);
+                HeadlessRyujinx.Entrypoint(args[1..]);
                 return 0;
             }
 
@@ -128,14 +112,6 @@ namespace Ryujinx.Ava
                         : [Win32RenderingMode.Software]
                 });
 
-        private static bool ConsumeCommandLineArgument(ref string[] args, string targetArgument)
-        {
-            List<string> argList = [.. args];
-            bool found = argList.Remove(targetArgument);
-            args = argList.ToArray();
-            return found;
-        }
-
         private static void Initialize(string[] args)
         {
             // Ensure Discord presence timestamp begins at the absolute start of when Ryujinx is launched
@@ -201,6 +177,7 @@ namespace Ryujinx.Ava
             }
         }
 
+
         public static string GetDirGameUserConfig(string gameId, bool changeFolderForGame = false)
         {
             if (string.IsNullOrEmpty(gameId))
@@ -219,26 +196,22 @@ namespace Ryujinx.Ava
             return gameDir;
         }
 
-        public static void ReloadConfig(bool isRunGameWithCustomConfig = false)
+        public static void ReloadConfig()
         {
 
             string localConfigurationPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, ReleaseInformation.ConfigName);
             string appDataConfigurationPath = Path.Combine(AppDataManager.BaseDirPath, ReleaseInformation.ConfigName);
 
-
-            if (!isRunGameWithCustomConfig) // To return settings from the game folder if the user configuration exists
+            // Now load the configuration as the other subsystems are now registered
+            if (File.Exists(localConfigurationPath))
             {
-                // Now load the configuration as the other subsystems are now registered
-                if (File.Exists(localConfigurationPath))
-                {
-                    ConfigurationPath = localConfigurationPath;
-                }
-                else if (File.Exists(appDataConfigurationPath))
-                {
-                    ConfigurationPath = appDataConfigurationPath;
-                }
+                ConfigurationPath = localConfigurationPath;
             }
-        
+            else if (File.Exists(appDataConfigurationPath))
+            {
+                ConfigurationPath = appDataConfigurationPath;
+            }
+
             if (ConfigurationPath == null)
             {
                 // No configuration, we load the default values and save it to disk
@@ -260,8 +233,6 @@ namespace Ryujinx.Ava
                 {
                     Logger.Warning?.PrintMsg(LogClass.Application, $"Failed to load config! Loading the default config instead.\nFailed config location: {ConfigurationPath}");
 
-                    ConfigurationFileFormat.RenameInvalidConfigFile(ConfigurationPath);
-
                     ConfigurationState.Instance.LoadDefault();
                 }
             }

src/Ryujinx/Systems/AppHost.cs

@@ -501,12 +501,18 @@ namespace Ryujinx.Ava.Systems
 
         private void UpdateIgnoreMissingServicesState(object sender, ReactiveEventArgs<bool> args)
         {
-            Device?.Configuration.IgnoreMissingServices = args.NewValue;
+            if (Device != null)
+            {
+                Device.Configuration.IgnoreMissingServices = args.NewValue;
+            }
         }
 
         private void UpdateAspectRatioState(object sender, ReactiveEventArgs<AspectRatio> args)
         {
-            Device?.Configuration.AspectRatio = args.NewValue;
+            if (Device != null)
+            {
+                Device.Configuration.AspectRatio = args.NewValue;
+            }
         }
 
         private void UpdateAntiAliasing(object sender, ReactiveEventArgs<AntiAliasing> e)

src/Ryujinx/Systems/Configuration/ConfigurationFileFormat.cs

@@ -6,9 +6,7 @@ using Ryujinx.Common.Configuration.Multiplayer;
 using Ryujinx.Common.Logging;
 using Ryujinx.Common.Utilities;
 using Ryujinx.HLE;
-using System;
 using System.Collections.Generic;
-using System.IO;
 
 namespace Ryujinx.Ava.Systems.Configuration
 {
@@ -512,43 +510,6 @@ namespace Ryujinx.Ava.Systems.Configuration
             }
         }
 
-        /// <summary>
-        /// Renames the configuration file when it is deemed invalid
-        /// </summary>
-        /// <param name="path">The path to the invalid JSON configuration file</param>
-        /// <returns>The path of the renamed invalid JSON configuration file, or null if the rename failed</returns>
-        public static string RenameInvalidConfigFile(string path)
-        {
-            if (string.IsNullOrWhiteSpace(path) || !File.Exists(path))
-            {
-                return null;
-            }
-
-            try
-            {
-                string directory = Path.GetDirectoryName(path) ?? string.Empty;
-                string originalFileName = Path.GetFileName(path);
-                if (string.IsNullOrWhiteSpace(originalFileName))
-                {
-                    return null;
-                }
-                string renamedFileName = $"{originalFileName}.{DateTime.Now:yyyy-MM-dd_HH-mm-ss}.invalid";
-                string renamedPath = string.IsNullOrEmpty(directory) ? renamedFileName : Path.Combine(directory, renamedFileName);
-
-                File.Move(path, renamedPath, overwrite: false);
-
-                Logger.Warning?.PrintMsg(LogClass.Application, $"Invalid configuration renamed to: {renamedPath}");
-
-                return renamedPath;
-            }
-            catch (Exception ex)
-            {
-                Logger.Error?.PrintMsg(LogClass.Application, $"Failed to rename invalid configuration file \"{path}\": {ex}");
-
-                return null;
-            }
-        }
-
         /// <summary>
         /// Save a configuration file to disk
         /// </summary>

src/Ryujinx/Systems/Configuration/ConfigurationState.Migration.cs

@@ -28,8 +28,6 @@ namespace Ryujinx.Ava.Systems.Configuration
             {
                 RyuLogger.Warning?.Print(LogClass.Application, $"Unsupported configuration version {cff.Version}, loading default.");
 
-                ConfigurationFileFormat.RenameInvalidConfigFile(configurationFilePath);
-
                 LoadDefault();
                 return;
             }

src/Ryujinx/Systems/Updater/Updater.GitLab.cs

@@ -88,10 +88,14 @@ namespace Ryujinx.Ava.Systems
             {
                 if (showVersionUpToDate)
                 {
-                    await ContentDialogHelper.CreateUpdaterUpToDateInfoDialog(
+                    UserResult userResult = await ContentDialogHelper.CreateUpdaterUpToDateInfoDialog(
                         LocaleManager.Instance[LocaleKeys.DialogUpdaterAlreadyOnLatestVersionMessage],
-                        string.Empty, 
-                        _versionResponse.ReleaseUrlFormat.Format(currentVersion));
+                        string.Empty);
+
+                    if (userResult is UserResult.Ok)
+                    {
+                        OpenHelper.OpenUrl(_versionResponse.ReleaseUrlFormat.Format(currentVersion));
+                    }
                 }
 
                 Logger.Info?.Print(LogClass.Application, "Up to date.");

src/Ryujinx/Systems/Updater/Updater.cs

@@ -60,10 +60,14 @@ namespace Ryujinx.Ava.Systems
             {
                 if (showVersionUpToDate)
                 {
-                    await ContentDialogHelper.CreateUpdaterUpToDateInfoDialog(
+                    UserResult userResult = await ContentDialogHelper.CreateUpdaterUpToDateInfoDialog(
                         LocaleManager.Instance[LocaleKeys.DialogUpdaterAlreadyOnLatestVersionMessage],
-                        string.Empty, 
-                        changelogUrl: _versionResponse.ReleaseUrlFormat.Format(currentVersion));
+                        string.Empty);
+
+                    if (userResult is UserResult.Ok)
+                    {
+                        OpenHelper.OpenUrl(_versionResponse.ReleaseUrlFormat.Format(currentVersion));
+                    }
                 }
 
                 Logger.Info?.Print(LogClass.Application, "Up to date.");
@@ -102,18 +106,22 @@ namespace Ryujinx.Ava.Systems
 
                 Logger.Info?.Print(LogClass.Application, $"Version found: {newVersionString.Replace("→", "->")}");
 
+            RequestUserToUpdate:
                 // Show a message asking the user if they want to update
                 UserResult shouldUpdate = await ContentDialogHelper.CreateUpdaterChoiceDialog(
                     LocaleManager.Instance[LocaleKeys.RyujinxUpdater],
                     LocaleManager.Instance[LocaleKeys.RyujinxUpdaterMessage],
-                    newVersionString,
-                    ReleaseInformation.GetChangelogUrl(currentVersion, newVersion));
+                    newVersionString);
 
                 switch (shouldUpdate)
                 {
                     case UserResult.Yes:
                         await UpdateRyujinx(_versionResponse.ArtifactUrl);
                         break;
+                    // Secondary button maps to no, which in this case is the show changelog button.
+                    case UserResult.No:
+                        OpenHelper.OpenUrl(ReleaseInformation.GetChangelogUrl(currentVersion, newVersion));
+                        goto RequestUserToUpdate;
                     default:
                         _running = false;
                         break;

src/Ryujinx/UI/Applet/AvaHostUIHandler.cs

@@ -327,10 +327,5 @@ namespace Ryujinx.Ava.UI.Applet
 
             return profile;
         }
-        
-        public void TakeScreenshot()
-        {
-            _parent.ViewModel.AppHost.ScreenshotRequested = true;
-        }
     }
 }

src/Ryujinx/UI/Applet/SwkbdAppletDialog.axaml.cs

@@ -167,7 +167,10 @@ namespace Ryujinx.Ava.UI.Controls
 
         private void Message_TextInput(object sender, TextInputEventArgs e)
         {
-            _host?.IsPrimaryButtonEnabled = _checkLength(Message.Length) && _checkInput(Message);
+            if (_host != null)
+            {
+                _host.IsPrimaryButtonEnabled = _checkLength(Message.Length) && _checkInput(Message);
+            }
         }
 
         private void Message_KeyUp(object sender, KeyEventArgs e)

src/Ryujinx/UI/Helpers/ContentDialogHelper.cs

@@ -10,7 +10,6 @@ using FluentAvalonia.Core;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Windows;
-using Ryujinx.Common.Helper;
 using Ryujinx.Common.Logging;
 using System;
 using System.Threading;
@@ -103,25 +102,6 @@ namespace Ryujinx.Ava.UI.Helpers
 
             return await ShowContentDialog(title, content, primaryButton, secondaryButton, closeButton, primaryButtonResult, deferResetEvent, deferCloseAction);
         }
-        
-        public async static Task<UserResult> ShowTextDialogWithButton(
-            string title,
-            string primaryText,
-            string secondaryText,
-            string primaryButton,
-            string secondaryButton,
-            string closeButton,
-            int iconSymbol,
-            string buttonText,
-            Action onClick,
-            UserResult primaryButtonResult = UserResult.Ok,
-            ManualResetEvent deferResetEvent = null,
-            TypedEventHandler<ContentDialog, ContentDialogButtonClickEventArgs> deferCloseAction = null)
-        {
-            Grid content = CreateTextDialogContentWithButton(primaryText, secondaryText, iconSymbol, buttonText, onClick);
-
-            return await ShowContentDialog(title, content, primaryButton, secondaryButton, closeButton, primaryButtonResult, deferResetEvent, deferCloseAction);
-        }
 
         public static async Task<UserResult> ShowDeferredContentDialog(
             Window window,
@@ -193,109 +173,43 @@ namespace Ryujinx.Ava.UI.Helpers
                 MinHeight = 80,
             };
 
-            content.Children.Add(new SymbolIcon
+            SymbolIcon icon = new()
             {
                 Symbol = (Symbol)symbol,
                 Margin = new Thickness(10),
                 FontSize = 40,
                 FlowDirection = FlowDirection.LeftToRight,
                 VerticalAlignment = VerticalAlignment.Center,
-                GridColumn = 0,
-                GridRow = 0,
-                GridRowSpan = 2
-            });
+            };
 
-            content.Children.Add(new TextBlock
+            Grid.SetColumn(icon, 0);
+            Grid.SetRowSpan(icon, 2);
+            Grid.SetRow(icon, 0);
+
+            TextBlock primaryLabel = new()
             {
                 Text = primaryText,
                 Margin = new Thickness(5),
                 TextWrapping = TextWrapping.Wrap,
                 MaxWidth = 450,
-                GridColumn = 1,
-                GridRow = 0
-            });
+            };
 
-            content.Children.Add(new TextBlock
+            TextBlock secondaryLabel = new()
             {
                 Text = secondaryText,
                 Margin = new Thickness(5),
                 TextWrapping = TextWrapping.Wrap,
                 MaxWidth = 450,
-                GridColumn = 1,
-                GridRow = 1
-            });
-
-            return content;
-        }
-
-        private static Grid CreateTextDialogContentWithButton(string primaryText, string secondaryText, int symbol, string buttonName, Action onClick)
-        {
-            Grid content = new()
-            {
-                RowDefinitions = [new(), new(), new(GridLength.Star), new()],
-                ColumnDefinitions = [new(GridLength.Auto), new()],
-
-                MinHeight = 80,
             };
 
-            content.Children.Add(new SymbolIcon
-            {
-                Symbol = (Symbol)symbol,
-                Margin = new Thickness(10),
-                FontSize = 40,
-                FlowDirection = FlowDirection.LeftToRight,
-                VerticalAlignment = VerticalAlignment.Center,
-                GridColumn = 0,
-                GridRow = 0,
-                GridRowSpan = 2
-            });
+            Grid.SetColumn(primaryLabel, 1);
+            Grid.SetColumn(secondaryLabel, 1);
+            Grid.SetRow(primaryLabel, 0);
+            Grid.SetRow(secondaryLabel, 1);
 
-            StackPanel buttonContent = new()
-            {
-                Orientation = Orientation.Horizontal,
-                Spacing = 2
-            };
-
-            buttonContent.Children.Add(new TextBlock
-            {
-                Text = buttonName, 
-                Margin = new Thickness(2)
-            });
-
-            buttonContent.Children.Add(new SymbolIcon
-            {
-                FlowDirection = FlowDirection.LeftToRight,
-                Symbol = Symbol.Open
-            });
-
-            content.Children.Add(new TextBlock
-            {
-                Text = primaryText,
-                Margin = new Thickness(5),
-                TextWrapping = TextWrapping.Wrap,
-                MaxWidth = 450,
-                GridColumn = 1,
-                GridRow = 0
-            });
-
-            content.Children.Add(new TextBlock
-            {
-                Text = secondaryText,
-                Margin = new Thickness(5),
-                TextWrapping = TextWrapping.Wrap,
-                MaxWidth = 450,
-                GridColumn = 1,
-                GridRow = 1
-            });
-
-            content.Children.Add(new Button
-            {
-                Content = buttonContent,
-                HorizontalAlignment = HorizontalAlignment.Center,
-                Command = Commands.Create(onClick),
-                GridRow = 2,
-                GridColumnSpan = 2,
-            });
+            content.Children.Add(icon);
+            content.Children.Add(primaryLabel);
+            content.Children.Add(secondaryLabel);
 
             return content;
         }
@@ -368,20 +282,15 @@ namespace Ryujinx.Ava.UI.Helpers
                 LocaleManager.Instance[LocaleKeys.InputDialogOk],
                 (int)Symbol.Important);
 
-        internal static async Task CreateUpdaterUpToDateInfoDialog(string primary, string secondaryText,
-            string changelogUrl)
-        {
-            await ShowTextDialogWithButton(
+        internal static async Task<UserResult> CreateUpdaterUpToDateInfoDialog(string primary, string secondaryText)
+            => await ShowTextDialog(
                 LocaleManager.Instance[LocaleKeys.DialogUpdaterTitle],
                 primary,
                 secondaryText,
-                string.Empty,
+                LocaleManager.Instance[LocaleKeys.DialogUpdaterShowChangelogMessage],
                 string.Empty,
                 LocaleManager.Instance[LocaleKeys.InputDialogOk],
-                (int)Symbol.Important,
-                LocaleManager.Instance[LocaleKeys.DialogUpdaterShowChangelogMessage],
-                () => OpenHelper.OpenUrl(changelogUrl));
-        }
+                (int)Symbol.Important);
 
         internal static async Task CreateWarningDialog(string primary, string secondaryText)
             => await ShowTextDialog(
@@ -431,7 +340,7 @@ namespace Ryujinx.Ava.UI.Helpers
             return response == UserResult.Yes;
         }
 
-        internal static async Task<UserResult> CreateUpdaterChoiceDialog(string title, string primary, string secondaryText, string changelogUrl)
+        internal static async Task<UserResult> CreateUpdaterChoiceDialog(string title, string primary, string secondaryText)
         {
             if (_isChoiceDialogOpen)
             {
@@ -440,16 +349,14 @@ namespace Ryujinx.Ava.UI.Helpers
 
             _isChoiceDialogOpen = true;
 
-            UserResult response = await ShowTextDialogWithButton(
+            UserResult response = await ShowTextDialog(
                 title,
                 primary,
                 secondaryText,
                 LocaleManager.Instance[LocaleKeys.InputDialogYes],
-                string.Empty,
+                LocaleManager.Instance[LocaleKeys.DialogUpdaterShowChangelogMessage],
                 LocaleManager.Instance[LocaleKeys.InputDialogNo],
                 (int)Symbol.Help,
-                LocaleManager.Instance[LocaleKeys.DialogUpdaterShowChangelogMessage],
-                () => OpenHelper.OpenUrl(changelogUrl),
                 UserResult.Yes);
 
             _isChoiceDialogOpen = false;

src/Ryujinx/UI/Helpers/ControlExtensions.cs

@@ -1,40 +0,0 @@
-using Avalonia.Controls;
-
-namespace Ryujinx.Ava.UI.Helpers
-{
-    public static class ControlExtensions
-    {
-        extension(Control ctrl)
-        {
-            public int GridRow
-            {
-                get => Grid.GetRow(ctrl);
-                set => Grid.SetRow(ctrl, value);
-            }
-
-            public int GridColumn
-            {
-                get => Grid.GetColumn(ctrl);
-                set => Grid.SetColumn(ctrl, value);
-            }
-
-            public int GridRowSpan
-            {
-                get => Grid.GetRowSpan(ctrl);
-                set => Grid.SetRowSpan(ctrl, value);
-            }
-
-            public int GridColumnSpan
-            {
-                get => Grid.GetColumnSpan(ctrl);
-                set => Grid.SetColumnSpan(ctrl, value);
-            }
-
-            public bool GridIsSharedSizeScope
-            {
-                get => Grid.GetIsSharedSizeScope(ctrl);
-                set => Grid.SetIsSharedSizeScope(ctrl, value);
-            }
-        }
-    }
-}

src/Ryujinx/UI/Models/Input/GamepadInputConfig.cs

@@ -27,136 +27,82 @@ namespace Ryujinx.Ava.UI.Models.Input
         public ControllerType ControllerType { get; set; }
         public PlayerIndex PlayerIndex { get; set; }
 
-        [ObservableProperty]
-        public partial StickInputId LeftJoystick { get; set; }
+        [ObservableProperty] private StickInputId _leftJoystick;
+        [ObservableProperty] private bool _leftInvertStickX;
+        [ObservableProperty] private bool _leftInvertStickY;
+        [ObservableProperty] private bool _leftRotate90;
+        [ObservableProperty] private GamepadInputId _leftStickButton;
 
-        [ObservableProperty]
-        public partial bool LeftInvertStickX { get; set; }
+        [ObservableProperty] private StickInputId _rightJoystick;
+        [ObservableProperty] private bool _rightInvertStickX;
+        [ObservableProperty] private bool _rightInvertStickY;
+        [ObservableProperty] private bool _rightRotate90;
+        [ObservableProperty] private GamepadInputId _rightStickButton;
 
-        [ObservableProperty]
-        public partial bool LeftInvertStickY { get; set; }
+        [ObservableProperty] private GamepadInputId _dpadUp;
+        [ObservableProperty] private GamepadInputId _dpadDown;
+        [ObservableProperty] private GamepadInputId _dpadLeft;
+        [ObservableProperty] private GamepadInputId _dpadRight;
 
-        [ObservableProperty]
-        public partial bool LeftRotate90 { get; set; }
+        [ObservableProperty] private GamepadInputId _buttonMinus;
+        [ObservableProperty] private GamepadInputId _buttonPlus;
 
-        [ObservableProperty]
-        public partial GamepadInputId LeftStickButton { get; set; }
+        [ObservableProperty] private GamepadInputId _buttonA;
+        [ObservableProperty] private GamepadInputId _buttonB;
+        [ObservableProperty] private GamepadInputId _buttonX;
+        [ObservableProperty] private GamepadInputId _buttonY;
 
-        [ObservableProperty]
-        public partial StickInputId RightJoystick { get; set; }
+        [ObservableProperty] private GamepadInputId _buttonZl;
+        [ObservableProperty] private GamepadInputId _buttonZr;
 
-        [ObservableProperty]
-        public partial bool RightInvertStickX { get; set; }
+        [ObservableProperty] private GamepadInputId _buttonL;
+        [ObservableProperty] private GamepadInputId _buttonR;
 
-        [ObservableProperty]
-        public partial bool RightInvertStickY { get; set; }
+        [ObservableProperty] private GamepadInputId _leftButtonSl;
+        [ObservableProperty] private GamepadInputId _leftButtonSr;
 
-        [ObservableProperty]
-        public partial bool RightRotate90 { get; set; }
+        [ObservableProperty] private GamepadInputId _rightButtonSl;
+        [ObservableProperty] private GamepadInputId _rightButtonSr;
 
-        [ObservableProperty]
-        public partial GamepadInputId RightStickButton { get; set; }
+        [ObservableProperty] private float _deadzoneLeft;
+        [ObservableProperty] private float _deadzoneRight;
 
-        [ObservableProperty]
-        public partial GamepadInputId DpadUp { get; set; }
+        [ObservableProperty] private float _rangeLeft;
+        [ObservableProperty] private float _rangeRight;
 
-        [ObservableProperty]
-        public partial GamepadInputId DpadDown { get; set; }
+        [ObservableProperty] private float _triggerThreshold;
 
-        [ObservableProperty]
-        public partial GamepadInputId DpadLeft { get; set; }
+        [ObservableProperty] private bool _enableMotion;
 
-        [ObservableProperty]
-        public partial GamepadInputId DpadRight { get; set; }
+        [ObservableProperty] private bool _enableRumble;
 
-        [ObservableProperty]
-        public partial GamepadInputId ButtonMinus { get; set; }
+        [ObservableProperty] private bool _enableLedChanging;
 
-        [ObservableProperty]
-        public partial GamepadInputId ButtonPlus { get; set; }
-
-        [ObservableProperty]
-        public partial GamepadInputId ButtonA { get; set; }
-
-        [ObservableProperty]
-        public partial GamepadInputId ButtonB { get; set; }
-
-        [ObservableProperty]
-        public partial GamepadInputId ButtonX { get; set; }
-
-        [ObservableProperty]
-        public partial GamepadInputId ButtonY { get; set; }
-
-        [ObservableProperty]
-        public partial GamepadInputId ButtonZl { get; set; }
-
-        [ObservableProperty]
-        public partial GamepadInputId ButtonZr { get; set; }
-
-        [ObservableProperty]
-        public partial GamepadInputId ButtonL { get; set; }
-
-        [ObservableProperty]
-        public partial GamepadInputId ButtonR { get; set; }
-
-        [ObservableProperty]
-        public partial GamepadInputId LeftButtonSl { get; set; }
-
-        [ObservableProperty]
-        public partial GamepadInputId LeftButtonSr { get; set; }
-
-        [ObservableProperty]
-        public partial GamepadInputId RightButtonSl { get; set; }
-
-        [ObservableProperty]
-        public partial GamepadInputId RightButtonSr { get; set; }
-
-        [ObservableProperty]
-        public partial float DeadzoneLeft { get; set; }
-
-        [ObservableProperty]
-        public partial float DeadzoneRight { get; set; }
-
-        [ObservableProperty]
-        public partial float RangeLeft { get; set; }
-
-        [ObservableProperty]
-        public partial float RangeRight { get; set; }
-
-        [ObservableProperty]
-        public partial float TriggerThreshold { get; set; }
-
-        [ObservableProperty]
-        public partial bool EnableMotion { get; set; }
-
-        [ObservableProperty]
-        public partial bool EnableRumble { get; set; }
-
-        [ObservableProperty]
-        public partial bool EnableLedChanging { get; set; }
-
-        [ObservableProperty]
-        public partial Color LedColor { get; set; }
+        [ObservableProperty] private Color _ledColor;
 
         public bool ShowLedColorPicker => !TurnOffLed && !UseRainbowLed;
 
+        private bool _turnOffLed;
+
         public bool TurnOffLed
         {
-            get;
+            get => _turnOffLed;
             set
             {
-                field = value;
+                _turnOffLed = value;
                 OnPropertyChanged();
                 OnPropertyChanged(nameof(ShowLedColorPicker));
             }
         }
 
+        private bool _useRainbowLed;
+
         public bool UseRainbowLed
         {
-            get;
+            get => _useRainbowLed;
             set
             {
-                field = value;
+                _useRainbowLed = value;
                 OnPropertyChanged();
                 OnPropertyChanged(nameof(ShowLedColorPicker));
             }

src/Ryujinx/UI/Models/Input/HotkeyConfig.cs

@@ -6,44 +6,31 @@ namespace Ryujinx.Ava.UI.Models.Input
 {
     public partial class HotkeyConfig : BaseModel
     {
-        [ObservableProperty]
-        public partial Key ToggleVSyncMode { get; set; }
+        [ObservableProperty] private Key _toggleVSyncMode;
 
-        [ObservableProperty]
-        public partial Key Screenshot { get; set; }
+        [ObservableProperty] private Key _screenshot;
 
-        [ObservableProperty]
-        public partial Key ShowUI { get; set; }
+        [ObservableProperty] private Key _showUI;
 
-        [ObservableProperty]
-        public partial Key Pause { get; set; }
+        [ObservableProperty] private Key _pause;
 
-        [ObservableProperty]
-        public partial Key ToggleMute { get; set; }
+        [ObservableProperty] private Key _toggleMute;
 
-        [ObservableProperty]
-        public partial Key ResScaleUp { get; set; }
+        [ObservableProperty] private Key _resScaleUp;
 
-        [ObservableProperty]
-        public partial Key ResScaleDown { get; set; }
+        [ObservableProperty] private Key _resScaleDown;
 
-        [ObservableProperty]
-        public partial Key VolumeUp { get; set; }
+        [ObservableProperty] private Key _volumeUp;
 
-        [ObservableProperty]
-        public partial Key VolumeDown { get; set; }
+        [ObservableProperty] private Key _volumeDown;
 
-        [ObservableProperty]
-        public partial Key CustomVSyncIntervalIncrement { get; set; }
+        [ObservableProperty] private Key _customVSyncIntervalIncrement;
 
-        [ObservableProperty]
-        public partial Key CustomVSyncIntervalDecrement { get; set; }
+        [ObservableProperty] private Key _customVSyncIntervalDecrement;
 
-        [ObservableProperty]
-        public partial Key TurboMode { get; set; }
+        [ObservableProperty] private Key _turboMode;
 
-        [ObservableProperty]
-        public partial bool TurboModeWhileHeld { get; set; }
+        [ObservableProperty] private bool _turboModeWhileHeld;
 
         public HotkeyConfig(KeyboardHotkeys config)
         {

src/Ryujinx/UI/Models/Input/KeyboardInputConfig.cs

@@ -12,89 +12,42 @@ namespace Ryujinx.Ava.UI.Models.Input
         public ControllerType ControllerType { get; set; }
         public PlayerIndex PlayerIndex { get; set; }
 
-        [ObservableProperty]
-        public partial Key LeftStickUp { get; set; }
+        [ObservableProperty] private Key _leftStickUp;
+        [ObservableProperty] private Key _leftStickDown;
+        [ObservableProperty] private Key _leftStickLeft;
+        [ObservableProperty] private Key _leftStickRight;
+        [ObservableProperty] private Key _leftStickButton;
 
-        [ObservableProperty]
-        public partial Key LeftStickDown { get; set; }
+        [ObservableProperty] private Key _rightStickUp;
+        [ObservableProperty] private Key _rightStickDown;
+        [ObservableProperty] private Key _rightStickLeft;
+        [ObservableProperty] private Key _rightStickRight;
+        [ObservableProperty] private Key _rightStickButton;
 
-        [ObservableProperty]
-        public partial Key LeftStickLeft { get; set; }
+        [ObservableProperty] private Key _dpadUp;
+        [ObservableProperty] private Key _dpadDown;
+        [ObservableProperty] private Key _dpadLeft;
+        [ObservableProperty] private Key _dpadRight;
 
-        [ObservableProperty]
-        public partial Key LeftStickRight { get; set; }
+        [ObservableProperty] private Key _buttonMinus;
+        [ObservableProperty] private Key _buttonPlus;
 
-        [ObservableProperty]
-        public partial Key LeftStickButton { get; set; }
+        [ObservableProperty] private Key _buttonA;
+        [ObservableProperty] private Key _buttonB;
+        [ObservableProperty] private Key _buttonX;
+        [ObservableProperty] private Key _buttonY;
 
-        [ObservableProperty]
-        public partial Key RightStickUp { get; set; }
+        [ObservableProperty] private Key _buttonL;
+        [ObservableProperty] private Key _buttonR;
 
-        [ObservableProperty]
-        public partial Key RightStickDown { get; set; }
+        [ObservableProperty] private Key _buttonZl;
+        [ObservableProperty] private Key _buttonZr;
 
-        [ObservableProperty]
-        public partial Key RightStickLeft { get; set; }
+        [ObservableProperty] private Key _leftButtonSl;
+        [ObservableProperty] private Key _leftButtonSr;
 
-        [ObservableProperty]
-        public partial Key RightStickRight { get; set; }
-
-        [ObservableProperty]
-        public partial Key RightStickButton { get; set; }
-
-        [ObservableProperty]
-        public partial Key DpadUp { get; set; }
-
-        [ObservableProperty]
-        public partial Key DpadDown { get; set; }
-
-        [ObservableProperty]
-        public partial Key DpadLeft { get; set; }
-
-        [ObservableProperty]
-        public partial Key DpadRight { get; set; }
-
-        [ObservableProperty]
-        public partial Key ButtonMinus { get; set; }
-
-        [ObservableProperty]
-        public partial Key ButtonPlus { get; set; }
-
-        [ObservableProperty]
-        public partial Key ButtonA { get; set; }
-
-        [ObservableProperty]
-        public partial Key ButtonB { get; set; }
-
-        [ObservableProperty]
-        public partial Key ButtonX { get; set; }
-
-        [ObservableProperty]
-        public partial Key ButtonY { get; set; }
-
-        [ObservableProperty]
-        public partial Key ButtonL { get; set; }
-
-        [ObservableProperty]
-        public partial Key ButtonR { get; set; }
-
-        [ObservableProperty]
-        public partial Key ButtonZl { get; set; }
-
-        [ObservableProperty]
-        public partial Key ButtonZr { get; set; }
-
-        [ObservableProperty]
-        public partial Key LeftButtonSl { get; set; }
-
-        [ObservableProperty]
-        public partial Key LeftButtonSr { get; set; }
-
-        [ObservableProperty]
-        public partial Key RightButtonSl { get; set; }
-
-        [ObservableProperty]
-        public partial Key RightButtonSr { get; set; }
+        [ObservableProperty] private Key _rightButtonSl;
+        [ObservableProperty] private Key _rightButtonSr;
 
         public KeyboardInputConfig(InputConfig config)
         {

src/Ryujinx/UI/Models/ModModel.cs

@@ -6,8 +6,8 @@ namespace Ryujinx.Ava.UI.Models
 {
     public partial class ModModel : BaseModel
     {
-        [ObservableProperty]
-        public partial bool Enabled { get; set; }
+        [ObservableProperty] private bool _enabled;
+
         public bool InSd { get; }
         public string Path { get; }
         public string Name { get; }

src/Ryujinx/UI/Models/ProfileImageModel.cs

@@ -15,7 +15,6 @@ namespace Ryujinx.Ava.UI.Models
         public string Name { get; set; }
         public byte[] Data { get; set; }
 
-        [ObservableProperty]
-        public partial SolidColorBrush BackgroundColor { get; set; } = new(Colors.White);
+        [ObservableProperty] private SolidColorBrush _backgroundColor = new(Colors.White);
     }
 }

src/Ryujinx/UI/Models/TempProfile.cs

@@ -7,26 +7,24 @@ namespace Ryujinx.Ava.UI.Models
 {
     public partial class TempProfile : BaseModel
     {
-        [ObservableProperty]
-        public partial byte[] Image { get; set; }
-
-        [ObservableProperty]
-        public partial string Name { get; set; } = string.Empty;
+        [ObservableProperty] private byte[] _image;
+        [ObservableProperty] private string _name = String.Empty;
+        private UserId _userId;
 
         public static uint MaxProfileNameLength => 0x20;
 
         public UserId UserId
         {
-            get;
+            get => _userId;
             set
             {
-                field = value;
+                _userId = value;
                 OnPropertyChanged();
                 OnPropertyChanged(nameof(UserIdString));
             }
         }
 
-        public string UserIdString => UserId.ToString();
+        public string UserIdString => _userId.ToString();
 
         public TempProfile(UserProfile profile)
         {

src/Ryujinx/UI/Models/UserProfile.cs

@@ -13,20 +13,11 @@ namespace Ryujinx.Ava.UI.Models
     {
         private readonly Profile _profile;
         private readonly NavigationDialogHost _owner;
-        [ObservableProperty]
-        public partial byte[] Image { get; set; }
-
-        [ObservableProperty]
-        public partial string Name { get; set; }
-
-        [ObservableProperty]
-        public partial UserId UserId { get; set; }
-
-        [ObservableProperty]
-        public partial bool IsPointerOver { get; set; }
-
-        [ObservableProperty]
-        public partial IBrush BackgroundColor { get; set; }
+        [ObservableProperty] private byte[] _image;
+        [ObservableProperty] private string _name;
+        [ObservableProperty] private UserId _userId;
+        [ObservableProperty] private bool _isPointerOver;
+        [ObservableProperty] private IBrush _backgroundColor;
 
         public UserProfile(Profile profile, NavigationDialogHost owner)
         {
@@ -48,7 +39,7 @@ namespace Ryujinx.Ava.UI.Models
 
         private void UpdateBackground()
         {
-            Application currentApplication = Application.Current;
+            Application currentApplication = Avalonia.Application.Current;
             currentApplication.Styles.TryGetResource("ControlFillColorSecondary", currentApplication.ActualThemeVariant, out object color);
 
             if (color is not null)

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -1333,10 +1333,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
-        public void TakeScreenshot()
-        {
-            AppHost.ScreenshotRequested = true;
-        }
+        public void TakeScreenshot() => AppHost.ScreenshotRequested = true;
 
         public void HideUi() => ShowMenuAndStatusBar = false;
 

src/Ryujinx/UI/ViewModels/SettingsViewModel.cs

@@ -88,11 +88,6 @@ namespace Ryujinx.Ava.UI.ViewModels
             get;
         }
 
-        public bool IsCustomConfig
-        {
-            get;
-        }
-
         public bool IsGameTitleNotNull => !string.IsNullOrEmpty(GameTitle);
         public double PanelOpacity => IsGameTitleNotNull ? 0.5 : 1;
 
@@ -364,9 +359,8 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
-        [ObservableProperty]
-        public partial bool MatchSystemTime { get; set; }
-        
+        [ObservableProperty] private bool _matchSystemTime;
+
         public DateTimeOffset CurrentDate { get; set; }
 
         public TimeSpan CurrentTime { get; set; }
@@ -464,7 +458,7 @@ namespace Ryujinx.Ava.UI.ViewModels
                 using MemoryStream ms = new(gameIconData);
                 GameIcon = new Bitmap(ms);
             }
-            IsCustomConfig = customConfig;
+
             IsGameRunning = gameRunning;
             GamePath = gamePath;
             GameTitle = gameName;
@@ -874,11 +868,16 @@ namespace Ryujinx.Ava.UI.ViewModels
             GameListNeedsRefresh = false;
         }
 
-        private static void RevertIfNotSaved(bool isCustomConfig = false, bool isGameRunning = false)
+        private static void RevertIfNotSaved()
         {
-            // Restores settings for a custom configuration during a game, if the condition is met.
-            // If the condition is not met (parameter is false), restores global (default) configuration instead.
-            Program.ReloadConfig(isCustomConfig && isGameRunning); 
+            /*
+            maybe this is an unnecessary check(all options need to be tested)
+            if (string.IsNullOrEmpty(Program.GlobalConfigurationPath))
+            {
+                Program.ReloadConfig();
+            }
+            */
+            Program.ReloadConfig();
         }
 
         public void ApplyButton()
@@ -895,14 +894,14 @@ namespace Ryujinx.Ava.UI.ViewModels
                 File.Delete(gameDir);
             }
 
-            RevertIfNotSaved(IsCustomConfig, IsGameRunning);
+            RevertIfNotSaved();
             CloseWindow?.Invoke();
         }
 
         public void SaveUserConfig()
         {
             SaveSettings();
-            RevertIfNotSaved(IsCustomConfig, IsGameRunning); // Revert global or custom configuration after saving user configuration
+            RevertIfNotSaved(); // Revert global configuration after saving user configuration
             CloseWindow?.Invoke();
         }
 
@@ -934,7 +933,7 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         public void CancelButton()
         {
-            RevertIfNotSaved(IsCustomConfig, IsGameRunning);
+            RevertIfNotSaved();
             CloseWindow?.Invoke();
         }
     }