Bsd: Fix ArgumentOutOfRangeException in SetSocketOption (#3633)

* Bsd: Fix ArgumentOutOfRangeException in SetSocketOption

* Ensure option level is Socket before checking for SoLinger

ARMeilleure/Translation/IntervalTree.cs

@@ -19,8 +19,6 @@ namespace ARMeilleure.Translation
 
         public int Count => _count;
 
-        public IntervalTree() { }
-
         #region Public Methods
 
         /// <summary>

Ryujinx.Ava/Assets/Locales/de_DE.json

@@ -20,7 +20,7 @@
   "MenuBarOptionsManageUserProfiles": "_Profilverwaltung",
   "MenuBarActions": "_Aktionen",
   "MenuBarOptionsSimulateWakeUpMessage": "Aufwachnachricht",
-  "MenuBarActionsScanAmiibo": "Virtualisiere Amiibo",
+  "MenuBarActionsScanAmiibo": "Scanne ein Amiibo",
   "MenuBarTools": "_Werkzeuge",
   "MenuBarToolsInstallFirmware": "Firmware installieren",
   "MenuBarFileToolsInstallFirmwareFromFile": "Installiere Firmware von einer XCI oder einer ZIP Datei",
@@ -52,8 +52,8 @@
   "GameListContextMenuOpenModsDirectory": "Mod-Verzeichnis öffnen",
   "GameListContextMenuOpenModsDirectoryToolTip": "Öffnet das Verzeichnis, welches Mods für die Spiele beinhaltet",
   "GameListContextMenuCacheManagement": "Cache Verwaltung",
-  "GameListContextMenuCacheManagementPurgePptc": "PPTC Cache löschen",
-  "GameListContextMenuCacheManagementPurgePptcToolTip": "Löscht den PPTC Cache der Anwendung",
+  "GameListContextMenuCacheManagementPurgePptc": "PPTC als ungültig markieren",
+  "GameListContextMenuCacheManagementPurgePptcToolTip": "Markiert den PPTC als ungültig, sodass dieser beim nächsten Spielstart neu erstellt wird",
   "GameListContextMenuCacheManagementPurgeShaderCache": "Shader Cache löschen",
   "GameListContextMenuCacheManagementPurgeShaderCacheToolTip": "Löscht den Shader Cache der Anwendung",
   "GameListContextMenuCacheManagementOpenPptcDirectory": "PPTC Verzeichnis öffnen",
@@ -109,21 +109,21 @@
   "SettingsTabSystemSystemLanguageTraditionalChinese": "Traditionelles Chinesisch",
   "SettingsTabSystemSystemTimeZone": "System Zeitzone:",
   "SettingsTabSystemSystemTime": "System Zeit:",
-  "SettingsTabSystemEnableVsync": "Aktiviere VSync",
-  "SettingsTabSystemEnablePptc": "Aktiviere PPTC Cache (Profiled presistent translastion cache)",
-  "SettingsTabSystemEnableFsIntegrityChecks": "Aktiviere die FS Integritätsprüfung",
+  "SettingsTabSystemEnableVsync": "VSync",
+  "SettingsTabSystemEnablePptc": "PPTC Cache (Profiled Persistent Translation Cache)",
+  "SettingsTabSystemEnableFsIntegrityChecks": "FS Integritätsprüfung",
   "SettingsTabSystemAudioBackend": "Audio-Backend:",
   "SettingsTabSystemAudioBackendDummy": "Dummy",
   "SettingsTabSystemAudioBackendOpenAL": "OpenAL",
   "SettingsTabSystemAudioBackendSoundIO": "SoundIO",
   "SettingsTabSystemAudioBackendSDL2": "SDL2",
   "SettingsTabSystemHacks": "Hacks",
-  "SettingsTabSystemHacksNote": " (Können Fehler verursachen)",
+  "SettingsTabSystemHacksNote": " (Kann Fehler verursachen)",
   "SettingsTabSystemExpandDramSize": "Erweitere DRAM Größe auf 6GB",
   "SettingsTabSystemIgnoreMissingServices": "Ignoriere fehlende Dienste",
   "SettingsTabGraphics": "Grafik",
   "SettingsTabGraphicsAPI": "Grafik-API",
-  "SettingsTabGraphicsEnableShaderCache": "Aktiviere den Shader Cache",
+  "SettingsTabGraphicsEnableShaderCache": "Shader Cache",
   "SettingsTabGraphicsAnisotropicFiltering": "Anisotrope Filterung:",
   "SettingsTabGraphicsAnisotropicFilteringAuto": "Auto",
   "SettingsTabGraphicsAnisotropicFiltering2x": "2x",
@@ -185,9 +185,9 @@
   "ControllerSettingsControllerType": "Controller Typ",
   "ControllerSettingsControllerTypeHandheld": "Handheld",
   "ControllerSettingsControllerTypeProController": "Pro Controller",
-  "ControllerSettingsControllerTypeJoyConPair": "JoyCon Paar",
-  "ControllerSettingsControllerTypeJoyConLeft": "JoyCon Links",
-  "ControllerSettingsControllerTypeJoyConRight": "JoyCon Rechts",
+  "ControllerSettingsControllerTypeJoyConPair": "Joy-Con Paar",
+  "ControllerSettingsControllerTypeJoyConLeft": "Joy-Con Links",
+  "ControllerSettingsControllerTypeJoyConRight": "Joy-Con Rechts",
   "ControllerSettingsProfile": "Profil",
   "ControllerSettingsProfileDefault": "Default",
   "ControllerSettingsLoad": "Laden",
@@ -212,8 +212,8 @@
   "ControllerSettingsLStickLeft": "Links",
   "ControllerSettingsLStickRight": "Rechts",
   "ControllerSettingsLStickStick": "Analogstick",
-  "ControllerSettingsLStickInvertXAxis": "Invertiert X-Achse",
-  "ControllerSettingsLStickInvertYAxis": "Invertiert Y-Achse",
+  "ControllerSettingsLStickInvertXAxis": "X-Achse invertieren",
+  "ControllerSettingsLStickInvertYAxis": "Y-Achse invertieren",
   "ControllerSettingsLStickDeadzone": "Deadzone:",
   "ControllerSettingsRStick": "Rechter Analogstick",
   "ControllerSettingsRStickButton": "R3",
@@ -222,8 +222,8 @@
   "ControllerSettingsRStickLeft": "Links",
   "ControllerSettingsRStickRight": "Rechts",
   "ControllerSettingsRStickStick": "Analogstick",
-  "ControllerSettingsRStickInvertXAxis": "Invertiert X-Achse",
-  "ControllerSettingsRStickInvertYAxis": "Invertiert Y-Achse",
+  "ControllerSettingsRStickInvertXAxis": "X-Achse invertieren",
+  "ControllerSettingsRStickInvertYAxis": "Y-Achse invertieren",
   "ControllerSettingsRStickDeadzone": "Deadzone:",
   "ControllerSettingsTriggersLeft": "Linker Trigger",
   "ControllerSettingsTriggersRight": "Rechter Trigger",
@@ -246,7 +246,7 @@
   "ControllerSettingsMotionUseCemuhookCompatibleMotion": "CemuHook kompatible Bewegungssteuerung",
   "ControllerSettingsMotionControllerSlot": "Controller Slot:",
   "ControllerSettingsMotionMirrorInput": "Spiegele Eingabe",
-  "ControllerSettingsMotionRightJoyConSlot": "Rechter JoyCon Slot:",
+  "ControllerSettingsMotionRightJoyConSlot": "Rechter Joy-Con Slot:",
   "ControllerSettingsMotionServerHost": "Server Host:",
   "ControllerSettingsMotionGyroSensitivity": "Gyro Empfindlichkeit:",
   "ControllerSettingsMotionGyroDeadzone": "Gyro Deadzone:",
@@ -256,8 +256,8 @@
   "UserProfilesSaveProfileName": "Profilname speichern",
   "UserProfilesChangeProfileImage": "Profilbild ändern",
   "UserProfilesAvailableUserProfiles": "Verfügbare Profile:",
-  "UserProfilesAddNewProfile": "Neues Profil hinzufügen",
-  "UserProfilesDeleteSelectedProfile": "Ausgewähltes Profil löschen",
+  "UserProfilesAddNewProfile": "Neues Profil",
+  "UserProfilesDeleteSelectedProfile": "Profil löschen",
   "UserProfilesClose": "Schließen",
   "ProfileImageSelectionTitle": "Auswahl des Profilbildes",
   "ProfileImageSelectionHeader": "Wähle ein Profilbild aus",
@@ -281,17 +281,17 @@
   "MenuBarFileToolsHideUi": "Verstecke UI",
   "GameListContextMenuToggleFavorite": "Als Favoriten hinzufügen/entfernen",
   "GameListContextMenuToggleFavoriteToolTip": "Aktiviert den Favoriten-Status des Spiels",
-  "SettingsTabGeneralTheme": "Thema",
-  "SettingsTabGeneralThemeCustomTheme": "Verzeichnis für benutzerdefiniertes Thema",
+  "SettingsTabGeneralTheme": "Design",
+  "SettingsTabGeneralThemeCustomTheme": "Pfad für das benutzerdefinierte Design",
   "SettingsTabGeneralThemeBaseStyle": "Farbschema",
   "SettingsTabGeneralThemeBaseStyleDark": "Dunkel",
   "SettingsTabGeneralThemeBaseStyleLight": "Hell",
-  "SettingsTabGeneralThemeEnableCustomTheme": "Benutzerdefiniertes Thema",
+  "SettingsTabGeneralThemeEnableCustomTheme": "Design für die Emulator-Benutzeroberfläche",
   "ButtonBrowse": "Durchsuchen",
   "ControllerSettingsConfigureGeneral": "Konfigurieren",
   "ControllerSettingsRumble": "Vibration",
-  "ControllerSettingsRumbleStrongMultiplier": "Starke Vibration - Multiplikator",
-  "ControllerSettingsRumbleWeakMultiplier": "Schwache Vibration - Multiplikator",
+  "ControllerSettingsRumbleStrongMultiplier": "Starker Vibrations-Multiplikator",
+  "ControllerSettingsRumbleWeakMultiplier": "Schwacher Vibrations-Multiplikator",
   "DialogMessageSaveNotAvailableMessage": "Es existieren keine Speicherdaten für {0} [{1:x16}]",
   "DialogMessageSaveNotAvailableCreateSaveMessage": "Soll Ryujinx Speicherdaten für dieses Spiel erstellen?",
   "DialogConfirmationTitle": "Ryujinx - Bestätigung",
@@ -328,7 +328,7 @@
   "DialogUpdaterDirtyBuildMessage": "Inoffizielle Versionen von Ryujinx können nicht aktualisiert werden",
   "DialogUpdaterDirtyBuildSubMessage": "Lade Ryujinx bitte von hier herunter, um eine unterstützte Version zu erhalten: https://ryujinx.org/",
   "DialogRestartRequiredMessage": "Neustart erforderlich",
-  "DialogThemeRestartMessage": "Das Thema wurde gespeichert. Ein Neustart ist erforderlich, um das Thema anzuwenden.",
+  "DialogThemeRestartMessage": "Das Design wurde gespeichert. Ein Neustart ist erforderlich, um das Design anzuwenden.",
   "DialogThemeRestartSubMessage": "Jetzt neu starten?",
   "DialogFirmwareInstallEmbeddedMessage": "Die in diesem Spiel enthaltene Firmware installieren? (Firmware {0})",
   "DialogFirmwareInstallEmbeddedSuccessMessage": "Es wurde keine installierte Firmware gefunden, aber Ryujinx konnte die Firmware {0} aus dem bereitgestellten Spiel installieren.\nRyujinx wird nun gestartet.",
@@ -350,7 +350,7 @@
   "DialogProfileDeleteProfileTitle": "Profil löschen",
   "DialogProfileDeleteProfileMessage": "Diese Aktion kann nicht rückgängig gemacht werden. Wirklich fortfahren?",
   "DialogWarning": "Warnung",
-  "DialogPPTCDeletionMessage": "Du bist dabei, den PPTC Cache zu löschen für :\n\n{0}\n\nWirklich fortfahren?",
+  "DialogPPTCDeletionMessage": "Du bist dabei den PPTC für das folgende Spiel als ungültig zu markieren:\n\n{0}\n\nWirklich fortfahren?",
   "DialogPPTCDeletionErrorMessage": "Fehler bei der Löschung des PPTC Caches bei {0}: {1}",
   "DialogShaderDeletionMessage": "Du bist dabei, den Shader Cache zu löschen für :\n\n{0}\n\nWirklich fortfahren?",
   "DialogShaderDeletionErrorMessage": "Es ist ein Fehler bei der Löschung des Shader Caches bei {0}: {1} aufgetreten",
@@ -379,7 +379,7 @@
   "DialogSettingsBackendThreadingWarningTitle": "Warnung - Render Threading",
   "DialogSettingsBackendThreadingWarningMessage": "Ryujinx muss muss neu gestartet werden, damit die Änderungen wirksam werden. Abhängig von dem Betriebssystem muss möglicherweise das Multithreading des Treibers manuell deaktiviert werden, wenn Ryujinx verwendet wird.",
   "SettingsTabGraphicsFeaturesOptions": "Erweiterungen",
-  "SettingsTabGraphicsBackendMultithreading": "Grafikbackend Multithreading:",
+  "SettingsTabGraphicsBackendMultithreading": "Grafik-Backend Multithreading:",
   "CommonAuto": "Auto",
   "CommonOff": "Aus",
   "CommonOn": "An",
@@ -416,52 +416,52 @@
   "CommonFavorite": "Favoriten",
   "OrderAscending": "Aufsteigend",
   "OrderDescending": "Absteigend",
-  "SettingsTabGraphicsFeatures": "Erweiterungen & Verbesserungen",
+  "SettingsTabGraphicsFeatures": "Erweiterungen",
   "ErrorWindowTitle": "Fehler-Fenster",
-  "ToggleDiscordTooltip": "Aktiviert/Deaktiviert Discord Rich Presence",
+  "ToggleDiscordTooltip": "Zeige momentanes Spiel auf Discord",
   "AddGameDirBoxTooltip": "Gibt das Spielverzeichnis an, das der Liste hinzuzufügt wird",
   "AddGameDirTooltip": "Fügt ein neues Spielverzeichnis hinzu",
   "RemoveGameDirTooltip": "Entfernt das ausgewähltes Spielverzeichnis",
-  "CustomThemeCheckTooltip": "Aktiviert/Deaktiviert die benutzerdefinierten Thema in dem GUI",
-  "CustomThemePathTooltip": " Gibt das Verzeichnis zum benutzerdefinierten GUI Thema an",
-  "CustomThemeBrowseTooltip": "Ermöglicht die Suche nach benutzerdefinierten GUI Thema",
-  "DockModeToggleTooltip": "Aktiviert/Deaktiviert den Docked Mode",
+  "CustomThemeCheckTooltip": "Verwende ein eigenes Design für die Emulator-Benutzeroberfläche",
+  "CustomThemePathTooltip": "Gibt den Pfad zum Design für die Emulator-Benutzeroberfläche an",
+  "CustomThemeBrowseTooltip": "Ermöglicht die Suche nach einem benutzerdefinierten Design für die Emulator-Benutzeroberfläche",
+  "DockModeToggleTooltip": "Im gedockten Modus verhält sich das emulierte System wie eine Nintendo Switch im TV Modus. Dies verbessert die grafische Qualität der meisten Spiele. Umgekehrt führt die Deaktivierung dazu, dass sich das emulierte System wie eine Nintendo Switch im Handheld Modus verhält, was die Grafikqualität beeinträchtigt.\n\nKonfiguriere das Eingabegerät für Spieler 1, um im Docked Modus zu spielen; konfiguriere das Controllerprofil via der Handheld Option, wenn geplant wird den Handheld Modus zu nutzen.\n\nIm Zweifelsfall AN lassen.",
   "DirectKeyboardTooltip": "Aktiviert/Deaktiviert den \"Direkter Tastaturzugriff (HID) Unterstützung\" (Ermöglicht die Benutzung der Tastaur als Eingabegerät in Spielen)",
   "DirectMouseTooltip": "Aktiviert/Deaktiviert den \"Direkten Mauszugriff (HID) Unterstützung\" (Ermöglicht die Benutzung der Maus als Eingabegerät in Spielen)",
   "RegionTooltip": "Ändert die Systemregion",
   "LanguageTooltip": "Ändert die Systemsprache",
   "TimezoneTooltip": "Ändert die Systemzeitzone",
   "TimeTooltip": "Ändert die Systemzeit",
-  "VSyncToggleTooltip": "Aktiviert/Deaktiviert die Vertikale Synchronisierung",
-  "PptcToggleTooltip": "Aktiviert/Deaktiviert den PPTC",
-  "FsIntegrityToggleTooltip": "Aktiviert/Deaktiviert die Integritätsprüfung der Spieldateien",
-  "AudioBackendTooltip": "Ändert das Audio-Backend",
-  "MemoryManagerTooltip": "Ändert wie der Gastspeicher abgebildet wird und wie auf ihn zugegriffen wird. Beinflusst die Leistung der emulierten CPU erheblich.",
+  "VSyncToggleTooltip": "Vertikale Synchronisierung der emulierten Konsole. Diese Option ist ein Frame-Limiter für die meisten Spiele; die Deaktivierung kann dazu führen, dass Spiele mit höherer Geschwindigkeit laufen, Ladebildschirme länger benötigen oder hängen bleiben.\n\nKann beim Spielen mit einem frei wählbaren Hotkey ein- und ausgeschaltet werden.\n\nIm Zweifelsfall AN lassen.",
+  "PptcToggleTooltip": "Speichert übersetzte JIT-Funktionen, sodass jene nicht jedes Mal übersetzt werden müssen, wenn das Spiel geladen wird.\n\nVerringert Stottern und die Zeit beim zweiten und den darauffolgenden Startvorgängen eines Spiels erheblich.\n\nIm Zweifelsfall AN lassen.",
+  "FsIntegrityToggleTooltip": "Prüft beim Startvorgang auf beschädigte Dateien und zeigt bei beschädigten Dateien einen Hash-Fehler (Hash Error) im Log an.\n\nDiese Einstellung hat keinen Einfluss auf die Leistung und hilft bei der Fehlersuche.\n\nIm Zweifelsfall AN lassen.",
+  "AudioBackendTooltip": "Ändert das Backend, das zum Rendern von Audio verwendet wird.\n\nSDL2 ist das bevorzugte Audio-Backend, OpenAL und SoundIO sind als Alternativen vorhanden. Dummy wird keinen Audio-Output haben.\n\nIm Zweifelsfall SDL2 auswählen.",
+  "MemoryManagerTooltip": "Ändert wie der Gastspeicher abgebildet wird und wie auf ihn zugegriffen wird. Beinflusst die Leistung der emulierten CPU erheblich.\n\nIm Zweifelsfall Host ungeprüft auswählen.",
   "MemoryManagerSoftwareTooltip": "Verwendung einer Software-Seitentabelle für die Adressumsetzung. Höchste Genauigkeit, aber langsamste Leistung.",
   "MemoryManagerHostTooltip": "Direkte Zuordnung von Speicher im Host-Adressraum. Viel schnellere JIT-Kompilierung und Ausführung.",
   "MemoryManagerUnsafeTooltip": "Direkte Zuordnung des Speichers, aber keine Maskierung der Adresse innerhalb des Gastadressraums vor dem Zugriff. Schneller, aber auf Kosten der Sicherheit. Die Gastanwendung kann von überall in Ryujinx auf den Speicher zugreifen, daher sollte in diesem Modus nur Programme ausgeführt werden denen vertraut wird.",
-  "DRamTooltip": "Erweitert den Speicher des emulierten Systems von 4 GB auf 6 GB",
-  "IgnoreMissingServicesTooltip": "Aktiviert/Deaktiviert die 'Ignoriere fehlende Dienste' Option",
-  "GraphicsBackendThreadingTooltip": "Aktiviert das Grafikbackend Multithreading",
-  "GalThreadingTooltip": "Führt Grafikbackendbefehle auf einem zweiten Thread aus. Ermöglicht Multithreading bei der Shader Kompilierung zur Laufzeit, reduziert Stottern und verbessert die Leistung bei Treibern ohne eigene Multithreading Unterstützung. Geringfügig abweichende Spitzenleistung bei Treibern mit Multithreading. Ryujinx muss möglicherweise neu gestartet werden, um das in den Treiber integrierte Multithreading korrekt zu deaktivieren, oder es muss manuell getan werden, um die beste Leistung zu erzielen.",
-  "ShaderCacheToggleTooltip": "Aktiviert/Deaktiviert Shader Cache",
+  "DRamTooltip": "Erhöht den Arbeitsspeicher des emulierten Systems von 4 GB auf 6 GB.\n\nDies ist nur für Texturenpakete mit höherer Auflösung oder Mods mit 4K-Auflösung nützlich. Diese Option verbessert NICHT die Leistung.\n\nIm Zweifelsfall AUS lassen.",
+  "IgnoreMissingServicesTooltip": "Durch diese Option werden nicht implementierte Dienste der Switch-Firmware ignoriert. Dies kann dabei helfen, Abstürze beim Starten bestimmter Spiele zu umgehen.\n\nIm Zweifelsfall AUS lassen.",
+  "GraphicsBackendThreadingTooltip": "Führt Grafik-Backend Befehle auf einem zweiten Thread aus.\n\nDies beschleunigt die Shader-Kompilierung, reduziert Stottern und verbessert die Leistung auf GPU-Treibern ohne eigene Multithreading-Unterstützung. Geringfügig bessere Leistung bei Treibern mit Multithreading.\n\nIm Zweifelsfall auf AUTO stellen.",
+  "GalThreadingTooltip": "Führt Grafik-Backend Befehle auf einem zweiten Thread aus.\n\nDies Beschleunigt die Shader-Kompilierung, reduziert Stottern und verbessert die Leistung auf GPU-Treibern ohne eigene Multithreading-Unterstützung. Geringfügig bessere Leistung bei Treibern mit Multithreading.\n\nIm Zweifelsfall auf auf AUTO stellen.",
+  "ShaderCacheToggleTooltip": "Speichert einen persistenten Shader Cache, der das Stottern bei nachfolgenden Durchläufen reduziert.\n\nIm Zweifelsfall AN lassen.",
   "ResolutionScaleTooltip": "Wendet die Auflösungsskalierung auf anwendbare Render Ziele",
   "ResolutionScaleEntryTooltip": "Fließkomma Auflösungsskalierung, wie 1,5.\n Bei nicht ganzzahligen Werten ist die Wahrscheinlichkeit größer, dass Probleme entstehen, die auch zum Absturz führen können.",
   "AnisotropyTooltip": "Stufe der Anisotropen Filterung (Auf Auto setzen, um den vom Spiel geforderten Wert zu verwenden)",
   "AspectRatioTooltip": "Auf das Renderer-Fenster angewandtes Seitenverhältnis.",
   "ShaderDumpPathTooltip": "Grafik-Shader-Dump-Pfad",
-  "FileLogTooltip": "Aktiviert/Deaktiviert die Erstellung und Speicherung eines Logs",
-  "StubLogTooltip": "Aktiviert die Ausgabe von Stub-Logs in der Konsole",
-  "InfoLogTooltip": "Aktiviert die Ausgabe von Info-Logs in der Konsole",
-  "WarnLogTooltip": "Aktiviert die Ausgabe von Warn-Logs in der Konsole",
-  "TraceLogTooltip": "Aktiviert die Ausgabe von Trace-Log in der Konsole",
-  "ErrorLogTooltip": "Aktiviert die Ausgabe von Fehler-Logs in der Konsole",
-  "GuestLogTooltip": "Aktiviert die Ausgabe von Gast-Logs in der Konsole",
-  "FileAccessLogTooltip": "Aktiviert die Ausgabe von FS-Zugriff-Logs in der Konsole",
+  "FileLogTooltip": "Speichert die Konsolenausgabe in einer Log-Datei auf der Festplatte. Hat keinen Einfluss auf die Leistung.",
+  "StubLogTooltip": "Ausgabe von Stub-Logs in der Konsole. Hat keinen Einfluss auf die Leistung.",
+  "InfoLogTooltip": "Ausgabe von Info-Logs in der Konsole. Hat keinen Einfluss auf die Leistung.",
+  "WarnLogTooltip": "Ausgabe von Warn-Logs in der Konsole. Hat keinen Einfluss auf die Leistung.",
+  "TraceLogTooltip": "Ausgabe von Trace-Log in der Konsole. Hat keinen Einfluss auf die Leistung.",
+  "ErrorLogTooltip": "Ausgabe von Fehler-Logs in der Konsole. Hat keinen Einfluss auf die Leistung.",
+  "GuestLogTooltip": "Ausgabe von Gast-Logs in der Konsole. Hat keinen Einfluss auf die Leistung.",
+  "FileAccessLogTooltip": "Ausgabe von FS-Zugriff-Logs in der Konsole.",
   "FSAccessLogModeTooltip": "Aktiviert die Ausgabe des FS-Zugriff-Logs in der Konsole. Mögliche Modi sind 0-3",
   "DeveloperOptionTooltip": "Mit Vorsicht verwenden",
   "OpenGlLogLevel": "Erfordert die Aktivierung der entsprechenden Log-Level",
-  "DebugLogTooltip": "Aktiviert das Dokumentierern von Debug-Protokollmeldungen",
+  "DebugLogTooltip": "Ausgabe von Debug-Logs in der Konsole.\n\nVerwende diese Option nur auf ausdrückliche Anweisung von Ryujinx Entwicklern, da sie das Lesen der Protokolle erschwert und die Leistung des Emulators verschlechtert.",
   "LoadApplicationFileTooltip": "Öffnet die Dateiauswahl um Datei zu laden, welche mit der Switch kompatibel ist",
   "LoadApplicationFolderTooltip": "Öffnet die Dateiauswahl um ein Spiel zu laden, welches mit der Switch kompatibel ist",
   "OpenRyujinxFolderTooltip": "Öffnet den Ordner, der das Ryujinx Dateisystem enthält",
@@ -478,8 +478,8 @@
   "AboutRyujinxContributorsButtonHeader": "Alle Mitwirkenden anzeigen",
   "SettingsTabSystemAudioVolume" : "Lautstärke: ",
   "AudioVolumeTooltip": "Ändert die Lautstärke",
-  "SettingsTabSystemEnableInternetAccess": "Aktiviert den Gast-Internet-Zugang",
-  "EnableInternetAccessTooltip": "Aktiviert den Gast-Internet-Zugang. Die Anwendung verhält sich so, als ob die emulierte Switch-Konsole mit dem Internet verbunden wäre. Beachte, dass in einigen Fällen Anwendungen auch bei deaktivierter Option auf das Internet zugreifen können",
+  "SettingsTabSystemEnableInternetAccess": "Gast-Internet-Zugang/LAN Modus",
+  "EnableInternetAccessTooltip": "Erlaubt es der emulierten Anwendung sich mit dem Internet zu verbinden.\n\nSpiele die den LAN-Modus unterstützen, ermöglichen es Ryujinx sich sowohl mit anderen Ryujinx-Systemen, als auch mit offiziellen Nintendo Switch Konsolen zu verbinden. Allerdings nur, wenn diese Option aktiviert ist und die Systeme mit demselben lokalen Netzwerk verbunden sind.\n\nDies erlaubt KEINE Verbindung zu Nintendo-Servern. Kann bei bestimmten Spielen die versuchen sich mit dem Internet zu verbinden zum Absturz führen.\n\nIm Zweifelsfall AUS lassen",
   "GameListContextMenuManageCheatToolTip": "Öffnet den Cheat-Manager",
   "GameListContextMenuManageCheat": "Cheats verwalten",
   "ControllerSettingsStickRange": "Bereich:",
@@ -491,11 +491,11 @@
   "SettingsTabNetworkConnection": "Netwerkverbindung",
   "SettingsTabCpuCache": "CPU-Cache",
   "SettingsTabCpuMemory": "CPU-Speicher",
-  "DialogUpdaterFlatpakNotSupportedMessage": "Bitte Aktualisiere Ryujinx mit FlatHub",
+  "DialogUpdaterFlatpakNotSupportedMessage": "Bitte aktualisiere Ryujinx mit FlatHub",
   "UpdaterDisabledWarningTitle": "Updater deaktiviert!",
   "GameListContextMenuOpenSdModsDirectory": "Atmosphere-Mod-Verzeichnis öffnen",
-  "GameListContextMenuOpenSdModsDirectoryToolTip": "Öffnet das alternative SD-Karten-Atmosphere-Verzeichnis, das die Mods der Anwendung enthält",
-  "ControllerSettingsRotate90": "Rotiert um 90°",
+  "GameListContextMenuOpenSdModsDirectoryToolTip": "Öffnet das alternative SD-Karten-Atmosphere-Verzeichnis, das die Mods der Anwendung enthält. Dieser Ordner ist nützlich für Mods, die für einen gemoddete Switch erstellt worden sind.",
+  "ControllerSettingsRotate90": "Um 90° rotieren",
   "IconSize": "Cover Größe",
   "IconSizeTooltip": "Ändert die Größe der Spiel-Cover",
   "MenuBarOptionsShowConsole": "Zeige Konsole",
@@ -546,17 +546,47 @@
   "RyujinxUpdater": "Ryujinx - Updater",
   "SettingsTabHotkeys": "Tastatur Hotkeys",
   "SettingsTabHotkeysHotkeys": "Tastatur Hotkeys",
-  "SettingsTabHotkeysToggleVsyncHotkey": "Aktiviert/Deaktiviert VSync:",
+  "SettingsTabHotkeysToggleVsyncHotkey": "VSync:",
   "SettingsTabHotkeysScreenshotHotkey": "Screenshot:",
   "SettingsTabHotkeysShowUiHotkey": "Zeige UI:",
   "SettingsTabHotkeysPauseHotkey": "Pausieren:",
   "SettingsTabHotkeysToggleMuteHotkey": "Stummschalten:",
   "ControllerMotionTitle": "Bewegungssteuerung - Einstellungen",
   "ControllerRumbleTitle": "Vibration - Einstellungen",
-  "SettingsSelectThemeFileDialogTitle" : "Wähle ein benutzerdefiniertes Thema",
-  "SettingsXamlThemeFile" : "Xaml Thema-Datei",
-  "SettingsTabGraphicsBackend" : "Grafik-Backend",
-  "GraphicsBackendTooltip" : "Ändert das Grafik-Backend",
+  "SettingsSelectThemeFileDialogTitle" : "Wähle ein Design für die Emulator-Benutzeroberfläche",
+  "SettingsXamlThemeFile" : "Xaml Design-Datei",
+  "AvatarWindowTitle": "Profile verwalten - Avatar",
+  "Amiibo": "Amiibo",
+  "Unknown": "Unbekannt",
+  "Usage": "Nutzung",
+  "Writable": "Beschreibbar",
+  "SelectDlcDialogTitle": "DLC-Dateien auswählen",
+  "SelectUpdateDialogTitle": "Update-Datei auswählen",
+  "UserProfileWindowTitle": "Benutzerprofile verwalten",
+  "CheatWindowTitle": "Spiel-Cheats verwalten",
+  "DlcWindowTitle": "Spiel-DLC verwalten",
+  "UpdateWindowTitle": "Spiel-Updates verwalten",
+  "CheatWindowHeading": "Cheats verfügbar für {0} [{1}]",
+  "DlcWindowHeading": "DLC verfügbar für {0} [{1}]",
+  "UserProfilesEditProfile": "Profil bearbeiten",
+  "Cancel": "Abbrechen",
+  "Save": "Speichern",
+  "Discard": "Verwerfen",
+  "UserProfilesSetProfileImage": "Profilbild einrichten",
+  "UserProfileEmptyNameError": "Name ist erforderlich",
+  "UserProfileNoImageError":  "Bitte ein Profilbild auswählen",
+  "GameUpdateWindowHeading": "Update verfügbar für {0} [{1}]",
   "SettingsTabHotkeysResScaleUpHotkey": "Auflösung erhöhen:",
-  "SettingsTabHotkeysResScaleDownHotkey": "Auflösung vermindern:"
+  "SettingsTabHotkeysResScaleDownHotkey": "Auflösung verringern:",
+  "UserProfilesName": "Name:",
+  "UserProfilesUserId" : "Benutzer Id:",
+  "SettingsTabGraphicsBackend": "Grafik-Backend:",
+  "SettingsTabGraphicsBackendTooltip": "Verwendendetes Grafik-Backend",
+  "SettingsEnableTextureRecompression": "Textur-Rekompression",
+  "SettingsEnableTextureRecompressionTooltip": "Komprimiert bestimmte Texturen, um den VRAM-Verbrauch zu reduzieren.\n\nEmpfohlen für die Verwendung von GPUs, die weniger als 4 GB VRAM haben.\n\nIm Zweifelsfall AUS lassen",
+  "SettingsTabGraphicsPreferredGpu": "Bevorzugte GPU:",
+  "SettingsTabGraphicsPreferredGpuTooltip": "Wähle die Grafikkarte aus, die mit dem Vulkan Grafik-Backend verwendet werden soll.\n\nDies hat keinen Einfluss auf die GPU die OpenGL verwendet.\n\nIm Zweifelsfall die als \"dGPU\" gekennzeichnete GPU auswählen. Diese Einstellung unberührt lassen, wenn keine zur Auswahl steht.",
+  "SettingsAppRequiredRestartMessage": "Ein Neustart von Ryujinx ist erforderlich",
+  "SettingsGpuBackendRestartMessage": "Das Grafik-Backend oder die Grafikkarteneinstellungen wurden geändert. Ein Neustart ist erforderlich um diese Einstellungen anzuwenden.",
+  "SettingsGpuBackendRestartSubMessage": "Ryujinx jetzt neu starten?"
 }

Ryujinx.Ava/Assets/Locales/ja_JP.json

@@ -52,8 +52,8 @@
   "GameListContextMenuOpenModsDirectory": "Modディレクトリを開く",
   "GameListContextMenuOpenModsDirectoryToolTip": "アプリケーションの Mod データを格納するディレクトリを開きます",
   "GameListContextMenuCacheManagement": "キャッシュ管理",
-  "GameListContextMenuCacheManagementPurgePptc": "PPTC キャッシュを破棄",
-  "GameListContextMenuCacheManagementPurgePptcToolTip": "アプリケーションの PPTC キャッシュを破棄します",
+  "GameListContextMenuCacheManagementPurgePptc": "PPTC を再構築",
+  "GameListContextMenuCacheManagementPurgePptcToolTip": "次回のゲーム起動時に PPTC を再構築します",
   "GameListContextMenuCacheManagementPurgeShaderCache": "シェーダキャッシュを破棄",
   "GameListContextMenuCacheManagementPurgeShaderCacheToolTip": "アプリケーションのシェーダキャッシュを破棄します",
   "GameListContextMenuCacheManagementOpenPptcDirectory": "PPTC ディレクトリを開く",
@@ -121,9 +121,9 @@
   "SettingsTabSystemHacksNote": " (挙動が不安定になる可能性があります)",
   "SettingsTabSystemExpandDramSize": "DRAMサイズを6GBに拡大",
   "SettingsTabSystemIgnoreMissingServices": "未実装サービスを無視",
-  "SettingsTabGraphics": "グラフィクス",
-  "SettingsTabGraphicsEnhancements": "拡張",
-  "SettingsTabGraphicsEnableShaderCache": "シェーダキャッシュ",
+  "SettingsTabGraphics": "グラフィックス",
+  "SettingsTabGraphicsAPI": "グラフィックスAPI",
+  "SettingsTabGraphicsEnableShaderCache": "シェーダキャッシュを有効",
   "SettingsTabGraphicsAnisotropicFiltering": "異方性フィルタリング:",
   "SettingsTabGraphicsAnisotropicFilteringAuto": "自動",
   "SettingsTabGraphicsAnisotropicFiltering2x": "2x",
@@ -144,7 +144,7 @@
   "SettingsTabGraphicsAspectRatio32x9": "32:9",
   "SettingsTabGraphicsAspectRatioStretch": "ウインドウサイズに合わせる",
   "SettingsTabGraphicsDeveloperOptions": "開発者向けオプション",
-  "SettingsTabGraphicsShaderDumpPath": "グラフィクス シェーダダンプパス:",
+  "SettingsTabGraphicsShaderDumpPath": "グラフィックス シェーダダンプパス:",
   "SettingsTabLogging": "ロギング",
   "SettingsTabLoggingLogging": "ロギング",
   "SettingsTabLoggingEnableLoggingToFile": "ファイルへのロギングを有効",
@@ -350,7 +350,7 @@
   "DialogProfileDeleteProfileTitle": "プロファイルを削除中",
   "DialogProfileDeleteProfileMessage": "このアクションは元に戻せません. 本当に続けてよろしいですか?",
   "DialogWarning": "警告",
-  "DialogPPTCDeletionMessage": "PPTC キャッシュを破棄しようとしています:\n\n{0}\n\n実行してよろしいですか?",
+  "DialogPPTCDeletionMessage": "次回起動時に PPTC を再構築します:\n\n{0}\n\n実行してよろしいですか?",
   "DialogPPTCDeletionErrorMessage": "PPTC キャッシュ破棄エラー {0}: {1}",
   "DialogShaderDeletionMessage": "シェーダキャッシュを破棄しようとしています:\n\n{0}\n\n実行してよろしいですか?",
   "DialogShaderDeletionErrorMessage": "シェーダキャッシュ破棄エラー {0}: {1}",
@@ -379,7 +379,7 @@
   "DialogSettingsBackendThreadingWarningTitle": "警告 - バックエンドスレッディング",
   "DialogSettingsBackendThreadingWarningMessage": "このオプションの変更を完全に適用するには Ryujinx の再起動が必要です. プラットフォームによっては, Ryujinx のものを使用する前に手動でドライバ自身のマルチスレッディングを無効にする必要があるかもしれません.",
   "SettingsTabGraphicsFeaturesOptions": "機能",
-  "SettingsTabGraphicsBackendMultithreading": "グラフィクスバックエンドのマルチスレッド実行:",
+  "SettingsTabGraphicsBackendMultithreading": "グラフィックスバックエンドのマルチスレッド実行:",
   "CommonAuto": "自動",
   "CommonOff": "オフ",
   "CommonOn": "オン",
@@ -425,7 +425,7 @@
   "CustomThemeCheckTooltip": "エミュレータのメニュー外観を変更するためカスタム Avalonia テーマを使用します",
   "CustomThemePathTooltip": "カスタム GUI テーマのパスです",
   "CustomThemeBrowseTooltip": "カスタム GUI テーマを参照します",
-  "DockModeToggleTooltip": "有効にすると,ドッキングされた Nintendo Switch をエミュレートします.多くのゲームではグラフィクス品質が向上します.\n無効にすると,携帯モードの Nintendo Switch をエミュレートします.グラフィクスの品質は低下します.\n\nドッキングモード有効ならプレイヤー1の,無効なら携帯の入力を設定してください.\n\nよくわからない場合はオンのままにしてください.",
+  "DockModeToggleTooltip": "有効にすると,ドッキングされた Nintendo Switch をエミュレートします.多くのゲームではグラフィックス品質が向上します.\n無効にすると,携帯モードの Nintendo Switch をエミュレートします.グラフィックスの品質は低下します.\n\nドッキングモード有効ならプレイヤー1の,無効なら携帯の入力を設定してください.\n\nよくわからない場合はオンのままにしてください.",
   "DirectKeyboardTooltip": "キーボード直接アクセス (HID) に対応します. キーボードをテキスト入力デバイスとして使用できます.",
   "DirectMouseTooltip": "マウス直接アクセス (HID) に対応します. マウスをポインティングデバイスとして使用できます.",
   "RegionTooltip": "システムの地域を変更します",
@@ -442,14 +442,14 @@
   "MemoryManagerUnsafeTooltip": "メモリを直接マップしますが, アクセス前にゲストのアドレス空間内のアドレスをマスクしません. より高速になりますが, 安全性が犠牲になります. ゲストアプリケーションは Ryujinx のどこからでもメモリにアクセスできるので,このモードでは信頼できるプログラムだけを実行するようにしてください.",
   "DRamTooltip": "エミュレートされたシステムのメモリ容量を 4GB から 6GB に増加します.\n\n高解像度のテクスチャパックや 4K解像度の mod を使用する場合に有用です. パフォーマンスを改善するものではありません.\n\nよくわからない場合はオフのままにしてください.",
   "IgnoreMissingServicesTooltip": "未実装の Horizon OS サービスを無視します. 特定のゲームにおいて起動時のクラッシュを回避できる場合があります.\n\nよくわからない場合はオフのままにしてください.",
-  "GraphicsBackendThreadingTooltip": "グラフィクスバックエンドのコマンドを別スレッドで実行します.\n\nシェーダのコンパイルを高速化し, 遅延を軽減し, マルチスレッド非対応の GPU ドライバにおいてパフォーマンスを改善します. マルチスレッド対応のドライバでも若干パフォーマンス改善が見られます.\n\nよくわからない場合は自動に設定してください.",
-  "GalThreadingTooltip": "グラフィクスバックエンドのコマンドを別スレッドで実行します.\n\nシェーダのコンパイルを高速化し, 遅延を軽減し, マルチスレッド非対応の GPU ドライバにおいてパフォーマンスを改善します. マルチスレッド対応のドライバでも若干パフォーマンス改善が見られます.\n\nよくわからない場合は自動に設定してください.",
+  "GraphicsBackendThreadingTooltip": "グラフィックスバックエンドのコマンドを別スレッドで実行します.\n\nシェーダのコンパイルを高速化し, 遅延を軽減し, マルチスレッド非対応の GPU ドライバにおいてパフォーマンスを改善します. マルチスレッド対応のドライバでも若干パフォーマンス改善が見られます.\n\nよくわからない場合は自動に設定してください.",
+  "GalThreadingTooltip": "グラフィックスバックエンドのコマンドを別スレッドで実行します.\n\nシェーダのコンパイルを高速化し, 遅延を軽減し, マルチスレッド非対応の GPU ドライバにおいてパフォーマンスを改善します. マルチスレッド対応のドライバでも若干パフォーマンス改善が見られます.\n\nよくわからない場合は自動に設定してください.",
   "ShaderCacheToggleTooltip": "ディスクシェーダキャッシュをセーブし,次回以降の実行時遅延を軽減します.\n\nよくわからない場合はオンのままにしてください.",
   "ResolutionScaleTooltip": "レンダリングに適用される解像度の倍率です",
   "ResolutionScaleEntryTooltip": "1.5 のような整数でない倍率を指定すると,問題が発生したりクラッシュしたりする場合があります.",
   "AnisotropyTooltip": "異方性フィルタリングのレベルです (ゲームが要求する値を使用する場合は｢自動｣を設定してください)",
   "AspectRatioTooltip": "レンダリングに適用されるアスペクト比です.",
-  "ShaderDumpPathTooltip": "グラフィクス シェーダダンプのパスです",
+  "ShaderDumpPathTooltip": "グラフィックス シェーダダンプのパスです",
   "FileLogTooltip": "コンソール出力されるログをディスク上のログファイルにセーブします. パフォーマンスには影響を与えません.",
   "StubLogTooltip": "stub ログメッセージをコンソールに出力します. パフォーマンスには影響を与えません.",
   "InfoLogTooltip": "info ログメッセージをコンソールに出力します. パフォーマンスには影響を与えません.",
@@ -539,7 +539,7 @@
   "LoadingHeading": "ロード中: {0}",
   "CompilingPPTC": "PTC をコンパイル中",
   "CompilingShaders": "シェーダをコンパイル中",
-  "AllKeyboards": "すべてキーボード",
+  "AllKeyboards": "すべてのキーボード",
   "OpenFileDialogTitle": "開くファイルを選択",
   "OpenFolderDialogTitle": "展開されたゲームフォルダを選択",
   "AllSupportedFormats": "すべての対応フォーマット",
@@ -573,9 +573,20 @@
   "Save": "セーブ",
   "Discard": "破棄",
   "UserProfilesSetProfileImage": "プロファイル画像を設定",
-  "UserProfileEmptyNameError": "名前が必要です",
+  "UserProfileEmptyNameError": "名称が必要です",
   "UserProfileNoImageError":  "プロファイル画像が必要です",
   "GameUpdateWindowHeading": "利用可能なアップデート {0} [{1}]",
   "SettingsTabHotkeysResScaleUpHotkey": "解像度を上げる:",
-  "SettingsTabHotkeysResScaleDownHotkey": "解像度を下げる:"
+  "SettingsTabHotkeysResScaleDownHotkey": "解像度を下げる:",
+  "UserProfilesName": "名称:",
+  "UserProfilesUserId" : "ユーザID:",
+  "SettingsTabGraphicsBackend": "グラフィックスバックエンド",
+  "SettingsTabGraphicsBackendTooltip": "使用するグラフィックスバックエンドです",
+  "SettingsEnableTextureRecompression": "テクスチャの再圧縮を有効",
+  "SettingsEnableTextureRecompressionTooltip": "VRAMの使用量を削減するためテクスチャを圧縮します.\n\nGPUのVRAMが4GB未満の場合は使用を推奨します.\n\nよくわからない場合はオフのままにしてください.",
+  "SettingsTabGraphicsPreferredGpu": "優先使用するGPU",
+  "SettingsTabGraphicsPreferredGpuTooltip": "Vulkanグラフィックスバックエンドで使用されるグラフィックスカードを選択します.\n\nOpenGLが使用するGPUには影響しません.\n\n不明な場合は, \"dGPU\" としてフラグが立っているGPUに設定します. ない場合はそのままにします.",
+  "SettingsAppRequiredRestartMessage": "Ryujinx の再起動が必要です",
+  "SettingsGpuBackendRestartMessage": "グラフィックスバックエンドまたはGPUの設定が変更されました. 変更を適用するには再起動する必要があります",
+  "SettingsGpuBackendRestartSubMessage": "今すぐ再起動しますか?"
 }

Ryujinx.Ava/Assets/Locales/tr_TR.json

@@ -1,5 +1,5 @@
 {
-  "MenuBarFileOpenApplet": "Applet'i aç",
+  "MenuBarFileOpenApplet": "Applet'i Aç",
   "MenuBarFileOpenAppletOpenMiiAppletToolTip": "Mii Editör Applet'ini Bağımsız Mod'da Aç",
   "SettingsTabInputDirectMouseAccess": "Doğrudan Mouse Erişimi",
   "SettingsTabSystemMemoryManagerMode": "Hafıza Yönetim Modu:",
@@ -13,20 +13,20 @@
   "MenuBarFileOpenLogsFolder": "Logs Klasörünü aç",
   "MenuBarFileExit": "_Çıkış",
   "MenuBarOptions": "Seçenekler",
-  "MenuBarOptionsToggleFullscreen": "Tam ekran modu",
-  "MenuBarOptionsStartGamesInFullscreen": "Oyunları Tam Ekran Modunda başlat",
-  "MenuBarOptionsStopEmulation": "Emülasyonu durdur",
+  "MenuBarOptionsToggleFullscreen": "Tam Ekran Modu",
+  "MenuBarOptionsStartGamesInFullscreen": "Oyunları Tam Ekran Modunda Başlat",
+  "MenuBarOptionsStopEmulation": "Emülasyonu Durdur",
   "MenuBarOptionsSettings": "_Seçenekler",
-  "MenuBarOptionsManageUserProfiles": "_Kullanıcı profillerini yönet",
+  "MenuBarOptionsManageUserProfiles": "_Kullanıcı Profillerini Yönet",
   "MenuBarActions": "_Eylemler",
-  "MenuBarOptionsSimulateWakeUpMessage": "Uyandırma mesajı simüle et",
-  "MenuBarActionsScanAmiibo": "Amiibo tarama",
+  "MenuBarOptionsSimulateWakeUpMessage": "Uyandırma Mesajı Simüle Et",
+  "MenuBarActionsScanAmiibo": "Amiibo Tarama",
   "MenuBarTools": "_Aletler",
-  "MenuBarToolsInstallFirmware": "Firmware yükle",
-  "MenuBarFileToolsInstallFirmwareFromFile": "Firmware yükle (XCI veya ZIP)",
-  "MenuBarFileToolsInstallFirmwareFromDirectory": "Firmware yükle (Dizin üzerinden)",
+  "MenuBarToolsInstallFirmware": "Firmware Yükle",
+  "MenuBarFileToolsInstallFirmwareFromFile": "Firmware Yükle (XCI veya ZIP)",
+  "MenuBarFileToolsInstallFirmwareFromDirectory": "Firmware Yükle (Dizin üzerinden)",
   "MenuBarHelp": "Yardım",
-  "MenuBarHelpCheckForUpdates": "Güncellemeleri denetle",
+  "MenuBarHelpCheckForUpdates": "Güncellemeleri Denetle",
   "MenuBarHelpAbout": "Hakkında",
   "MenuSearch": "Arama...",
   "GameListHeaderFavorite": "Favori",
@@ -34,25 +34,25 @@
   "GameListHeaderApplication": "Oyun Adı",
   "GameListHeaderDeveloper": "Geliştirici",
   "GameListHeaderVersion": "Sürüm",
-  "GameListHeaderTimePlayed": "Oynama süresi",
-  "GameListHeaderLastPlayed": "Son oynama tarihi",
+  "GameListHeaderTimePlayed": "Oynama Süresi",
+  "GameListHeaderLastPlayed": "Son Oynama Tarihi",
   "GameListHeaderFileExtension": "Dosya Uzantısı",
-  "GameListHeaderFileSize": "Dosya boyutu",
+  "GameListHeaderFileSize": "Dosya Boyutu",
   "GameListHeaderPath": "Yol",
   "GameListContextMenuOpenUserSaveDirectory": "Kullanıcı Kayıt Dosyası Dizinini Aç",
-  "GameListContextMenuOpenUserSaveDirectoryToolTip": "Uygulamanın Kullanıcı Kaydının bulunduğu dizini açar",
+  "GameListContextMenuOpenUserSaveDirectoryToolTip": "Uygulamanın Kullanıcı Kaydı'nın bulunduğu dizini açar",
   "GameListContextMenuOpenUserDeviceDirectory": "Kullanıcı Cihaz Dizinini Aç",
-  "GameListContextMenuOpenUserDeviceDirectoryToolTip": "Uygulamanın Kullanıcı Cihaz bulunduğu dizini açar",
+  "GameListContextMenuOpenUserDeviceDirectoryToolTip": "Uygulamanın Kullanıcı Cihaz Kaydı'nın bulunduğu dizini açar",
   "GameListContextMenuOpenUserBcatDirectory": "Kullanıcı BCAT Dizinini Aç",
-  "GameListContextMenuOpenUserBcatDirectoryToolTip": "Uygulamanın Kullanıcı BCAT Kaydının bulunduğu dizini açar",
+  "GameListContextMenuOpenUserBcatDirectoryToolTip": "Uygulamanın Kullanıcı BCAT Kaydı'nın bulunduğu dizini açar",
   "GameListContextMenuManageTitleUpdates": "Oyun Güncellemelerini Yönet",
-  "GameListContextMenuManageTitleUpdatesToolTip": "Oyun Güncelleme yönetim penceresini açar",
+  "GameListContextMenuManageTitleUpdatesToolTip": "Oyun güncelleme yönetim penceresini açar",
   "GameListContextMenuManageDlc": "DLC Yönet",
   "GameListContextMenuManageDlcToolTip": "DLC yönetim penceresini açar",
   "GameListContextMenuOpenModsDirectory": "Mod Dizinini Aç",
-  "GameListContextMenuOpenModsDirectoryToolTip": "Uygulamanın Modlarının bulunduğu dizini açar",
+  "GameListContextMenuOpenModsDirectoryToolTip": "Uygulamanın modlarının bulunduğu dizini açar",
   "GameListContextMenuCacheManagement": "Cache Yönetimi",
-  "GameListContextMenuCacheManagementPurgePptc": "PPTC Cache'ini temizle",
+  "GameListContextMenuCacheManagementPurgePptc": "PPTC Cache'ini Temizle",
   "GameListContextMenuCacheManagementPurgePptcToolTip": "Uygulamanın PPTC cache'ini siler",
   "GameListContextMenuCacheManagementPurgeShaderCache": "Shader Cache'i temizle",
   "GameListContextMenuCacheManagementPurgeShaderCacheToolTip": "Uygulamanın shader cache'ini siler",
@@ -72,7 +72,7 @@
   "Settings": "Yapılandırma",
   "SettingsTabGeneral": "Kullancı Arayüzü",
   "SettingsTabGeneralGeneral": "Genel",
-  "SettingsTabGeneralEnableDiscordRichPresence": "Discord Rich Presence'i Aç",
+  "SettingsTabGeneralEnableDiscordRichPresence": "Discord Rich Presence'i Etkinleştir",
   "SettingsTabGeneralCheckUpdatesOnLaunch": "Her Açılışta Güncellemeleri Denetle",
   "SettingsTabGeneralShowConfirmExitDialog": "\"Çıkışı Onayla\" Diyaloğunu Göster",
   "SettingsTabGeneralHideCursorOnIdle": "Hareketsizlik durumunda imleci gizle",
@@ -108,7 +108,7 @@
   "SettingsTabSystemSystemLanguageSimplifiedChinese": "Basitleştirilmiş Çince",
   "SettingsTabSystemSystemLanguageTraditionalChinese": "Geleneksel Çince",
   "SettingsTabSystemSystemTimeZone": "Sistem Saat Dilimi:",
-  "SettingsTabSystemSystemTime": "System Time:",
+  "SettingsTabSystemSystemTime": "Sistem Saati:",
   "SettingsTabSystemEnableVsync": "VSync'i Etkinleştir",
   "SettingsTabSystemEnablePptc": "PPTC'yi Etkinleştir (Profiled Persistent Translation Cache)",
   "SettingsTabSystemEnableFsIntegrityChecks": "FS Bütünlük Kontrollerini Etkinleştir",
@@ -124,13 +124,13 @@
   "SettingsTabGraphics": "Grafikler",
   "SettingsTabGraphicsAPI": "Grafikler API",
   "SettingsTabGraphicsEnableShaderCache": "Shader Cache'i Etkinleştir",
-  "SettingsTabGraphicsAnisotropicFiltering": "Anisotropic Filtering:",
+  "SettingsTabGraphicsAnisotropicFiltering": "Eşyönsüz Doku Süzmesi:",
   "SettingsTabGraphicsAnisotropicFilteringAuto": "Otomatik",
   "SettingsTabGraphicsAnisotropicFiltering2x": "2x",
   "SettingsTabGraphicsAnisotropicFiltering4x": "4x",
   "SettingsTabGraphicsAnisotropicFiltering8x": "8x",
   "SettingsTabGraphicsAnisotropicFiltering16x": "16x",
-  "SettingsTabGraphicsResolutionScale": "Resolution Scale:",
+  "SettingsTabGraphicsResolutionScale": "Çözünürlük Ölçeği:",
   "SettingsTabGraphicsResolutionScaleCustom": "Özel (Tavsiye Edilmez)",
   "SettingsTabGraphicsResolutionScaleNative": "Yerel (720p/1080p)",
   "SettingsTabGraphicsResolutionScale2x": "2x (1440p/2160p)",
@@ -142,7 +142,7 @@
   "SettingsTabGraphicsAspectRatio16x10": "16:10",
   "SettingsTabGraphicsAspectRatio21x9": "21:9",
   "SettingsTabGraphicsAspectRatio32x9": "32:9",
-  "SettingsTabGraphicsAspectRatioStretch": "Pencereye Sığdırmak için Genişlet",
+  "SettingsTabGraphicsAspectRatioStretch": "Pencereye sığdırmak için genişlet",
   "SettingsTabGraphicsDeveloperOptions": "Geliştirici Seçenekleri",
   "SettingsTabGraphicsShaderDumpPath": "Grafik Shader Döküm Yolu:",
   "SettingsTabLogging": "Loglama",
@@ -164,7 +164,7 @@
   "SettingsTabLoggingOpenglLogLevelAll": "Her Şey",
   "SettingsTabLoggingEnableDebugLogs": "Hata Ayıklama Loglarını Etkinleştir",
   "SettingsTabInput": "Giriş Yöntemi",
-  "SettingsTabInputEnableDockedMode": "Docked Mode'u Etkinleştir",
+  "SettingsTabInputEnableDockedMode": "Docked Modunu Etkinleştir",
   "SettingsTabInputDirectKeyboardAccess": "Doğrudan Klavye Erişimi",
   "SettingsButtonSave": "Kaydet",
   "SettingsButtonClose": "Kapat",
@@ -183,7 +183,7 @@
   "ControllerSettingsRefresh": "Yenile",
   "ControllerSettingsDeviceDisabled": "Devre Dışı",
   "ControllerSettingsControllerType": "Kontrolcü Tarzı",
-  "ControllerSettingsControllerTypeHandheld": "Portatif Mod",
+  "ControllerSettingsControllerTypeHandheld": "Handheld",
   "ControllerSettingsControllerTypeProController": "Pro Controller",
   "ControllerSettingsControllerTypeJoyConPair": "JoyCon İkilisi",
   "ControllerSettingsControllerTypeJoyConLeft": "JoyCon Sol",
@@ -240,14 +240,14 @@
   "ControllerSettingsRightSR": "SR",
   "ControllerSettingsExtraButtonsLeft": "Sol Tuşlar",
   "ControllerSettingsExtraButtonsRight": "Sağ Tuşlar",
-  "ControllerSettingsMisc": "Misc.",
+  "ControllerSettingsMisc": "Diğer",
   "ControllerSettingsTriggerThreshold": "Tetik Eşiği:",
   "ControllerSettingsMotion": "Hareket",
   "ControllerSettingsMotionUseCemuhookCompatibleMotion": "CemuHook Uyumlu Hareket",
   "ControllerSettingsMotionControllerSlot": "Kontrolcü Yuvası:",
   "ControllerSettingsMotionMirrorInput": "Girişi Aynala",
   "ControllerSettingsMotionRightJoyConSlot": "Sağ JoyCon Yuvası:",
-  "ControllerSettingsMotionServerHost": "Server Host:",
+  "ControllerSettingsMotionServerHost": "Sunucu Host'u:",
   "ControllerSettingsMotionGyroSensitivity": "Gyro Hassasiyeti:",
   "ControllerSettingsMotionGyroDeadzone": "Gyro Ölü Bölgesi:",
   "ControllerSettingsSave": "Kaydet",
@@ -271,16 +271,16 @@
   "InputDialogAddNewProfileHeader": "Profil İsmi girin",
   "InputDialogAddNewProfileSubtext": "(Maksimum Uzunluk: {0})",
   "AvatarChoose": "Seç",
-  "AvatarSetBackgroundColor": "Arkaplan Rengi Ayarla",
+  "AvatarSetBackgroundColor": "Arka Plan Rengi Ayarla",
   "AvatarClose": "Kapat",
   "ControllerSettingsLoadProfileToolTip": "Profil Yükle",
   "ControllerSettingsAddProfileToolTip": "Profil Ekle",
   "ControllerSettingsRemoveProfileToolTip": "Profil Kaldır",
   "ControllerSettingsSaveProfileToolTip": "Profil Kaydet",
   "MenuBarFileToolsTakeScreenshot": "Ekran Görüntüsü Al",
-  "MenuBarFileToolsHideUi": "Kullanıcı Arayüzünü gizle",
+  "MenuBarFileToolsHideUi": "Arayüzü Gizle",
   "GameListContextMenuToggleFavorite": "Favori Ayarla",
-  "GameListContextMenuToggleFavoriteToolTip": "Oyunun Favori Durumunu Aç/Kapat",
+  "GameListContextMenuToggleFavoriteToolTip": "Oyunun favorilere eklenmesini veya kaldırmasını sağlar",
   "SettingsTabGeneralTheme": "Tema",
   "SettingsTabGeneralThemeCustomTheme": "Özel Tema Yolu",
   "SettingsTabGeneralThemeBaseStyle": "Temel Stil",
@@ -290,9 +290,9 @@
   "ButtonBrowse": "Göz At",
   "ControllerSettingsConfigureGeneral": "Ayarla",
   "ControllerSettingsRumble": "Titreşim",
-  "ControllerSettingsRumbleStrongMultiplier": "Güçlü Titreşim Çarpanı",
-  "ControllerSettingsRumbleWeakMultiplier": "Zayıf Titreşim Çarpanı",
-  "DialogMessageSaveNotAvailableMessage": "{0} [{1:x16}] için kayıt verisi yok",
+  "ControllerSettingsRumbleStrongMultiplier": "Güçlü Titreşim Seviyesi",
+  "ControllerSettingsRumbleWeakMultiplier": "Zayıf Titreşim Seviyesi",
+  "DialogMessageSaveNotAvailableMessage": "{0} [{1:x16}] için kayıt verisi bulunamadı",
   "DialogMessageSaveNotAvailableCreateSaveMessage": "Bu oyun için kayıt verisi oluşturmak ister misiniz?",
   "DialogConfirmationTitle": "Ryujinx - Onay",
   "DialogUpdaterTitle": "Ryujinx - Güncelleyici",
@@ -310,11 +310,11 @@
   "DialogNcaExtractionMainNcaNotFoundErrorMessage": "Ayıklama hatası. Ana NCA seçilen dosyada bulunamadı.",
   "DialogNcaExtractionCheckLogErrorMessage": "Ayıklama hatası. Ek bilgi için log dosyasını okuyun.",
   "DialogNcaExtractionSuccessMessage": "Ayıklama başarıyla tamamlandı.",
-  "DialogUpdaterConvertFailedMessage": "Güncel Ryujinx sürümü çevrilemedi.",
+  "DialogUpdaterConvertFailedMessage": "Güncel Ryujinx sürümü dönüştürülemedi.",
   "DialogUpdaterCancelUpdateMessage": "Güncelleme iptal ediliyor!",
   "DialogUpdaterAlreadyOnLatestVersionMessage": "Zaten Ryujinx'in en güncel sürümünü kullanıyorsunuz!",
-  "DialogUpdaterFailedToGetVersionMessage": "Github Release'den yayınlama bilgisi alınırken hata oluştu. Bu durum yeni bir sürümün Github Actions tarafından derleniyor olmasından kaynaklanıyor olabilir. Birkaç dakika sonra tekrar deneyin.",
-  "DialogUpdaterConvertFailedGithubMessage": "Github Release'den alınan Ryujinx sürümü çevrilemedi.",
+  "DialogUpdaterFailedToGetVersionMessage": "Github Release'den yayınlanma bilgisi alınırken hata oluştu. Bu durum yeni bir sürümün Github Actions tarafından derleniyor olmasından kaynaklanıyor olabilir. Birkaç dakika sonra tekrar deneyin.",
+  "DialogUpdaterConvertFailedGithubMessage": "Github Release'den alınan Ryujinx sürümü dönüştürülemedi.",
   "DialogUpdaterDownloadingMessage": "Güncelleme indiriliyor...",
   "DialogUpdaterExtractionMessage": "Güncelleme ayıklanıyor...",
   "DialogUpdaterRenamingMessage": "Güncelleme yeniden adlandırılıyor...",
@@ -326,19 +326,19 @@
   "DialogUpdaterNoInternetMessage": "İnternete bağlı değilsiniz!",
   "DialogUpdaterNoInternetSubMessage": "Lütfen aktif bir internet bağlantınız olduğunu kontrol edin!",
   "DialogUpdaterDirtyBuildMessage": "Ryujinx'in Dirty build'lerini güncelleyemezsiniz!",
-  "DialogUpdaterDirtyBuildSubMessage": "Desteklenen bir sürüm arıyorsanız lütfen Ryujinx'i https://ryujinx.org/ sitesinden indirin.",
+  "DialogUpdaterDirtyBuildSubMessage": "Desteklenen bir sürüm için lütfen Ryujinx'i https://ryujinx.org/ sitesinden indirin.",
   "DialogRestartRequiredMessage": "Yeniden Başlatma Gerekli",
   "DialogThemeRestartMessage": "Tema kaydedildi. Temayı uygulamak için yeniden başlatma gerekiyor.",
   "DialogThemeRestartSubMessage": "Yeniden başlatmak ister misiniz",
   "DialogFirmwareInstallEmbeddedMessage": "Bu oyunun içine gömülü olan firmware'i yüklemek ister misiniz? (Firmware {0})",
-  "DialogFirmwareInstallEmbeddedSuccessMessage": "Yüklü firmware bulunamadı ancak Ryujinx sağlanan oyundan firmware {0} 'ı yükledi.\nRyujinx şimdi başlatılacak.",
+  "DialogFirmwareInstallEmbeddedSuccessMessage": "Yüklü firmware bulunamadı ancak Ryujinx sağlanan oyundan {0} firmware sürümünü yükledi.\nRyujinx şimdi başlatılacak.",
   "DialogFirmwareNoFirmwareInstalledMessage": "Firmware Yüklü Değil",
   "DialogFirmwareInstalledMessage": "Firmware {0} yüklendi",
   "DialogOpenSettingsWindowLabel": "Seçenekler Penceresini Aç",
-  "DialogControllerAppletTitle": "Controller Applet",
-  "DialogMessageDialogErrorExceptionMessage": "Mesaj Diyaloğu gösterilirken hata: {0}",
-  "DialogSoftwareKeyboardErrorExceptionMessage": "Mesaj Diyaloğu gösterilirken hata: {0}",
-  "DialogErrorAppletErrorExceptionMessage": "Applet Diyaloğu gösterilirken hata: {0}",
+  "DialogControllerAppletTitle": "Kontrolcü Applet'i",
+  "DialogMessageDialogErrorExceptionMessage": "Mesaj diyaloğu gösterilirken hata: {0}",
+  "DialogSoftwareKeyboardErrorExceptionMessage": "Mesaj diyaloğu gösterilirken hata: {0}",
+  "DialogErrorAppletErrorExceptionMessage": "Applet diyaloğu gösterilirken hata: {0}",
   "DialogUserErrorDialogMessage": "{0}: {1}",
   "DialogUserErrorDialogInfoMessage": "\nBu hatayı düzeltmek adına daha fazla bilgi için kurulum kılavuzumuzu takip edin.",
   "DialogUserErrorDialogTitle": "Ryujinx Hatası ({0})",
@@ -355,7 +355,7 @@
   "DialogShaderDeletionMessage": "Belirtilen Shader cache silinecek :\n\n{0}\n\nDevam etmek istediğinizden emin misiniz?",
   "DialogShaderDeletionErrorMessage": "Belirtilen Shader cache temizlenirken hata {0}: {1}",
   "DialogRyujinxErrorMessage": "Ryujinx bir hata ile karşılaştı",
-  "DialogInvalidTitleIdErrorMessage": "UI hatası: Seçilen oyun geçerli bir title ID'ye sahip değil",
+  "DialogInvalidTitleIdErrorMessage": "Arayüz hatası: Seçilen oyun geçerli bir title ID'ye sahip değil",
   "DialogFirmwareInstallerFirmwareNotFoundErrorMessage": "{0} da geçerli bir sistem firmware'i bulunamadı.",
   "DialogFirmwareInstallerFirmwareInstallTitle": "Firmware {0} Yükle",
   "DialogFirmwareInstallerFirmwareInstallMessage": "Sistem sürümü {0} yüklenecek.",
@@ -385,7 +385,7 @@
   "CommonOn": "Açık",
   "InputDialogYes": "Evet",
   "InputDialogNo": "Hayır",
-  "DialogProfileInvalidProfileNameErrorMessage": "Dosya adı geçerli olmayan karakterler içeriyor. Lütfen tekrar deneyin.",
+  "DialogProfileInvalidProfileNameErrorMessage": "Dosya adı geçersiz karakter içeriyor. Lütfen tekrar deneyin.",
   "MenuBarOptionsPauseEmulation": "Durdur",
   "MenuBarOptionsResumeEmulation": "Devam Et",
   "AboutUrlTooltipMessage": "Ryujinx'in websitesini varsayılan tarayıcınızda açmak için tıklayın.",
@@ -398,13 +398,13 @@
   "AboutRyujinxAboutTitle": "Hakkında:",
   "AboutRyujinxAboutContent": "Ryujinx bir Nintendo Switch™ emülatörüdür.\nLütfen bizi Patreon'da destekleyin.\nEn son haberleri Twitter veya Discord'umuzdan alın.\nKatkıda bulunmak isteyen geliştiriciler GitHub veya Discord üzerinden daha fazla bilgi edinebilir.",
   "AboutRyujinxMaintainersTitle": "Geliştiriciler:",
-  "AboutRyujinxMaintainersContentTooltipMessage": "Varsayılan tarayıcınızda katkıda bulunanlar sayfasını açmak için tıklayın.",
+  "AboutRyujinxMaintainersContentTooltipMessage": "Katkıda bulunanlar sayfasını varsayılan tarayıcınızda açmak için tıklayın.",
   "AboutRyujinxSupprtersTitle": "Patreon Destekleyicileri:",
   "AmiiboSeriesLabel": "Amiibo Serisi",
   "AmiiboCharacterLabel": "Karakter",
   "AmiiboScanButtonLabel": "Tarat",
   "AmiiboOptionsShowAllLabel": "Tüm Amiibo'ları Göster",
-  "AmiiboOptionsUsRandomTagLabel": "Hack: Use Random tag Uuid",
+  "AmiiboOptionsUsRandomTagLabel": "Hack: Rastgele bir Uuid kullan",
   "DlcManagerTableHeadingEnabledLabel": "Etkin",
   "DlcManagerTableHeadingTitleIdLabel": "Title ID",
   "DlcManagerTableHeadingContainerPathLabel": "Container Yol",
@@ -418,143 +418,164 @@
   "OrderDescending": "Azalan",
   "SettingsTabGraphicsFeatures": "Özellikler & İyileştirmeler",
   "ErrorWindowTitle": "Hata Penceresi",
-  "ToggleDiscordTooltip": "Discord Rich Presence'i Aç/Kapat",
-  "AddGameDirBoxTooltip": "Listeye eklemek için bir oyun dizini ekleyin",
+  "ToggleDiscordTooltip": "Ryujinx'i \"şimdi oynanıyor\" Discord aktivitesinde göstermeyi veya göstermemeyi seçin",
+  "AddGameDirBoxTooltip": "Listeye eklemek için oyun dizini seçin",
   "AddGameDirTooltip": "Listeye oyun dizini ekle",
-  "RemoveGameDirTooltip": "Seçilen oyun dizinini kaldır",
-  "CustomThemeCheckTooltip": "Grafik kullanıcı arayüzünde özel temaları etkinleştir veya devre dışı bırak",
-  "CustomThemePathTooltip": "Özel grafik kullancı arayüzü teması yolu",
-  "CustomThemeBrowseTooltip": "Özel grafik kullanıcı arayüzü teması için göz at",
-  "DockModeToggleTooltip": "Docked Modu etkinleştir veya devre dışı bırak",
-  "DirectKeyboardTooltip": "Enable or disable \"direct keyboard access (HID) support\" (Provides games access to your keyboard as a text entry device)",
-  "DirectMouseTooltip": "Enable or disable \"direct mouse access (HID) support\" (Provides games access to your mouse as a pointing device)",
+  "RemoveGameDirTooltip": "Seçili oyun dizinini kaldır",
+  "CustomThemeCheckTooltip": "Emülatör pencerelerinin görünümünü değiştirmek için özel bir Avalonia teması kullan",
+  "CustomThemePathTooltip": "Özel arayüz temasının yolu",
+  "CustomThemeBrowseTooltip": "Özel arayüz teması için göz at",
+  "DockModeToggleTooltip": "Docked modu emüle edilen sistemin yerleşik Nintendo Switch gibi davranmasını sağlar. Bu çoğu oyunda grafik kalitesini arttırır. Diğer yandan, bu seçeneği devre dışı bırakmak emüle edilen sistemin elde Ninendo Switch gibi davranmasını sağlayıp grafik kalitesini düşürür.\n\nDocked modu kullanmayı düşünüyorsanız 1. Oyuncu kontrollerini; Handheld modunu kullanmak istiyorsanız Handheld kontrollerini konfigüre edin.\n\nEmin değilseniz aktif halde bırakın.",
+  "DirectKeyboardTooltip": "Doğrudan Klavye Erişimi (HID) desteği. Oyunların klavyenizi metin giriş cihazı olarak kullanmasını sağlar.",
+  "DirectMouseTooltip": "Doğrudan Fare Erişimi (HID) desteği. Oyunların farenizi işaret aygıtı olarak kullanmasını sağlar.",
   "RegionTooltip": "Sistem Bölgesini Değiştir",
   "LanguageTooltip": "Sistem Dilini Değiştir",
   "TimezoneTooltip": "Sistem Saat Dilimini Değiştir",
   "TimeTooltip": "Sistem Saatini Değiştir",
-  "VSyncToggleTooltip": "Dikey senkronizasyonu etkinleştirir veya devre dışı bırakır",
-  "PptcToggleTooltip": "PPTC'yi etkinleştirir veya devre dışı bırakır",
-  "FsIntegrityToggleTooltip": "Oyun içerik dosyaları için bütünlük kontrollerini etkinleştirir",
-  "AudioBackendTooltip": "Ses motorunu değiştirir",
-  "MemoryManagerTooltip": "Change how guest memory is mapped and accessed. Greatly affects emulated CPU performance.",
-  "MemoryManagerSoftwareTooltip": "Use a software page table for address translation. Highest accuracy but slowest performance.",
-  "MemoryManagerHostTooltip": "Directly map memory in the host address space. Much faster JIT compilation and execution.",
-  "MemoryManagerUnsafeTooltip": "Directly map memory, but do not mask the address within the guest address space before access. Faster, but at the cost of safety. The guest application can access memory from anywhere in Ryujinx, so only run programs you trust with this mode.",
-  "DRamTooltip": "Emüle edilen sistemin hafızasını 4GB'dan 6GB'a yükseltir",
-  "IgnoreMissingServicesTooltip": "Eksik servisleri görmezden gelme seçeneğini etkinleştir veya devre dışı bırak",
-  "GraphicsBackendThreadingTooltip": "Graphics Backend Multithreading'i etkinleştir",
-  "GalThreadingTooltip": "Executes graphics backend commands on a second thread. Allows runtime multithreading of shader compilation, reduces stuttering, and improves performance on drivers without multithreading support of their own. Slightly varying peak performance on drivers with multithreading. Ryujinx may need to be restarted to correctly disable driver built-in multithreading, or you may need to do it manually to get the best performance.",
-  "ShaderCacheToggleTooltip": "Shader Cache'i etkinleştir veya devre dışı bırak",
-  "ResolutionScaleTooltip": "Resolution Scale applied to applicable render targets",
-  "ResolutionScaleEntryTooltip": "Floating point resolution scale, such as 1.5. Non-integral scales are more likely to cause issues or crash.",
-  "AnisotropyTooltip": "Anisotropic Filtering Seviyesi (Oyun tarafından istenen değeri kullanmak için Otomatik seçeneğini kullanın)",
-  "AspectRatioTooltip": "Aspect Ratio applied to the renderer window.",
-  "ShaderDumpPathTooltip": "Graphics Shaders Dump Path",
-  "FileLogTooltip": "Diskte bir dosyaya loglamayı etkinleştirir veya devre dışı bırakır",
-  "StubLogTooltip": "Stub log mesajlarını yazdırmayı etkinleştirir",
-  "InfoLogTooltip": "Bilgi log mesajlarını yazdırmayı etkinleştirir",
-  "WarnLogTooltip": "Uyarı log mesajlarını yazdırmayı etkinleştirir",
-  "ErrorLogTooltip": "Hata log mesajlarını yazdırmayı etkinleştirir",
-  "TraceLogTooltip": "Trace log mesajlarını yazdırmayı etkinleştirir",
-  "GuestLogTooltip": "Guest log mesajlarını yazdırmayı etkinleştirir",
-  "FileAccessLogTooltip": "Dosya erişim log mesajlarını yazdırmayı etkinleştirir",
-  "FSAccessLogModeTooltip": "Enables FS access log output to the console. Possible modes are 0-3",
+  "VSyncToggleTooltip": "Emüle edilen konsolun Dikey Senkronizasyonu. Çoğu oyun için kare sınırlayıcı işlevi görür, bu seçeneği devre dışı bırakmak bazı oyunların normalden yüksek hızda çalışmasını ve yükleme ekranlarının daha uzun sürmesini veya sıkışıp kalmasını sağlar.\n\nTercih ettiğiniz bir kısayol ile oyun içindeyken etkinleştirilip devre dışı bırakılabilir. Bu seçeneği devre dışı bırakmayı düşünüyorsanız bir kısayol atamanızı öneririz.\n\nEmin değilseniz aktif halde bırakın.",
+  "PptcToggleTooltip": "Çevrilen JIT fonksiyonlarını oyun her açıldığında çevrilmek zorunda kalmaması için kaydeder.\n\nTeklemeyi azaltır ve ilk açılıştan sonra oyunların ilk açılış süresini ciddi biçimde hızlandırır.\n\nEmin değilseniz aktif halde bırakın.",
+  "FsIntegrityToggleTooltip": "Oyun açarken hatalı dosyaların olup olmadığını kontrol eder, ve hatalı dosya bulursa log dosyasında hash hatası görüntüler.\n\nPerformansa herhangi bir etkisi yoktur ve sorun gidermeye yardımcı olur.\n\nEmin değilseniz aktif halde bırakın.",
+  "AudioBackendTooltip": "Ses çıkış motorunu değiştirir.\n\nSDL2 tercih edilen seçenektir, OpenAL ve SoundIO ise alternatif olarak kullanılabilir. Dummy seçeneğinde ses çıkışı olmayacaktır.\n\nEmin değilseniz SDL2 seçeneğine ayarlayın.",
+  "MemoryManagerTooltip": "Guest hafızasının nasıl tahsis edilip erişildiğini değiştirir. Emüle edilen CPU performansını ciddi biçimde etkiler.\n\nEmin değilseniz HOST UNCHECKED seçeneğine ayarlayın.",
+  "MemoryManagerSoftwareTooltip": "Adres çevirisi için bir işlemci sayfası kullanır. En yüksek doğruluğu ve en yavaş performansı sunar.",
+  "MemoryManagerHostTooltip": "Hafızayı doğrudan host adres aralığında tahsis eder. Çok daha hızlı JIT derleme ve işletimi sunar.",
+  "MemoryManagerUnsafeTooltip": "Hafızayı doğrudan tahsis eder, ancak host aralığına erişimden önce adresi maskelemez. Daha iyi performansa karşılık emniyetten ödün verir. Misafir uygulama Ryujinx içerisinden istediği hafızaya erişebilir, bu sebeple bu seçenek ile sadece güvendiğiniz uygulamaları çalıştırın.",
+  "DRamTooltip": "Emüle edilen sistem hafızasını 4GB'dan 6GB'a yükseltir.\n\nBu seçenek yalnızca yüksek çözünürlük doku paketleri veya 4k çözünürlük modları için kullanılır. Performansı artırMAZ!\n\nEmin değilseniz devre dışı bırakın.",
+  "IgnoreMissingServicesTooltip": "Henüz programlanmamış Horizon işletim sistemi servislerini görmezden gelir. Bu seçenek belirli oyunların açılırken çökmesinin önüne geçmeye yardımcı olabilir.\n\nEmin değilseniz devre dışı bırakın.",
+  "GraphicsBackendThreadingTooltip": "Grafik arka uç komutlarını ikinci bir iş parçacığında işletir.\n\nKendi multithreading desteği olmayan sürücülerde shader derlemeyi hızlandırıp performansı artırır. Multithreading desteği olan sürücülerde çok az daha iyi performans sağlar.\n\nEmin değilseniz Otomatik seçeneğine ayarlayın.",
+  "GalThreadingTooltip": "Grafik arka uç komutlarını ikinci bir iş parçacığında işletir.\n\nKendi multithreading desteği olmayan sürücülerde shader derlemeyi hızlandırıp performansı artırır. Multithreading desteği olan sürücülerde çok az daha iyi performans sağlar.\n\nEmin değilseniz Otomatik seçeneğine ayarlayın.",
+  "ShaderCacheToggleTooltip": "Saves a disk shader cache which reduces stuttering in subsequent runs.\n\nLeave ON if unsure.",
+  "ResolutionScaleTooltip": "Uygulanabilir grafik hedeflerine uygulanan çözünürlük ölçeği",
+  "ResolutionScaleEntryTooltip": "Küsüratlı çözünürlük ölçeği, 1.5 gibi. Küsüratlı ölçekler hata oluşturmaya ve çökmeye daha yatkındır.",
+  "AnisotropyTooltip": "Eşyönsüz doku süzmesi seviyesi (Oyun tarafından istenen değeri kullanmak için Otomatik seçeneğine ayarlayın)",
+  "AspectRatioTooltip": "Grafik penceresine uygulanan en-boy oranı.",
+  "ShaderDumpPathTooltip": "Grafik Shader Döküm Yolu",
+  "FileLogTooltip": "Konsol loglarını diskte bir log dosyasına kaydeder. Performansı etkilemez.",
+  "StubLogTooltip": "Stub log mesajlarını konsola yazdırır. Performansı etkilemez.",
+  "InfoLogTooltip": "Bilgi log mesajlarını konsola yazdırır. Performansı etkilemez.",
+  "WarnLogTooltip": "Uyarı log mesajlarını konsola yazdırır. Performansı etkilemez.",
+  "ErrorLogTooltip": "Hata log mesajlarını konsola yazdırır. Performansı etkilemez.",
+  "TraceLogTooltip": "Trace log mesajlarını konsola yazdırır. Performansı etkilemez.",
+  "GuestLogTooltip": "Guest log mesajlarını konsola yazdırır. Performansı etkilemez.",
+  "FileAccessLogTooltip": "Dosya sistemi erişim log mesajlarını konsola yazdırır.",
+  "FSAccessLogModeTooltip": "Konsola FS erişim loglarının yazılmasını etkinleştirir. Kullanılabilir modlar 0-3'tür",
   "DeveloperOptionTooltip": "Dikkatli kullanın",
-  "OpenGlLogLevel": "Uygun log seviyelerinin etkin olmasını gerektirir",
-  "DebugLogTooltip": "Debug log mesajlarını yazdırmayı etkinleştirir",
-  "LoadApplicationFileTooltip": "Switch'e uyumlu bir dosya açmak için bir dosya seçim arayüzü açar",
-  "LoadApplicationFolderTooltip": "Switch'e uyumlu sıkıştırılmamış uygulama açmak için bir dosya seçim arayüzü açar",
-  "OpenRyujinxFolderTooltip": "Ryujinx dosya sistemi klasörünü açar",
-  "OpenRyujinxLogsTooltip": "Log kayıtlarının yazıldığı klasörü açar",
-  "ExitTooltip": "Ryujinx'i Kapat",
-  "OpenSettingsTooltip": "Seçenekler penceresini aç",
-  "OpenProfileManagerTooltip": "Kullanıcı Profil Yönetimi penceresini açar",
-  "StopEmulationTooltip": "Güncel oyunun emülasyonunu durdurup oyun seçimine geri dönün",
-  "CheckUpdatesTooltip": "Ryujinx güncellemelerini denetle",
-  "OpenAboutTooltip": "Hakkında penceresini aç",
-  "GridSize": "Grid Boyutu",
-  "GridSizeTooltip": "Grid itemlerinin boyutunu değiştir",
+  "OpenGlLogLevel": "Uygun log seviyesinin aktif olmasını gerektirir",
+  "DebugLogTooltip": "Debug log mesajlarını konsola yazdırır.\n\nBu seçeneği yalnızca geliştirici üyemiz belirtirse aktifleştirin, çünkü bu seçenek log dosyasını okumayı zorlaştırır ve emülatörün performansını düşürür.",
+  "LoadApplicationFileTooltip": "Switch ile uyumlu bir dosya yüklemek için dosya tarayıcısını açar",
+  "LoadApplicationFolderTooltip": "Switch ile uyumlu ayrıştırılmamış bir uygulama yüklemek için dosya tarayıcısını açar",
+  "OpenRyujinxFolderTooltip": "Ryujinx dosya sistem klasörünü açar",
+  "OpenRyujinxLogsTooltip": "Log dosyalarının bulunduğu klasörü açar",
+  "ExitTooltip": "Ryujinx'ten çıkış yapmayı sağlar",
+  "OpenSettingsTooltip": "Seçenekler penceresini açar",
+  "OpenProfileManagerTooltip": "Kullanıcı profil yöneticisi penceresini açar",
+  "StopEmulationTooltip": "Oynanmakta olan oyunun emülasyonunu durdurup oyun seçimine geri döndürür",
+  "CheckUpdatesTooltip": "Ryujinx güncellemelerini denetlemeyi sağlar",
+  "OpenAboutTooltip": "Hakkında penceresini açar",
+  "GridSize": "Öge Boyutu",
+  "GridSizeTooltip": "Grid ögelerinin boyutunu değiştirmeyi sağlar",
   "SettingsTabSystemSystemLanguageBrazilianPortuguese": "Brezilya Portekizcesi",
   "AboutRyujinxContributorsButtonHeader": "Tüm katkıda bulunanları gör",
   "SettingsTabSystemAudioVolume": "Ses Seviyesi: ",
-  "AudioVolumeTooltip": "Ses seviyesini değiştir",
-  "SettingsTabSystemEnableInternetAccess": "Guest Internet Erişimini Etkinleştir",
-  "EnableInternetAccessTooltip": "Guest internet erişimini etkinleştirir. Etkinleştirilmişse, uygulama emüle edilen Switch konsolu internete bağlıymış gibi davranır. Not: Bazı durumlarda uygulamalar bu seçenek devre dışı olmasına rağmen internete erişebilir",
-  "GameListContextMenuManageCheatToolTip" : "Hileleri Yönet",
-  "GameListContextMenuManageCheat" : "Hileleri Yönet",
-  "ControllerSettingsStickRange" : "Bölge (Range):",
-  "DialogStopEmulationTitle" : "Ryujinx - Emülasyonu Durdur",
+  "AudioVolumeTooltip": "Ses seviyesini değiştirir",
+  "SettingsTabSystemEnableInternetAccess": "Guest Internet Erişimi/LAN Modu",
+  "EnableInternetAccessTooltip": "Emüle edilen uygulamanın internete bağlanmasını sağlar.\n\nLAN modu bulunan oyunlar bu seçenek ile birbirine bağlanabilir ve sistemler aynı access point'e bağlanır. Bu gerçek konsolları da kapsar.\n\nNintendo sunucularına bağlanmayı sağlaMAZ. Internete bağlanmaya çalışan baz oyunların çökmesine sebep olabilr.\n\nEmin değilseniz devre dışı bırakın.",
+  "GameListContextMenuManageCheatToolTip": "Hileleri yönetmeyi sağlar",
+  "GameListContextMenuManageCheat": "Hileleri Yönet",
+  "ControllerSettingsStickRange": "Menzil:",
+  "DialogStopEmulationTitle": "Ryujinx - Emülasyonu Durdur",
   "DialogStopEmulationMessage": "Emülasyonu durdurmak istediğinizden emin misiniz?",
   "SettingsTabCpu": "CPU",
   "SettingsTabAudio": "Ses",
   "SettingsTabNetwork": "Ağ",
-  "SettingsTabNetworkConnection" : "Ağ Bağlantısı",
-  "SettingsTabCpuCache" : "CPU Cache",
-  "SettingsTabCpuMemory" : "CPU Hafızası",
+  "SettingsTabNetworkConnection": "Ağ Bağlantısı",
+  "SettingsTabCpuCache": "CPU Cache",
+  "SettingsTabCpuMemory": "CPU Hafızası",
   "DialogUpdaterFlatpakNotSupportedMessage": "Lütfen Ryujinx'i FlatHub aracılığıyla güncelleyin.",
-  "UpdaterDisabledWarningTitle": "Güncelleme aracı devre dışı!",
-  "GameListContextMenuOpenSdModsDirectory": "Atmosphere Modları Dizinini Aç",
-  "GameListContextMenuOpenSdModsDirectoryToolTip": "Uygulamanın modlarının bulunduğu alternatif atmosphere SD kart dizinini açar",
-  "ControllerSettingsRotate90": "Saat yönünde 90° döndür",
-  "IconSize": "Simge Boyutu",
-  "IconSizeTooltip": "Oyunların simge boyutlarını değiştirir",
-  "MenuBarOptionsShowConsole": "Konsolu Göster",
-  "ShaderCachePurgeError" :  "Belirtilen shader cache temizlenirken hata {0}: {1}",
+  "UpdaterDisabledWarningTitle": "Güncelleyici Devre Dışı!",
+  "GameListContextMenuOpenSdModsDirectory": "Atmosphere Mod Dizini",
+  "GameListContextMenuOpenSdModsDirectoryToolTip": "Opens the alternative SD card Atmosphere directory which contains Application's Mods. Useful for mods that are packaged for real hardware.",
+  "ControllerSettingsRotate90": "Saat yönünde 90° Döndür",
+  "IconSize": "Ikon Boyutu",
+  "IconSizeTooltip": "Oyun ikonlarının boyutunu değiştirmeyi sağlar",
+  "MenuBarOptionsShowConsole": "Konsol'u Göster",
+  "ShaderCachePurgeError": "Belirtilen shader cache temizlenirken hata {0}: {1}",
   "UserErrorNoKeys": "Keys bulunamadı",
   "UserErrorNoFirmware": "Firmware bulunamadı",
   "UserErrorFirmwareParsingFailed": "Firmware çözümleme hatası",
   "UserErrorApplicationNotFound": "Uygulama bulunamadı",
   "UserErrorUnknown": "Bilinmeyen hata",
-  "UserErrorUndefined": "Tanımlanmamış hata",
-  "UserErrorNoKeysDescription": "Ryujinx 'prod.keys' dosyanızı bulamadı",
-  "UserErrorNoFirmwareDescription": "Ryujinx yüklü firmware bulamadı",
-  "UserErrorFirmwareParsingFailedDescription": "Ryujinx verilen firmware'i çözümleyemedi. Bu durum genellikle güncel olmayan key'lerden kaynaklanır.",
-  "UserErrorApplicationNotFoundDescription": "Ryujinx verilen yolda geçerli bir uygulama bulamadı.",
+  "UserErrorUndefined": "Tanımlanmayan hata",
+  "UserErrorNoKeysDescription": "Ryujinx 'prod.keys' dosyasını bulamadı",
+  "UserErrorNoFirmwareDescription": "Ryujinx yüklü herhangi firmware bulamadı",
+  "UserErrorFirmwareParsingFailedDescription": "Ryujinx temin edilen firmware'i çözümleyemedi. Bu durum genellikle güncel olmayan keys'den kaynaklanır.",
+  "UserErrorApplicationNotFoundDescription": "Ryujinx belirtilen yolda geçerli bir uygulama bulamadı.",
   "UserErrorUnknownDescription": "Bilinmeyen bir hata oluştu!",
-  "UserErrorUndefinedDescription": "Tanımlanmamış bir hata oluştu! Bu durumla karşılaşılmamalı, lütfen bir geliştirici ile iletişime geçin!",
-  "OpenSetupGuideMessage": "Kurulum kılavuzunu aç",
+  "UserErrorUndefinedDescription": "Tanımlanmayan bir hata oluştu! Bu durum ile karşılaşılmamalıydı, lütfen bir geliştirici ile iletişime geçin!",
+  "OpenSetupGuideMessage": "Kurulum Kılavuzunu Aç",
   "NoUpdate": "Güncelleme Yok",
   "TitleUpdateVersionLabel": "Sürüm {0} - {1}",
   "RyujinxInfo": "Ryujinx - Bilgi",
-  "RyujinxConfirm": "Ryujinx - Onay",
-  "FileDialogAllTypes": "Tüm tarzlar",
+  "RyujinxConfirm": "Ryujinx - Doğrulama",
+  "FileDialogAllTypes": "Tüm türler",
   "Never": "Hiçbir Zaman",
   "SwkbdMinCharacters": "En az {0} karakter uzunluğunda olmalı",
-  "SwkbdMinRangeCharacters": "En az {0}-{1} karakter uzunluğunda olmalı",
-  "SoftwareKeyboard": "Software Klavyesi",
-  "DialogControllerAppletMessagePlayerRange": "Uygulama {0} oyuncu(lar) talep eder player(s) with:\n\nTYPES: {1}\n\nPLAYERS: {2}\n\n{3}Please open Settings and reconfigure Input now or press Close.",
-  "DialogControllerAppletMessage": "Application requests exactly {0} player(s) with:\n\nTYPES: {1}\n\nPLAYERS: {2}\n\n{3}Please open Settings and reconfigure Input now or press Close.",
-  "DialogControllerAppletDockModeSet": "Docked mode set. Handheld is also invalid.\n\n",
+  "SwkbdMinRangeCharacters": "{0}-{1} karakter uzunluğunda olmalı",
+  "SoftwareKeyboard": "Yazılım Klavyesi",
+  "DialogControllerAppletMessagePlayerRange": "Uygulama belirtilen türde {0} oyuncu istiyor:\n\nTÜRLER: {1}\n\nOYUNCULAR: {2}\n\n{3}Lütfen şimdi seçeneklerden giriş aygıtlarını ayarlayın veya Kapat'a basın.",
+  "DialogControllerAppletMessage": "Uygulama belirtilen türde tam olarak {0} oyuncu istiyor:\n\nTÜRLER: {1}\n\nOYUNCULAR: {2}\n\n{3}Lütfen şimdi seçeneklerden giriş aygıtlarını ayarlayın veya Kapat'a basın.",
+  "DialogControllerAppletDockModeSet": "Docked mode etkin. Handheld geçersiz.\n\n",
   "UpdaterRenaming": "Eski dosyalar yeniden adlandırılıyor...",
-  "UpdaterRenameFailed": "Güncelleme aracı belirilen dosyayı yeniden adlandıramadı: {0}",
-  "UpdaterAddingFiles": "Yeni dosyalar ekleniyor...",
-  "UpdaterExtracting": "Güncelleme ayıklanıyor...",
-  "UpdaterDownloading": "Güncelleme indiriliyor...",
+  "UpdaterRenameFailed": "Güncelleyici belirtilen dosyayı yeniden adlandıramadı: {0}",
+  "UpdaterAddingFiles": "Yeni Dosyalar Ekleniyor...",
+  "UpdaterExtracting": "Güncelleme Ayrıştırılıyor...",
+  "UpdaterDownloading": "Güncelleme İndiriliyor...",
   "Game": "Oyun",
   "Docked": "Docked",
   "Handheld": "Handheld",
   "ConnectionError": "Bağlantı Hatası.",
   "AboutPageDeveloperListMore": "{0} ve daha fazla...",
   "ApiError": "API Hatası.",
-  "LoadingHeading": "Yükleniyor {0}",
-  "CompilingPPTC": "PTC derleniyor",
-  "CompilingShaders": "Shaderlar derleniyor",
-  "AllKeyboards": "Tüm klavyeler",
-  "OpenFileDialogTitle": "Açılacak desteklenen bir dosya seçin",
-  "OpenFolderDialogTitle": "Sıkıştırılmamış oyun içeren klasör seçin",
+  "LoadingHeading": "{0} Yükleniyor",
+  "CompilingPPTC": "PTC Derleniyor",
+  "CompilingShaders": "Shaderlar Derleniyor",
+  "AllKeyboards": "Tüm Klavyeler",
+  "OpenFileDialogTitle": "Açmak için desteklenen bir dosya seçin",
+  "OpenFolderDialogTitle": "Ayrıştırılmamış oyun içeren bir klasör seçin",
   "AllSupportedFormats": "Tüm Desteklenen Formatlar",
   "RyujinxUpdater": "Ryujinx Güncelleyicisi",
   "SettingsTabHotkeys": "Klavye Kısayolları",
   "SettingsTabHotkeysHotkeys": "Klavye Kısayolları",
-  "SettingsTabHotkeysToggleVsyncHotkey": "VSync'i Etkinleştir:",
+  "SettingsTabHotkeysToggleVsyncHotkey": "VSync'i Etkinleştir/Devre Dışı Bırak:",
   "SettingsTabHotkeysScreenshotHotkey": "Ekran Görüntüsü Al:",
   "SettingsTabHotkeysShowUiHotkey": "Arayüzü Göster:",
-  "SettingsTabHotkeysPauseHotkey": "Duraklat:",
+  "SettingsTabHotkeysPauseHotkey": "Durdur:",
   "SettingsTabHotkeysToggleMuteHotkey": "Sustur:",
   "ControllerMotionTitle": "Hareket Kontrol Seçenekleri",
   "ControllerRumbleTitle": "Titreşim Seçenekleri",
-  "SettingsSelectThemeFileDialogTitle" : "Tema Dosyası Seçin",
-  "SettingsXamlThemeFile" : "Xaml Tema Dosyası",
-  "SettingsTabHotkeysResScaleUpHotkey": "Çözünürlüğü artırın:",
-  "SettingsTabHotkeysResScaleDownHotkey": "Çözünürlüğü azaltın:"
+  "SettingsSelectThemeFileDialogTitle": "Tema Dosyası Seç",
+  "SettingsXamlThemeFile": "Xaml Tema Dosyası",
+  "AvatarWindowTitle": "Hesapları Yönet - Avatar",
+  "Amiibo": "Amiibo",
+  "Unknown": "Bilinmeyen",
+  "Usage": "Kullanım",
+  "Writable": "Yazılabilir",
+  "SelectDlcDialogTitle": "DLC dosyalarını seç",
+  "SelectUpdateDialogTitle": "Güncelleme dosyalarını seç",
+  "UserProfileWindowTitle": "Kullanıcı Profillerini Yönet",
+  "CheatWindowTitle": "Oyun Hilelerini Yönet",
+  "DlcWindowTitle": "Oyun DLC'lerini Yönet",
+  "UpdateWindowTitle": "Oyun Güncellemelerini Yönet",
+  "CheatWindowHeading": "{0} için Hile mevcut [{1}]",
+  "DlcWindowHeading": "{0} için DLC mevcut [{1}]",
+  "UserProfilesEditProfile": "Seçiliyi Düzenle",
+  "Cancel": "İptal",
+  "Save": "Kaydet",
+  "Discard": "Iskarta",
+  "UserProfilesSetProfileImage": "Profil Resmi Ayarla",
+  "UserProfileEmptyNameError": "İsim gerekli",
+  "UserProfileNoImageError":  "Profil resmi ayarlanmalıdır",
+  "GameUpdateWindowHeading": "{0} için güncellemeler mevcut [{1}]",
+  "SettingsTabHotkeysResScaleUpHotkey": "Çözünürlüğü artır:",
+  "SettingsTabHotkeysResScaleDownHotkey": "Çözünürlüğü azalt:"
 }

Ryujinx.Ava/Assets/Locales/zh_CN.json

@@ -34,8 +34,8 @@
   "GameListHeaderApplication": "名称",
   "GameListHeaderDeveloper": "制作商",
   "GameListHeaderVersion": "版本",
-  "GameListHeaderTimePlayed": "游玩时间",
-  "GameListHeaderLastPlayed": "上次游玩",
+  "GameListHeaderTimePlayed": "游玩时长",
+  "GameListHeaderLastPlayed": "最近游玩",
   "GameListHeaderFileExtension": "扩展名",
   "GameListHeaderFileSize": "大小",
   "GameListHeaderPath": "路径",
@@ -109,9 +109,9 @@
   "SettingsTabSystemSystemLanguageTraditionalChinese": "繁体中文(推荐)",
   "SettingsTabSystemSystemTimeZone": "系统时区:",
   "SettingsTabSystemSystemTime": "系统时钟:",
-  "SettingsTabSystemEnableVsync": "开启 VSync",
+  "SettingsTabSystemEnableVsync": "启用 VSync",
   "SettingsTabSystemEnablePptc": "开启 PPTC 缓存",
-  "SettingsTabSystemEnableFsIntegrityChecks": "开启文件系统完整性检查",
+  "SettingsTabSystemEnableFsIntegrityChecks": "文件系统完整性检查",
   "SettingsTabSystemAudioBackend": "音频后端:",
   "SettingsTabSystemAudioBackendDummy": "无",
   "SettingsTabSystemAudioBackendOpenAL": "OpenAL",
@@ -121,8 +121,8 @@
   "SettingsTabSystemHacksNote": " (会引起模拟器不稳定)",
   "SettingsTabSystemExpandDramSize": "将模拟RAM大小扩展到 6GB",
   "SettingsTabSystemIgnoreMissingServices": "忽略缺少的服务",
-  "SettingsTabGraphics": "图像",
-  "SettingsTabGraphicsAPI": "的图形 API",
+  "SettingsTabGraphics": "图形",
+  "SettingsTabGraphicsAPI": "图形 API",
   "SettingsTabGraphicsEnableShaderCache": "启用着色器缓存",
   "SettingsTabGraphicsAnisotropicFiltering": "各向异性过滤:",
   "SettingsTabGraphicsAnisotropicFilteringAuto": "自动",
@@ -206,22 +206,22 @@
   "ControllerSettingsDPadLeft": "左",
   "ControllerSettingsDPadRight": "右",
   "ControllerSettingsLStick": "左摇杆",
-  "ControllerSettingsLStickButton": "按下",
+  "ControllerSettingsLStickButton": "按下摇杆",
   "ControllerSettingsLStickUp": "上",
   "ControllerSettingsLStickDown": "下",
   "ControllerSettingsLStickLeft": "左",
   "ControllerSettingsLStickRight": "右",
-  "ControllerSettingsLStickStick": "杆",
+  "ControllerSettingsLStickStick": "摇杆",
   "ControllerSettingsLStickInvertXAxis": "反转 X 方向",
   "ControllerSettingsLStickInvertYAxis": "反转 Y 方向",
   "ControllerSettingsLStickDeadzone": "死区:",
   "ControllerSettingsRStick": "右摇杆",
-  "ControllerSettingsRStickButton": "按下",
+  "ControllerSettingsRStickButton": "按下摇杆",
   "ControllerSettingsRStickUp": "上",
   "ControllerSettingsRStickDown": "下",
   "ControllerSettingsRStickLeft": "左",
   "ControllerSettingsRStickRight": "右",
-  "ControllerSettingsRStickStick": "杆",
+  "ControllerSettingsRStickStick": "摇杆",
   "ControllerSettingsRStickInvertXAxis": "反转 X 方向",
   "ControllerSettingsRStickInvertYAxis": "反转 Y 方向",
   "ControllerSettingsRStickDeadzone": "死区:",
@@ -238,15 +238,15 @@
   "ControllerSettingsLeftSR": "SR",
   "ControllerSettingsRightSL": "SL",
   "ControllerSettingsRightSR": "SR",
-  "ControllerSettingsExtraButtonsLeft": "左按键",
-  "ControllerSettingsExtraButtonsRight": "右按键",
+  "ControllerSettingsExtraButtonsLeft": "左背键",
+  "ControllerSettingsExtraButtonsRight": "右背键",
   "ControllerSettingsMisc": "其他",
   "ControllerSettingsTriggerThreshold": "扳机阈值:",
   "ControllerSettingsMotion": "体感",
   "ControllerSettingsMotionUseCemuhookCompatibleMotion": "使用 CemuHook 体感协议",
   "ControllerSettingsMotionControllerSlot": "手柄:",
   "ControllerSettingsMotionMirrorInput": "镜像操作",
-  "ControllerSettingsMotionRightJoyConSlot": "右 JoyCon:",
+  "ControllerSettingsMotionRightJoyConSlot": "右JoyCon:",
   "ControllerSettingsMotionServerHost": "服务器 Host:",
   "ControllerSettingsMotionGyroSensitivity": "陀螺仪敏感度:",
   "ControllerSettingsMotionGyroDeadzone": "陀螺仪死区:",
@@ -255,9 +255,9 @@
   "UserProfilesSelectedUserProfile": "选择的用户账户:",
   "UserProfilesSaveProfileName": "保存名称",
   "UserProfilesChangeProfileImage": "更换头像",
-  "UserProfilesAvailableUserProfiles": "现有的账户:",
+  "UserProfilesAvailableUserProfiles": "现有账户:",
   "UserProfilesAddNewProfile": "新建账户",
-  "UserProfilesDeleteSelectedProfile": "删除选择的账户",
+  "UserProfilesDeleteSelectedProfile": "删除选中账户",
   "UserProfilesClose": "关闭",
   "ProfileImageSelectionTitle": "头像选择",
   "ProfileImageSelectionHeader": "选择合适的头像图片",
@@ -280,7 +280,7 @@
   "MenuBarFileToolsTakeScreenshot": "保存截图",
   "MenuBarFileToolsHideUi": "隐藏UI",
   "GameListContextMenuToggleFavorite": "收藏",
-  "GameListContextMenuToggleFavoriteToolTip": "启用或取消收藏标记",
+  "GameListContextMenuToggleFavoriteToolTip": "标记喜爱的游戏",
   "SettingsTabGeneralTheme": "主题",
   "SettingsTabGeneralThemeCustomTheme": "自选主题路径",
   "SettingsTabGeneralThemeBaseStyle": "主题色调",
@@ -290,8 +290,8 @@
   "ButtonBrowse": "浏览",
   "ControllerSettingsConfigureGeneral": "配置",
   "ControllerSettingsRumble": "震动",
-  "ControllerSettingsRumbleStrongMultiplier": "强震动调节",
-  "ControllerSettingsRumbleWeakMultiplier": "弱震动调节",
+  "ControllerSettingsRumbleStrongMultiplier": "强震动幅度",
+  "ControllerSettingsRumbleWeakMultiplier": "弱震动幅度",
   "DialogMessageSaveNotAvailableMessage": "没有{0} [{1:x16}]的游戏存档",
   "DialogMessageSaveNotAvailableCreateSaveMessage": "是否创建该游戏的存档文件夹?",
   "DialogConfirmationTitle": "Ryujinx - 设置",
@@ -299,7 +299,7 @@
   "DialogErrorTitle": "Ryujinx - 错误",
   "DialogWarningTitle": "Ryujinx - 警告",
   "DialogExitTitle": "Ryujinx - 关闭",
-  "DialogErrorMessage": "Ryujinx 遇到了错误",
+  "DialogErrorMessage": "Ryujinx 发生错误",
   "DialogExitMessage": "是否关闭 Ryujinx？",
   "DialogExitSubMessage": "未保存的进度会丢失",
   "DialogMessageCreateSaveErrorMessage": "创建特定的存档时出错: {0}",
@@ -313,7 +313,7 @@
   "DialogUpdaterConvertFailedMessage": "无法转换当前 Ryujinx 版本。",
   "DialogUpdaterCancelUpdateMessage": "更新取消！",
   "DialogUpdaterAlreadyOnLatestVersionMessage": "您使用的 Ryujinx 是最新版本。",
-  "DialogUpdaterFailedToGetVersionMessage": "尝试从 Github 获取版本信息时无效。\\n可能由于 GitHub Actions 正在编译新版本。请过几分钟重试。",
+  "DialogUpdaterFailedToGetVersionMessage": "尝试从 Github 获取版本信息时无效。\n可能由于 GitHub Actions 正在编译新版本。请过几分钟重试。",
   "DialogUpdaterConvertFailedGithubMessage": "无法转换从 Github 接收到的 Ryujinx 版本。",
   "DialogUpdaterDownloadingMessage": "下载新版本中...",
   "DialogUpdaterExtractionMessage": "正在提取更新...",
@@ -331,7 +331,7 @@
   "DialogThemeRestartMessage": "主题设置已保存。需要重新启动才能生效。",
   "DialogThemeRestartSubMessage": "您是否要重启？",
   "DialogFirmwareInstallEmbeddedMessage": "要安装游戏内置的固件吗？(固件 {0})",
-  "DialogFirmwareInstallEmbeddedSuccessMessage": "未找到已安装的固件，但 Ryujinx 可以从现有的游戏安装固件{0}.\\n模拟器现在可以运行。",
+  "DialogFirmwareInstallEmbeddedSuccessMessage": "未找到已安装的固件，但 Ryujinx 可以从现有的游戏安装固件{0}.\n模拟器现在可以运行。",
   "DialogFirmwareNoFirmwareInstalledMessage": "未安装固件",
   "DialogFirmwareInstalledMessage": "已安装固件{0}",
   "DialogOpenSettingsWindowLabel": "打开设置窗口",
@@ -344,11 +344,11 @@
   "DialogUserErrorDialogTitle": "Ryujinx 错误 ({0})",
   "DialogAmiiboApiTitle": "Amiibo API",
   "DialogAmiiboApiFailFetchMessage": "从 API 获取信息时出错。",
-  "DialogAmiiboApiConnectErrorMessage": "无法连接到 Amiibo API 服务器。服务器可能已关闭，或者您没有网络连接。",
+  "DialogAmiiboApiConnectErrorMessage": "无法连接到 Amiibo API 服务器。服务器可能已关闭，或者您没有连接网络。",
   "DialogProfileInvalidProfileErrorMessage": "预设{0} 与当前输入配置系统不兼容。",
-  "DialogProfileDefaultProfileOverwriteErrorMessage": "默认预设无法被覆盖",
+  "DialogProfileDefaultProfileOverwriteErrorMessage": "默认预设不能被覆盖",
   "DialogProfileDeleteProfileTitle": "删除预设",
-  "DialogProfileDeleteProfileMessage": "删除后不可恢复，确定吗？",
+  "DialogProfileDeleteProfileMessage": "删除后不可恢复，确认删除吗？",
   "DialogWarning": "警告",
   "DialogPPTCDeletionMessage": "您即将删除:\n\n{0}的 PPTC 缓存\n\n确定吗？",
   "DialogPPTCDeletionErrorMessage": "清除位于{0}的 PPTC 缓存时出错: {1}",
@@ -357,10 +357,10 @@
   "DialogRyujinxErrorMessage": "Ryujinx 遇到错误",
   "DialogInvalidTitleIdErrorMessage": "UI 错误:所选游戏没有有效的标题ID",
   "DialogFirmwareInstallerFirmwareNotFoundErrorMessage": "路径{0}找不到有效的系统固件。",
-  "DialogFirmwareInstallerFirmwareInstallTitle": "安装固件{0}",
-  "DialogFirmwareInstallerFirmwareInstallMessage": "将安装{0}版本的系统。",
-  "DialogFirmwareInstallerFirmwareInstallSubMessage": "\n\n这将替换当前系统版本{0}。",
-  "DialogFirmwareInstallerFirmwareInstallConfirmMessage": "\n\n确认进行?",
+  "DialogFirmwareInstallerFirmwareInstallTitle": "固件{0}",
+  "DialogFirmwareInstallerFirmwareInstallMessage": "即将安装系统版本{0}。",
+  "DialogFirmwareInstallerFirmwareInstallSubMessage": "\n\n会替换当前系统版本{0}。",
+  "DialogFirmwareInstallerFirmwareInstallConfirmMessage": "\n\n是否确认继续？",
   "DialogFirmwareInstallerFirmwareInstallWaitMessage": "安装固件中...",
   "DialogFirmwareInstallerFirmwareInstallSuccessMessage": "成功安装系统版本{0}。",
   "DialogUserProfileDeletionWarningMessage": "删除后将没有可选择的用户账户",
@@ -377,7 +377,7 @@
   "DialogLoadAppGameAlreadyLoadedSubMessage": "请停止模拟或关闭程序，再启动另一个游戏。",
   "DialogUpdateAddUpdateErrorMessage": "选择的文件不包含所选游戏的更新！",
   "DialogSettingsBackendThreadingWarningTitle": "警告 - 后端多线程",
-  "DialogSettingsBackendThreadingWarningMessage": "改变此选项后必须重启 Ryujinx 才能生效。\\n根据您的硬件，您开启该选项时，可能需要手动禁用驱动程序本身的GL多线程。",
+  "DialogSettingsBackendThreadingWarningMessage": "改变此选项后必须重启 Ryujinx 才能生效。\n\n取决于您的硬件，可能需要手动禁用驱动面板中的线程优化。",
   "SettingsTabGraphicsFeaturesOptions": "功能",
   "SettingsTabGraphicsBackendMultithreading": "后端多线程:",
   "CommonAuto": "自动(推荐)",
@@ -403,8 +403,8 @@
   "AmiiboSeriesLabel": "Amiibo 系列",
   "AmiiboCharacterLabel": "角色",
   "AmiiboScanButtonLabel": "扫描",
-  "AmiiboOptionsShowAllLabel": "显示所有 Amiibo",
-  "AmiiboOptionsUsRandomTagLabel": "修正：使用随机标记的 Uuid",
+  "AmiiboOptionsShowAllLabel": "显示所有 Amiibo 系列",
+  "AmiiboOptionsUsRandomTagLabel": "修复：使用随机标记的 UUID",
   "DlcManagerTableHeadingEnabledLabel": "启用",
   "DlcManagerTableHeadingTitleIdLabel": "游戏ID",
   "DlcManagerTableHeadingContainerPathLabel": "文件夹路径",
@@ -416,38 +416,38 @@
   "CommonFavorite": "收藏",
   "OrderAscending": "从小到大",
   "OrderDescending": "从大到小",
-  "SettingsTabGraphicsFeatures": "额外功能和增强",
+  "SettingsTabGraphicsFeatures": "功能与增强",
   "ErrorWindowTitle": "错误窗口",
-  "ToggleDiscordTooltip": "启用或关闭 Discord 详细在线状态展示",
+  "ToggleDiscordTooltip": "控制是否在 Discord 中显示您的游玩状态",
   "AddGameDirBoxTooltip": "输入要添加的游戏目录",
   "AddGameDirTooltip": "添加游戏目录到列表中",
   "RemoveGameDirTooltip": "移除选中的目录",
-  "CustomThemeCheckTooltip": "启用或关闭自定义主题",
+  "CustomThemeCheckTooltip": "使用自定义UI主题来更改模拟器的外观样式",
   "CustomThemePathTooltip": "自定义主题的目录",
   "CustomThemeBrowseTooltip": "查找自定义主题",
-  "DockModeToggleTooltip": "是否开启 Switch 的主机模式",
-  "DirectKeyboardTooltip": "是否开启\"直连键盘访问(HID)支持\"\n(部分游戏可以使用您的键盘输入文字)",
-  "DirectMouseTooltip": "是否开启\"直连鼠标访问(HID)支持\"\n(部分游戏可以使用您的鼠标导航)",
+  "DockModeToggleTooltip": "启用 Switch 的主机模式。\n绝大多数游戏画质会提高，略微增加性能消耗。\n在掌机和主机模式切换的过程中，您可能需要重新设置手柄类型",
+  "DirectKeyboardTooltip": "开启 \"直连键盘访问(HID)支持\"\n（部分游戏可以使用您的键盘输入文字）",
+  "DirectMouseTooltip": "开启 \"直连鼠标访问(HID)支持\"\n（部分游戏可以使用您的鼠标导航）",
   "RegionTooltip": "更改系统区域",
   "LanguageTooltip": "更改系统语言",
   "TimezoneTooltip": "更改系统时区",
   "TimeTooltip": "更改系统时钟",
-  "VSyncToggleTooltip": "关闭后，部分使用动态帧率的游戏可以超过60Hz的刷新率",
-  "PptcToggleTooltip": "开启以后减少游戏启动时间和卡顿",
-  "FsIntegrityToggleTooltip": "是否检查游戏文件内容的完整性",
+  "VSyncToggleTooltip": "关闭后，小部分游戏可以超过60FPS帧率，以获得高帧率体验。\n但是可能出现软锁或读盘时间增加。\n如不确定或没有需求，请保持选项开启",
+  "PptcToggleTooltip": "缓存编译完成的游戏CPU指令。减少启动时间和卡顿，提高游戏响应速度",
+  "FsIntegrityToggleTooltip": "检查游戏文件内容的完整性。\n遇到损坏的文件则记录到日志文件，有助于排查错误。\n对性能没有影响。",
   "AudioBackendTooltip": "默认推荐SDL，但每种音频后端对各类游戏兼容性不同，遇到音频问题可以尝试切换后端",
   "MemoryManagerTooltip": "改变 Switch 内存映射到电脑内存的方式，会影响CPU性能消耗",
   "MemoryManagerSoftwareTooltip": "使用软件内存页管理，最精确但是速度最慢",
   "MemoryManagerHostTooltip": "直接映射内存页到电脑内存，JIT效率高",
-  "MemoryManagerUnsafeTooltip": "直接映射内存页，但不检查内存溢出，JIT效率最高。\nRyujinx可以访问任何位置的内存，因而相对不安全。此模式下只应运行您信任的游戏或软件(即官方游戏)",
+  "MemoryManagerUnsafeTooltip": "直接映射内存页，但不检查内存溢出，JIT效率最高。\nRyujinx可以访问任何位置的内存，因而相对不安全。\n此模式下只应运行您信任的游戏或软件(即官方游戏)",
   "DRamTooltip": "扩展模拟的 Switch 内存为6GB。\n某些高清纹理MOD或4K MOD需要此选项",
-  "IgnoreMissingServicesTooltip": "忽略某些未实现的系统服务，少部分游戏需要此选项才能启动",
+  "IgnoreMissingServicesTooltip": "开启后，游戏会忽略未实现的系统服务，从而继续运行。\n少部分新发布的游戏由于使用新的未知系统服务，可能需要此选项来避免闪退。\n模拟器更新完善系统服务之后，则无需开启选项。\n如您的游戏已经正常运行，请保持此选项关闭",
   "GraphicsBackendThreadingTooltip": "启用后端多线程",
-  "GalThreadingTooltip": "使用模拟器自带的多线程调度，减少着色器编译的卡顿，并提高驱动程序的性能(尤其是缺失多线程的AMD)。\nNVIDIA用户需要重启模拟器才能禁用驱动本身的多线程，否则您需手动执行禁用获得最佳性能",
-  "ShaderCacheToggleTooltip": "开启后缓存着色器到本地，减少游戏卡顿",
+  "GalThreadingTooltip": "使用模拟器内置的多线程优化，减少着色器编译的卡顿，并提高驱动程序的性能(尤其是缺失多线程的AMD)。\nNVIDIA显卡需要重启模拟器才能禁用驱动本身的线程优化，您也可以手动在控制面板将其禁用",
+  "ShaderCacheToggleTooltip": "开启后，模拟器会保存编译完成的着色器到磁盘，减少游戏渲染新特效和场景时的卡顿",
   "ResolutionScaleTooltip": "缩放渲染的分辨率",
-  "ResolutionScaleEntryTooltip": "尽量使用例如1.5的浮点倍数。非整数的倍率易引起 BUG",
-  "AnisotropyTooltip": "各向异性过滤等级。提高倾斜视角纹理的清晰度\n('自动'使用游戏默认指定的等级)",
+  "ResolutionScaleEntryTooltip": "尽可能使用例如1.5的浮点倍数。非整数的倍率易引起 BUG",
+  "AnisotropyTooltip": "各向异性过滤等级。提高倾斜视角纹理的清晰度\n('自动'使用游戏默认的等级)",
   "AspectRatioTooltip": "渲染窗口的宽高比",
   "ShaderDumpPathTooltip": "转储图形着色器的路径",
   "FileLogTooltip": "是否保存日志文件到硬盘",
@@ -478,8 +478,8 @@
   "AboutRyujinxContributorsButtonHeader": "查看所有参与者",
   "SettingsTabSystemAudioVolume": "音量: ",
   "AudioVolumeTooltip": "调节音量",
-  "SettingsTabSystemEnableInternetAccess": "启用网络连接",
-  "EnableInternetAccessTooltip": "开启互联网访问。此选项打开后，效果类似于 Switch 连接到互联网的状态。\n注意即使此选项关闭，应用程序偶尔也有可能连接到网络",
+  "SettingsTabSystemEnableInternetAccess": "允许网络访问/局域网模式",
+  "EnableInternetAccessTooltip": "允许模拟的游戏进程访问互联网。\n当多个模拟器/真实Switch连接到同一个局域网时，带有 LAN 模式的游戏可以相互通信。\n即使开启选项也无法访问 Nintendo 服务器。此外可能导致某些尝试联网的游戏崩溃。\n如果您不确定，请关闭该选项。",
   "GameListContextMenuManageCheatToolTip": "管理金手指",
   "GameListContextMenuManageCheat": "管理金手指",
   "ControllerSettingsStickRange": "范围",
@@ -494,7 +494,7 @@
   "DialogUpdaterFlatpakNotSupportedMessage": "请通过 FlatHub 更新 Ryujinx。",
   "UpdaterDisabledWarningTitle": "更新已禁用!",
   "GameListContextMenuOpenSdModsDirectory": "打开 Atmosphere MOD 目录",
-  "GameListContextMenuOpenSdModsDirectoryToolTip": "打开包含应用程序 MOD 的额外 Atmosphere SD 卡目录",
+  "GameListContextMenuOpenSdModsDirectoryToolTip": "打开适用于 Atmosphere 自制系统的 MOD 目录",
   "ControllerSettingsRotate90": "顺时针旋转 90°",
   "IconSize": "图标尺寸",
   "IconSizeTooltip": "更改游戏图标大小",
@@ -508,7 +508,7 @@
   "UserErrorUndefined": "未定义错误",
   "UserErrorNoKeysDescription": "Ryujinx 找不到 'prod.keys' 文件",
   "UserErrorNoFirmwareDescription": "Ryujinx 找不到任何已安装的固件",
-  "UserErrorFirmwareParsingFailedDescription": "Ryujinx 无法解密选择的固件。这通常是由于密钥过旧。",
+  "UserErrorFirmwareParsingFailedDescription": "Ryujinx 无法解密选择的固件。这通常是由于过旧的密钥。",
   "UserErrorApplicationNotFoundDescription": "Ryujinx 在选中路径找不到有效的应用程序。",
   "UserErrorUnknownDescription": "发生未知错误！",
   "UserErrorUndefinedDescription": "发生了未定义错误！此类错误不应出现，请联系开发人员！",
@@ -518,7 +518,7 @@
   "RyujinxInfo": "Ryujinx - 信息",
   "RyujinxConfirm": "Ryujinx - 确认",
   "FileDialogAllTypes": "全部类型",
-  "Never": "从不",
+  "Never": "从未",
   "SwkbdMinCharacters": "至少应为 {0} 个字长",
   "SwkbdMinRangeCharacters": "必须为 {0}-{1} 个字长",
   "SoftwareKeyboard": "软件键盘",
@@ -542,7 +542,7 @@
   "AllKeyboards": "所有键盘",
   "OpenFileDialogTitle": "选择支持的文件格式",
   "OpenFolderDialogTitle": "选择一个包含解包游戏的文件夹",
-  "AllSupportedFormats": "全部支持的格式",
+  "AllSupportedFormats": "所有支持的格式",
   "RyujinxUpdater": "Ryujinx 更新程序",
   "SettingsTabHotkeys": "快捷键",
   "SettingsTabHotkeysHotkeys": "键盘快捷键",
@@ -558,7 +558,7 @@
   "AvatarWindowTitle": "管理账户 - 头像",
   "Amiibo": "Amiibo",
   "Unknown": "未知",
-  "Usage": "使用",
+  "Usage": "扫描可获得",
   "Writable": "可写入",
   "SelectDlcDialogTitle": "选择 DLC 文件",
   "SelectUpdateDialogTitle": "选择更新文件",
@@ -568,7 +568,25 @@
   "UpdateWindowTitle": "管理游戏更新",
   "CheatWindowHeading": "适用于 {0} [{1}] 的金手指",
   "DlcWindowHeading": "适用于 {0} [{1}] 的 DLC",
+  "UserProfilesEditProfile": "编辑选中账户",
+  "Cancel": "取消",
+  "Save": "保存",
+  "Discard": "返回",
+  "UserProfilesSetProfileImage": "选择头像",
+  "UserProfileEmptyNameError": "必须输入名称",
+  "UserProfileNoImageError":  "请选择您的头像",
   "GameUpdateWindowHeading": "适用于 {0} [{1}] 的更新",
-  "SettingsTabHotkeysResScaleUpHotkey": "分辨率提高",
-  "SettingsTabHotkeysResScaleDownHotkey": "降低分辨率"
+  "SettingsTabHotkeysResScaleUpHotkey": "提高分辨率:",
+  "SettingsTabHotkeysResScaleDownHotkey": "降低分辨率:",
+  "UserProfilesName": "名称:",
+  "UserProfilesUserId" : "用户 ID:",
+  "SettingsTabGraphicsBackend": "图形后端",
+  "SettingsTabGraphicsBackendTooltip": "显卡使用的图形后端",
+  "SettingsEnableTextureRecompression": "启用纹理重压缩",
+  "SettingsEnableTextureRecompressionTooltip": "压缩某些纹理以减少显存的使用。\n适合显存小于 4GB 的 GPU开启。\n如果您不确定，请保持此项为关闭。",
+  "SettingsTabGraphicsPreferredGpu": "首选 GPU",
+  "SettingsTabGraphicsPreferredGpuTooltip": "选择Vulkan API使用的显卡。\n此选项不会影响OpenGL API。\n如果您不确定，建议选择\"dGPU(独立显卡)\"。如果没有独立显卡，则无需改动此选项",
+  "SettingsAppRequiredRestartMessage": "Ryujinx 需要重启",
+  "SettingsGpuBackendRestartMessage": "您修改了图形 API 或显卡设置。需要重新启动才能生效",
+  "SettingsGpuBackendRestartSubMessage": "是否重启模拟器？"
 }

Ryujinx.Common/Collections/IntervalTree.cs

@@ -9,19 +9,10 @@ namespace Ryujinx.Common.Collections
     /// </summary>
     /// <typeparam name="K">Key</typeparam>
     /// <typeparam name="V">Value</typeparam>
-    public class IntervalTree<K, V> where K : IComparable<K>
+    public class IntervalTree<K, V> : IntrusiveRedBlackTreeImpl<IntervalTreeNode<K, V>> where K : IComparable<K>
     {
         private const int ArrayGrowthSize = 32;
 
-        private const bool Black = true;
-        private const bool Red = false;
-        private IntervalTreeNode<K, V> _root = null;
-        private int _count = 0;
-
-        public int Count => _count;
-
-        public IntervalTree() { }
-
         #region Public Methods
 
         /// <summary>
@@ -80,7 +71,7 @@ namespace Ryujinx.Common.Collections
                 throw new ArgumentNullException(nameof(end));
             }
 
-            GetValues(_root, start, end, ref overlaps, ref overlapCount);
+            GetValues(Root, start, end, ref overlaps, ref overlapCount);
 
             return overlapCount;
         }
@@ -128,7 +119,7 @@ namespace Ryujinx.Common.Collections
 
             int removed = Delete(key, value);
 
-            _count -= removed;
+            Count -= removed;
 
             return removed;
         }
@@ -141,7 +132,7 @@ namespace Ryujinx.Common.Collections
         {
             List<RangeNode<K, V>> list = new List<RangeNode<K, V>>();
 
-            AddToList(_root, list);
+            AddToList(Root, list);
 
             return list;
         }
@@ -182,7 +173,7 @@ namespace Ryujinx.Common.Collections
                 throw new ArgumentNullException(nameof(key));
             }
 
-            IntervalTreeNode<K, V> node = _root;
+            IntervalTreeNode<K, V> node = Root;
             while (node != null)
             {
                 int cmp = key.CompareTo(node.Start);
@@ -317,7 +308,7 @@ namespace Ryujinx.Common.Collections
         private IntervalTreeNode<K, V> BSTInsert(K start, K end, V value)
         {
             IntervalTreeNode<K, V> parent = null;
-            IntervalTreeNode<K, V> node = _root;
+            IntervalTreeNode<K, V> node = Root;
 
             while (node != null)
             {
@@ -345,14 +336,14 @@ namespace Ryujinx.Common.Collections
                         }
                     }
 
-                    _count++;
+                    Count++;
                     return node;
                 }
             }
             IntervalTreeNode<K, V> newNode = new IntervalTreeNode<K, V>(start, end, value, parent);
             if (newNode.Parent == null)
             {
-                _root = newNode;
+                Root = newNode;
             }
             else if (start.CompareTo(parent.Start) < 0)
             {
@@ -364,7 +355,7 @@ namespace Ryujinx.Common.Collections
             }
 
             PropagateIncrease(newNode);
-            _count++;
+            Count++;
             return newNode;
         }
 
@@ -418,7 +409,7 @@ namespace Ryujinx.Common.Collections
 
             if (ParentOf(replacementNode) == null)
             {
-                _root = tmp;
+                Root = tmp;
             }
             else if (replacementNode == LeftOf(ParentOf(replacementNode)))
             {
@@ -447,295 +438,27 @@ namespace Ryujinx.Common.Collections
             return removed;
         }
 
-        /// <summary>
-        /// Returns the node with the largest key where <paramref name="node"/> is considered the root node.
-        /// </summary>
-        /// <param name="node">Root Node</param>
-        /// <returns>Node with the maximum key in the tree of <paramref name="node"/></returns>
-        private static IntervalTreeNode<K, V> Maximum(IntervalTreeNode<K, V> node)
-        {
-            IntervalTreeNode<K, V> tmp = node;
-            while (tmp.Right != null)
-            {
-                tmp = tmp.Right;
-            }
-
-            return tmp;
-        }
-
-        /// <summary>
-        /// Finds the node whose key is immediately less than <paramref name="node"/>.
-        /// </summary>
-        /// <param name="node">Node to find the predecessor of</param>
-        /// <returns>Predecessor of <paramref name="node"/></returns>
-        private static IntervalTreeNode<K, V> PredecessorOf(IntervalTreeNode<K, V> node)
-        {
-            if (node.Left != null)
-            {
-                return Maximum(node.Left);
-            }
-            IntervalTreeNode<K, V> parent = node.Parent;
-            while (parent != null && node == parent.Left)
-            {
-                node = parent;
-                parent = parent.Parent;
-            }
-            return parent;
-        }
         #endregion
 
-        #region Private Methods (RBL)
-        private void RestoreBalanceAfterRemoval(IntervalTreeNode<K, V> balanceNode)
-        {
-            IntervalTreeNode<K, V> ptr = balanceNode;
-
-            while (ptr != _root && ColorOf(ptr) == Black)
-            {
-                if (ptr == LeftOf(ParentOf(ptr)))
-                {
-                    IntervalTreeNode<K, V> sibling = RightOf(ParentOf(ptr));
-
-                    if (ColorOf(sibling) == Red)
-                    {
-                        SetColor(sibling, Black);
-                        SetColor(ParentOf(ptr), Red);
-                        RotateLeft(ParentOf(ptr));
-                        sibling = RightOf(ParentOf(ptr));
-                    }
-                    if (ColorOf(LeftOf(sibling)) == Black && ColorOf(RightOf(sibling)) == Black)
-                    {
-                        SetColor(sibling, Red);
-                        ptr = ParentOf(ptr);
-                    }
-                    else
-                    {
-                        if (ColorOf(RightOf(sibling)) == Black)
-                        {
-                            SetColor(LeftOf(sibling), Black);
-                            SetColor(sibling, Red);
-                            RotateRight(sibling);
-                            sibling = RightOf(ParentOf(ptr));
-                        }
-                        SetColor(sibling, ColorOf(ParentOf(ptr)));
-                        SetColor(ParentOf(ptr), Black);
-                        SetColor(RightOf(sibling), Black);
-                        RotateLeft(ParentOf(ptr));
-                        ptr = _root;
-                    }
-                }
-                else
-                {
-                    IntervalTreeNode<K, V> sibling = LeftOf(ParentOf(ptr));
-
-                    if (ColorOf(sibling) == Red)
-                    {
-                        SetColor(sibling, Black);
-                        SetColor(ParentOf(ptr), Red);
-                        RotateRight(ParentOf(ptr));
-                        sibling = LeftOf(ParentOf(ptr));
-                    }
-                    if (ColorOf(RightOf(sibling)) == Black && ColorOf(LeftOf(sibling)) == Black)
-                    {
-                        SetColor(sibling, Red);
-                        ptr = ParentOf(ptr);
-                    }
-                    else
-                    {
-                        if (ColorOf(LeftOf(sibling)) == Black)
-                        {
-                            SetColor(RightOf(sibling), Black);
-                            SetColor(sibling, Red);
-                            RotateLeft(sibling);
-                            sibling = LeftOf(ParentOf(ptr));
-                        }
-                        SetColor(sibling, ColorOf(ParentOf(ptr)));
-                        SetColor(ParentOf(ptr), Black);
-                        SetColor(LeftOf(sibling), Black);
-                        RotateRight(ParentOf(ptr));
-                        ptr = _root;
-                    }
-                }
-            }
-            SetColor(ptr, Black);
-        }
-
-        private void RestoreBalanceAfterInsertion(IntervalTreeNode<K, V> balanceNode)
-        {
-            SetColor(balanceNode, Red);
-            while (balanceNode != null && balanceNode != _root && ColorOf(ParentOf(balanceNode)) == Red)
-            {
-                if (ParentOf(balanceNode) == LeftOf(ParentOf(ParentOf(balanceNode))))
-                {
-                    IntervalTreeNode<K, V> sibling = RightOf(ParentOf(ParentOf(balanceNode)));
-
-                    if (ColorOf(sibling) == Red)
-                    {
-                        SetColor(ParentOf(balanceNode), Black);
-                        SetColor(sibling, Black);
-                        SetColor(ParentOf(ParentOf(balanceNode)), Red);
-                        balanceNode = ParentOf(ParentOf(balanceNode));
-                    }
-                    else
-                    {
-                        if (balanceNode == RightOf(ParentOf(balanceNode)))
-                        {
-                            balanceNode = ParentOf(balanceNode);
-                            RotateLeft(balanceNode);
-                        }
-                        SetColor(ParentOf(balanceNode), Black);
-                        SetColor(ParentOf(ParentOf(balanceNode)), Red);
-                        RotateRight(ParentOf(ParentOf(balanceNode)));
-                    }
-                }
-                else
-                {
-                    IntervalTreeNode<K, V> sibling = LeftOf(ParentOf(ParentOf(balanceNode)));
-
-                    if (ColorOf(sibling) == Red)
-                    {
-                        SetColor(ParentOf(balanceNode), Black);
-                        SetColor(sibling, Black);
-                        SetColor(ParentOf(ParentOf(balanceNode)), Red);
-                        balanceNode = ParentOf(ParentOf(balanceNode));
-                    }
-                    else
-                    {
-                        if (balanceNode == LeftOf(ParentOf(balanceNode)))
-                        {
-                            balanceNode = ParentOf(balanceNode);
-                            RotateRight(balanceNode);
-                        }
-                        SetColor(ParentOf(balanceNode), Black);
-                        SetColor(ParentOf(ParentOf(balanceNode)), Red);
-                        RotateLeft(ParentOf(ParentOf(balanceNode)));
-                    }
-                }
-            }
-            SetColor(_root, Black);
-        }
-
-        private void RotateLeft(IntervalTreeNode<K, V> node)
+        protected override void RotateLeft(IntervalTreeNode<K, V> node)
         {
             if (node != null)
             {
-                IntervalTreeNode<K, V> right = RightOf(node);
-                node.Right = LeftOf(right);
-                if (node.Right != null)
-                {
-                    node.Right.Parent = node;
-                }
-                IntervalTreeNode<K, V> nodeParent = ParentOf(node);
-                right.Parent = nodeParent;
-                if (nodeParent == null)
-                {
-                    _root = right;
-                }
-                else if (node == LeftOf(nodeParent))
-                {
-                    nodeParent.Left = right;
-                }
-                else
-                {
-                    nodeParent.Right = right;
-                }
-                right.Left = node;
-                node.Parent = right;
+                base.RotateLeft(node);
 
                 PropagateFull(node);
             }
         }
 
-        private void RotateRight(IntervalTreeNode<K, V> node)
+        protected override void RotateRight(IntervalTreeNode<K, V> node)
         {
             if (node != null)
             {
-                IntervalTreeNode<K, V> left = LeftOf(node);
-                node.Left = RightOf(left);
-                if (node.Left != null)
-                {
-                    node.Left.Parent = node;
-                }
-                IntervalTreeNode<K, V> nodeParent = ParentOf(node);
-                left.Parent = nodeParent;
-                if (nodeParent == null)
-                {
-                    _root = left;
-                }
-                else if (node == RightOf(nodeParent))
-                {
-                    nodeParent.Right = left;
-                }
-                else
-                {
-                    nodeParent.Left = left;
-                }
-                left.Right = node;
-                node.Parent = left;
+                base.RotateRight(node);
 
                 PropagateFull(node);
             }
         }
-        #endregion
-
-        #region Safety-Methods
-
-        // These methods save memory by allowing us to forego sentinel nil nodes, as well as serve as protection against NullReferenceExceptions.
-
-        /// <summary>
-        /// Returns the color of <paramref name="node"/>, or Black if it is null.
-        /// </summary>
-        /// <param name="node">Node</param>
-        /// <returns>The boolean color of <paramref name="node"/>, or black if null</returns>
-        private static bool ColorOf(IntervalTreeNode<K, V> node)
-        {
-            return node == null || node.Color;
-        }
-
-        /// <summary>
-        /// Sets the color of <paramref name="node"/> node to <paramref name="color"/>.
-        /// <br></br>
-        /// This method does nothing if <paramref name="node"/> is null.
-        /// </summary>
-        /// <param name="node">Node to set the color of</param>
-        /// <param name="color">Color (Boolean)</param>
-        private static void SetColor(IntervalTreeNode<K, V> node, bool color)
-        {
-            if (node != null)
-            {
-                node.Color = color;
-            }
-        }
-
-        /// <summary>
-        /// This method returns the left node of <paramref name="node"/>, or null if <paramref name="node"/> is null.
-        /// </summary>
-        /// <param name="node">Node to retrieve the left child from</param>
-        /// <returns>Left child of <paramref name="node"/></returns>
-        private static IntervalTreeNode<K, V> LeftOf(IntervalTreeNode<K, V> node)
-        {
-            return node?.Left;
-        }
-
-        /// <summary>
-        /// This method returns the right node of <paramref name="node"/>, or null if <paramref name="node"/> is null.
-        /// </summary>
-        /// <param name="node">Node to retrieve the right child from</param>
-        /// <returns>Right child of <paramref name="node"/></returns>
-        private static IntervalTreeNode<K, V> RightOf(IntervalTreeNode<K, V> node)
-        {
-            return node?.Right;
-        }
-
-        /// <summary>
-        /// Returns the parent node of <paramref name="node"/>, or null if <paramref name="node"/> is null.
-        /// </summary>
-        /// <param name="node">Node to retrieve the parent from</param>
-        /// <returns>Parent of <paramref name="node"/></returns>
-        private static IntervalTreeNode<K, V> ParentOf(IntervalTreeNode<K, V> node)
-        {
-            return node?.Parent;
-        }
-        #endregion
 
         public bool ContainsKey(K key)
         {
@@ -745,12 +468,6 @@ namespace Ryujinx.Common.Collections
             }
             return GetNode(key) != null;
         }
-
-        public void Clear()
-        {
-            _root = null;
-            _count = 0;
-        }
     }
 
     /// <summary>
@@ -777,31 +494,29 @@ namespace Ryujinx.Common.Collections
     /// </summary>
     /// <typeparam name="K">Key type of the node</typeparam>
     /// <typeparam name="V">Value type of the node</typeparam>
-    class IntervalTreeNode<K, V>
+    public class IntervalTreeNode<K, V> : IntrusiveRedBlackTreeNode<IntervalTreeNode<K, V>>
     {
-        public bool Color = true;
-        public IntervalTreeNode<K, V> Left = null;
-        public IntervalTreeNode<K, V> Right = null;
-        public IntervalTreeNode<K, V> Parent = null;
-
         /// <summary>
         /// The start of the range.
         /// </summary>
-        public K Start;
+        internal K Start;
 
         /// <summary>
         /// The end of the range - maximum of all in the Values list.
         /// </summary>
-        public K End;
+        internal K End;
 
         /// <summary>
         /// The maximum end value of this node and all its children.
         /// </summary>
-        public K Max;
+        internal K Max;
 
-        public List<RangeNode<K, V>> Values;
+        /// <summary>
+        /// Values contained on the node that shares a common Start value.
+        /// </summary>
+        internal List<RangeNode<K, V>> Values;
 
-        public IntervalTreeNode(K start, K end, V value, IntervalTreeNode<K, V> parent)
+        internal IntervalTreeNode(K start, K end, V value, IntervalTreeNode<K, V> parent)
         {
             Start = start;
             End = end;

Ryujinx.Common/Collections/IntrusiveRedBlackTree.cs

@@ -0,0 +1,293 @@
+using System;
+
+namespace Ryujinx.Common.Collections
+{
+    /// <summary>
+    /// Tree that provides the ability for O(logN) lookups for keys that exist in the tree, and O(logN) lookups for keys immediately greater than or less than a specified key.
+    /// </summary>
+    /// <typeparam name="T">Derived node type</typeparam>
+    public class IntrusiveRedBlackTree<T> : IntrusiveRedBlackTreeImpl<T> where T : IntrusiveRedBlackTreeNode<T>, IComparable<T>
+    {
+        #region Public Methods
+
+        /// <summary>
+        /// Adds a new node into the tree.
+        /// </summary>
+        /// <param name="node">Node to be added</param>
+        /// <exception cref="ArgumentNullException"><paramref name="node"/> is null</exception>
+        public void Add(T node)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+
+            Insert(node);
+        }
+
+        /// <summary>
+        /// Removes a node from the tree.
+        /// </summary>
+        /// <param name="node">Note to be removed</param>
+        /// <exception cref="ArgumentNullException"><paramref name="node"/> is null</exception>
+        public void Remove(T node)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+            if (Delete(node) != null)
+            {
+                Count--;
+            }
+        }
+
+        /// <summary>
+        /// Retrieve the node that is considered equal to the specified node by the comparator.
+        /// </summary>
+        /// <param name="searchNode">Node to compare with</param>
+        /// <returns>Node that is equal to <paramref name="searchNode"/></returns>
+        /// <exception cref="ArgumentNullException"><paramref name="searchNode"/> is null</exception>
+        public T GetNode(T searchNode)
+        {
+            if (searchNode == null)
+            {
+                throw new ArgumentNullException(nameof(searchNode));
+            }
+
+            T node = Root;
+            while (node != null)
+            {
+                int cmp = searchNode.CompareTo(node);
+                if (cmp < 0)
+                {
+                    node = node.Left;
+                }
+                else if (cmp > 0)
+                {
+                    node = node.Right;
+                }
+                else
+                {
+                    return node;
+                }
+            }
+            return null;
+        }
+
+        #endregion
+
+        #region Private Methods (BST)
+
+        /// <summary>
+        /// Inserts a new node into the tree.
+        /// </summary>
+        /// <param name="node">Node to be inserted</param>
+        private void Insert(T node)
+        {
+            T newNode = BSTInsert(node);
+            RestoreBalanceAfterInsertion(newNode);
+        }
+
+        /// <summary>
+        /// Insertion Mechanism for a Binary Search Tree (BST).
+        /// <br></br>
+        /// Iterates the tree starting from the root and inserts a new node
+        /// where all children in the left subtree are less than <paramref name="newNode"/>,
+        /// and all children in the right subtree are greater than <paramref name="newNode"/>.
+        /// </summary>
+        /// <param name="newNode">Node to be inserted</param>
+        /// <returns>The inserted Node</returns>
+        private T BSTInsert(T newNode)
+        {
+            T parent = null;
+            T node = Root;
+
+            while (node != null)
+            {
+                parent = node;
+                int cmp = newNode.CompareTo(node);
+                if (cmp < 0)
+                {
+                    node = node.Left;
+                }
+                else if (cmp > 0)
+                {
+                    node = node.Right;
+                }
+                else
+                {
+                    return node;
+                }
+            }
+            newNode.Parent = parent;
+            if (parent == null)
+            {
+                Root = newNode;
+            }
+            else if (newNode.CompareTo(parent) < 0)
+            {
+                parent.Left = newNode;
+            }
+            else
+            {
+                parent.Right = newNode;
+            }
+            Count++;
+            return newNode;
+        }
+
+        /// <summary>
+        /// Removes <paramref name="nodeToDelete"/> from the tree, if it exists.
+        /// </summary>
+        /// <param name="nodeToDelete">Node to be removed</param>
+        /// <returns>The deleted Node</returns>
+        private T Delete(T nodeToDelete)
+        {
+            if (nodeToDelete == null)
+            {
+                return null;
+            }
+
+            T old = nodeToDelete;
+            T child;
+            T parent;
+            bool color;
+
+            if (LeftOf(nodeToDelete) == null)
+            {
+                child = RightOf(nodeToDelete);
+            }
+            else if (RightOf(nodeToDelete) == null)
+            {
+                child = LeftOf(nodeToDelete);
+            }
+            else
+            {
+                T element = Minimum(RightOf(nodeToDelete));
+
+                child = RightOf(element);
+                parent = ParentOf(element);
+                color = ColorOf(element);
+
+                if (child != null)
+                {
+                    child.Parent = parent;
+                }
+
+                if (parent == null)
+                {
+                    Root = child;
+                }
+                else if (element == LeftOf(parent))
+                {
+                    parent.Left = child;
+                }
+                else
+                {
+                    parent.Right = child;
+                }
+
+                if (ParentOf(element) == old)
+                {
+                    parent = element;
+                }
+
+                element.Color = old.Color;
+                element.Left = old.Left;
+                element.Right = old.Right;
+                element.Parent = old.Parent;
+
+                if (ParentOf(old) == null)
+                {
+                    Root = element;
+                }
+                else if (old == LeftOf(ParentOf(old)))
+                {
+                    ParentOf(old).Left = element;
+                }
+                else
+                {
+                    ParentOf(old).Right = element;
+                }
+
+                LeftOf(old).Parent = element;
+
+                if (RightOf(old) != null)
+                {
+                    RightOf(old).Parent = element;
+                }
+
+                if (child != null && color == Black)
+                {
+                    RestoreBalanceAfterRemoval(child);
+                }
+
+                return old;
+            }
+
+            parent = ParentOf(nodeToDelete);
+            color = ColorOf(nodeToDelete);
+
+            if (child != null)
+            {
+                child.Parent = parent;
+            }
+
+            if (parent == null)
+            {
+                Root = child;
+            }
+            else if (nodeToDelete == LeftOf(parent))
+            {
+                parent.Left = child;
+            }
+            else
+            {
+                parent.Right = child;
+            }
+
+            if (child != null && color == Black)
+            {
+                RestoreBalanceAfterRemoval(child);
+            }
+
+            return old;
+        }
+
+        #endregion
+    }
+
+    public static class IntrusiveRedBlackTreeExtensions
+    {
+        /// <summary>
+        /// Retrieve the node that is considered equal to the key by the comparator.
+        /// </summary>
+        /// <param name="tree">Tree to search at</param>
+        /// <param name="key">Key of the node to be found</param>
+        /// <returns>Node that is equal to <paramref name="key"/></returns>
+        public static N GetNodeByKey<N, K>(this IntrusiveRedBlackTree<N> tree, K key)
+            where N : IntrusiveRedBlackTreeNode<N>, IComparable<N>, IComparable<K>
+            where K : struct
+        {
+            N node = tree.RootNode;
+            while (node != null)
+            {
+                int cmp = node.CompareTo(key);
+                if (cmp < 0)
+                {
+                    node = node.Right;
+                }
+                else if (cmp > 0)
+                {
+                    node = node.Left;
+                }
+                else
+                {
+                    return node;
+                }
+            }
+            return null;
+        }
+    }
+}

Ryujinx.Common/Collections/IntrusiveRedBlackTreeImpl.cs

@@ -0,0 +1,356 @@
+using System;
+
+namespace Ryujinx.Common.Collections
+{
+    /// <summary>
+    /// Tree that provides the ability for O(logN) lookups for keys that exist in the tree, and O(logN) lookups for keys immediately greater than or less than a specified key.
+    /// </summary>
+    /// <typeparam name="T">Derived node type</typeparam>
+    public class IntrusiveRedBlackTreeImpl<T> where T : IntrusiveRedBlackTreeNode<T>
+    {
+        protected const bool Black = true;
+        protected const bool Red = false;
+        protected T Root = null;
+
+        internal T RootNode => Root;
+
+        /// <summary>
+        /// Number of nodes on the tree.
+        /// </summary>
+        public int Count { get; protected set; }
+
+        /// <summary>
+        /// Removes all nodes on the tree.
+        /// </summary>
+        public void Clear()
+        {
+            Root = null;
+            Count = 0;
+        }
+
+        /// <summary>
+        /// Finds the node whose key is immediately greater than <paramref name="node"/>.
+        /// </summary>
+        /// <param name="node">Node to find the successor of</param>
+        /// <returns>Successor of <paramref name="node"/></returns>
+        internal static T SuccessorOf(T node)
+        {
+            if (node.Right != null)
+            {
+                return Minimum(node.Right);
+            }
+            T parent = node.Parent;
+            while (parent != null && node == parent.Right)
+            {
+                node = parent;
+                parent = parent.Parent;
+            }
+            return parent;
+        }
+
+        /// <summary>
+        /// Finds the node whose key is immediately less than <paramref name="node"/>.
+        /// </summary>
+        /// <param name="node">Node to find the predecessor of</param>
+        /// <returns>Predecessor of <paramref name="node"/></returns>
+        internal static T PredecessorOf(T node)
+        {
+            if (node.Left != null)
+            {
+                return Maximum(node.Left);
+            }
+            T parent = node.Parent;
+            while (parent != null && node == parent.Left)
+            {
+                node = parent;
+                parent = parent.Parent;
+            }
+            return parent;
+        }
+
+        /// <summary>
+        /// Returns the node with the largest key where <paramref name="node"/> is considered the root node.
+        /// </summary>
+        /// <param name="node">Root node</param>
+        /// <returns>Node with the maximum key in the tree of <paramref name="node"/></returns>
+        protected static T Maximum(T node)
+        {
+            T tmp = node;
+            while (tmp.Right != null)
+            {
+                tmp = tmp.Right;
+            }
+
+            return tmp;
+        }
+
+        /// <summary>
+        /// Returns the node with the smallest key where <paramref name="node"/> is considered the root node.
+        /// </summary>
+        /// <param name="node">Root node</param>
+        /// <returns>Node with the minimum key in the tree of <paramref name="node"/></returns>
+        /// <exception cref="ArgumentNullException"><paramref name="node"/> is null</exception>
+        protected static T Minimum(T node)
+        {
+            if (node == null)
+            {
+                throw new ArgumentNullException(nameof(node));
+            }
+            T tmp = node;
+            while (tmp.Left != null)
+            {
+                tmp = tmp.Left;
+            }
+
+            return tmp;
+        }
+
+        protected void RestoreBalanceAfterRemoval(T balanceNode)
+        {
+            T ptr = balanceNode;
+
+            while (ptr != Root && ColorOf(ptr) == Black)
+            {
+                if (ptr == LeftOf(ParentOf(ptr)))
+                {
+                    T sibling = RightOf(ParentOf(ptr));
+
+                    if (ColorOf(sibling) == Red)
+                    {
+                        SetColor(sibling, Black);
+                        SetColor(ParentOf(ptr), Red);
+                        RotateLeft(ParentOf(ptr));
+                        sibling = RightOf(ParentOf(ptr));
+                    }
+                    if (ColorOf(LeftOf(sibling)) == Black && ColorOf(RightOf(sibling)) == Black)
+                    {
+                        SetColor(sibling, Red);
+                        ptr = ParentOf(ptr);
+                    }
+                    else
+                    {
+                        if (ColorOf(RightOf(sibling)) == Black)
+                        {
+                            SetColor(LeftOf(sibling), Black);
+                            SetColor(sibling, Red);
+                            RotateRight(sibling);
+                            sibling = RightOf(ParentOf(ptr));
+                        }
+                        SetColor(sibling, ColorOf(ParentOf(ptr)));
+                        SetColor(ParentOf(ptr), Black);
+                        SetColor(RightOf(sibling), Black);
+                        RotateLeft(ParentOf(ptr));
+                        ptr = Root;
+                    }
+                }
+                else
+                {
+                    T sibling = LeftOf(ParentOf(ptr));
+
+                    if (ColorOf(sibling) == Red)
+                    {
+                        SetColor(sibling, Black);
+                        SetColor(ParentOf(ptr), Red);
+                        RotateRight(ParentOf(ptr));
+                        sibling = LeftOf(ParentOf(ptr));
+                    }
+                    if (ColorOf(RightOf(sibling)) == Black && ColorOf(LeftOf(sibling)) == Black)
+                    {
+                        SetColor(sibling, Red);
+                        ptr = ParentOf(ptr);
+                    }
+                    else
+                    {
+                        if (ColorOf(LeftOf(sibling)) == Black)
+                        {
+                            SetColor(RightOf(sibling), Black);
+                            SetColor(sibling, Red);
+                            RotateLeft(sibling);
+                            sibling = LeftOf(ParentOf(ptr));
+                        }
+                        SetColor(sibling, ColorOf(ParentOf(ptr)));
+                        SetColor(ParentOf(ptr), Black);
+                        SetColor(LeftOf(sibling), Black);
+                        RotateRight(ParentOf(ptr));
+                        ptr = Root;
+                    }
+                }
+            }
+            SetColor(ptr, Black);
+        }
+
+        protected void RestoreBalanceAfterInsertion(T balanceNode)
+        {
+            SetColor(balanceNode, Red);
+            while (balanceNode != null && balanceNode != Root && ColorOf(ParentOf(balanceNode)) == Red)
+            {
+                if (ParentOf(balanceNode) == LeftOf(ParentOf(ParentOf(balanceNode))))
+                {
+                    T sibling = RightOf(ParentOf(ParentOf(balanceNode)));
+
+                    if (ColorOf(sibling) == Red)
+                    {
+                        SetColor(ParentOf(balanceNode), Black);
+                        SetColor(sibling, Black);
+                        SetColor(ParentOf(ParentOf(balanceNode)), Red);
+                        balanceNode = ParentOf(ParentOf(balanceNode));
+                    }
+                    else
+                    {
+                        if (balanceNode == RightOf(ParentOf(balanceNode)))
+                        {
+                            balanceNode = ParentOf(balanceNode);
+                            RotateLeft(balanceNode);
+                        }
+                        SetColor(ParentOf(balanceNode), Black);
+                        SetColor(ParentOf(ParentOf(balanceNode)), Red);
+                        RotateRight(ParentOf(ParentOf(balanceNode)));
+                    }
+                }
+                else
+                {
+                    T sibling = LeftOf(ParentOf(ParentOf(balanceNode)));
+
+                    if (ColorOf(sibling) == Red)
+                    {
+                        SetColor(ParentOf(balanceNode), Black);
+                        SetColor(sibling, Black);
+                        SetColor(ParentOf(ParentOf(balanceNode)), Red);
+                        balanceNode = ParentOf(ParentOf(balanceNode));
+                    }
+                    else
+                    {
+                        if (balanceNode == LeftOf(ParentOf(balanceNode)))
+                        {
+                            balanceNode = ParentOf(balanceNode);
+                            RotateRight(balanceNode);
+                        }
+                        SetColor(ParentOf(balanceNode), Black);
+                        SetColor(ParentOf(ParentOf(balanceNode)), Red);
+                        RotateLeft(ParentOf(ParentOf(balanceNode)));
+                    }
+                }
+            }
+            SetColor(Root, Black);
+        }
+
+        protected virtual void RotateLeft(T node)
+        {
+            if (node != null)
+            {
+                T right = RightOf(node);
+                node.Right = LeftOf(right);
+                if (node.Right != null)
+                {
+                    node.Right.Parent = node;
+                }
+                T nodeParent = ParentOf(node);
+                right.Parent = nodeParent;
+                if (nodeParent == null)
+                {
+                    Root = right;
+                }
+                else if (node == LeftOf(nodeParent))
+                {
+                    nodeParent.Left = right;
+                }
+                else
+                {
+                    nodeParent.Right = right;
+                }
+                right.Left = node;
+                node.Parent = right;
+            }
+        }
+
+        protected virtual void RotateRight(T node)
+        {
+            if (node != null)
+            {
+                T left = LeftOf(node);
+                node.Left = RightOf(left);
+                if (node.Left != null)
+                {
+                    node.Left.Parent = node;
+                }
+                T nodeParent = ParentOf(node);
+                left.Parent = nodeParent;
+                if (nodeParent == null)
+                {
+                    Root = left;
+                }
+                else if (node == RightOf(nodeParent))
+                {
+                    nodeParent.Right = left;
+                }
+                else
+                {
+                    nodeParent.Left = left;
+                }
+                left.Right = node;
+                node.Parent = left;
+            }
+        }
+
+        #region Safety-Methods
+
+        // These methods save memory by allowing us to forego sentinel nil nodes, as well as serve as protection against NullReferenceExceptions.
+
+        /// <summary>
+        /// Returns the color of <paramref name="node"/>, or Black if it is null.
+        /// </summary>
+        /// <param name="node">Node</param>
+        /// <returns>The boolean color of <paramref name="node"/>, or black if null</returns>
+        protected static bool ColorOf(T node)
+        {
+            return node == null || node.Color;
+        }
+
+        /// <summary>
+        /// Sets the color of <paramref name="node"/> node to <paramref name="color"/>.
+        /// <br></br>
+        /// This method does nothing if <paramref name="node"/> is null.
+        /// </summary>
+        /// <param name="node">Node to set the color of</param>
+        /// <param name="color">Color (Boolean)</param>
+        protected static void SetColor(T node, bool color)
+        {
+            if (node != null)
+            {
+                node.Color = color;
+            }
+        }
+
+        /// <summary>
+        /// This method returns the left node of <paramref name="node"/>, or null if <paramref name="node"/> is null.
+        /// </summary>
+        /// <param name="node">Node to retrieve the left child from</param>
+        /// <returns>Left child of <paramref name="node"/></returns>
+        protected static T LeftOf(T node)
+        {
+            return node?.Left;
+        }
+
+        /// <summary>
+        /// This method returns the right node of <paramref name="node"/>, or null if <paramref name="node"/> is null.
+        /// </summary>
+        /// <param name="node">Node to retrieve the right child from</param>
+        /// <returns>Right child of <paramref name="node"/></returns>
+        protected static T RightOf(T node)
+        {
+            return node?.Right;
+        }
+
+        /// <summary>
+        /// Returns the parent node of <paramref name="node"/>, or null if <paramref name="node"/> is null.
+        /// </summary>
+        /// <param name="node">Node to retrieve the parent from</param>
+        /// <returns>Parent of <paramref name="node"/></returns>
+        protected static T ParentOf(T node)
+        {
+            return node?.Parent;
+        }
+
+        #endregion
+    }
+}

Ryujinx.Common/Collections/IntrusiveRedBlackTreeNode.cs

@@ -0,0 +1,16 @@
+namespace Ryujinx.Common.Collections
+{
+    /// <summary>
+    /// Represents a node in the Red-Black Tree.
+    /// </summary>
+    public class IntrusiveRedBlackTreeNode<T> where T : IntrusiveRedBlackTreeNode<T>
+    {
+        public bool Color = true;
+        public T Left;
+        public T Right;
+        public T Parent;
+
+        public T Predecessor => IntrusiveRedBlackTreeImpl<T>.PredecessorOf((T)this);
+        public T Successor => IntrusiveRedBlackTreeImpl<T>.SuccessorOf((T)this);
+    }
+}

Ryujinx.Common/Collections/TreeDictionary.cs

@@ -10,14 +10,8 @@ namespace Ryujinx.Common.Collections
     /// </summary>
     /// <typeparam name="K">Key</typeparam>
     /// <typeparam name="V">Value</typeparam>
-    public class TreeDictionary<K, V> : IDictionary<K, V> where K : IComparable<K>
+    public class TreeDictionary<K, V> : IntrusiveRedBlackTreeImpl<Node<K, V>>, IDictionary<K, V> where K : IComparable<K>
     {
-        private const bool Black = true;
-        private const bool Red = false;
-        private Node<K, V> _root = null;
-        private int _count = 0;
-        public TreeDictionary() { }
-
         #region Public Methods
 
         /// <summary>
@@ -57,7 +51,7 @@ namespace Ryujinx.Common.Collections
             {
                 throw new ArgumentNullException(nameof(key));
             }
-            if (null == value)
+            if (value == null)
             {
                 throw new ArgumentNullException(nameof(value));
             }
@@ -78,7 +72,7 @@ namespace Ryujinx.Common.Collections
             }
             if (Delete(key) != null)
             {
-                _count--;
+                Count--;
             }
         }
 
@@ -160,13 +154,12 @@ namespace Ryujinx.Common.Collections
 
             Queue<Node<K, V>> nodes = new Queue<Node<K, V>>();
 
-            if (this._root != null)
+            if (this.Root != null)
             {
-                nodes.Enqueue(this._root);
+                nodes.Enqueue(this.Root);
             }
-            while (nodes.Count > 0)
+            while (nodes.TryDequeue(out Node<K, V> node))
             {
-                Node<K, V> node = nodes.Dequeue();
                 list.Add(new KeyValuePair<K, V>(node.Key, node.Value));
                 if (node.Left != null)
                 {
@@ -188,7 +181,7 @@ namespace Ryujinx.Common.Collections
         {
             List<KeyValuePair<K, V>> list = new List<KeyValuePair<K, V>>();
 
-            AddToList(_root, list);
+            AddToList(Root, list);
 
             return list;
         }
@@ -229,7 +222,7 @@ namespace Ryujinx.Common.Collections
                 throw new ArgumentNullException(nameof(key));
             }
 
-            Node<K, V> node = _root;
+            Node<K, V> node = Root;
             while (node != null)
             {
                 int cmp = key.CompareTo(node.Key);
@@ -275,7 +268,7 @@ namespace Ryujinx.Common.Collections
         private Node<K, V> BSTInsert(K key, V value)
         {
             Node<K, V> parent = null;
-            Node<K, V> node = _root;
+            Node<K, V> node = Root;
 
             while (node != null)
             {
@@ -298,7 +291,7 @@ namespace Ryujinx.Common.Collections
             Node<K, V> newNode = new Node<K, V>(key, value, parent);
             if (newNode.Parent == null)
             {
-                _root = newNode;
+                Root = newNode;
             }
             else if (key.CompareTo(parent.Key) < 0)
             {
@@ -308,7 +301,7 @@ namespace Ryujinx.Common.Collections
             {
                 parent.Right = newNode;
             }
-            _count++;
+            Count++;
             return newNode;
         }
 
@@ -344,9 +337,8 @@ namespace Ryujinx.Common.Collections
 
             if (ParentOf(replacementNode) == null)
             {
-                _root = tmp;
+                Root = tmp;
             }
-
             else if (replacementNode == LeftOf(ParentOf(replacementNode)))
             {
                 ParentOf(replacementNode).Left = tmp;
@@ -370,43 +362,6 @@ namespace Ryujinx.Common.Collections
             return replacementNode;
         }
 
-        /// <summary>
-        /// Returns the node with the largest key where <paramref name="node"/> is considered the root node.
-        /// </summary>
-        /// <param name="node">Root Node</param>
-        /// <returns>Node with the maximum key in the tree of <paramref name="node"/></returns>
-        private static Node<K, V> Maximum(Node<K, V> node)
-        {
-            Node<K, V> tmp = node;
-            while (tmp.Right != null)
-            {
-                tmp = tmp.Right;
-            }
-
-            return tmp;
-        }
-
-        /// <summary>
-        /// Returns the node with the smallest key where <paramref name="node"/> is considered the root node.
-        /// </summary>
-        /// <param name="node">Root Node</param>
-        /// <returns>Node with the minimum key in the tree of <paramref name="node"/></returns>
-        ///<exception cref="ArgumentNullException"><paramref name="node"/> is null</exception>
-        private static Node<K, V> Minimum(Node<K, V> node)
-        {
-            if (node == null)
-            {
-                throw new ArgumentNullException(nameof(node));
-            }
-            Node<K, V> tmp = node;
-            while (tmp.Left != null)
-            {
-                tmp = tmp.Left;
-            }
-
-            return tmp;
-        }
-
         /// <summary>
         /// Returns the node whose key immediately less than or equal to <paramref name="key"/>.
         /// </summary>
@@ -419,7 +374,7 @@ namespace Ryujinx.Common.Collections
             {
                 throw new ArgumentNullException(nameof(key));
             }
-            Node<K, V> tmp = _root;
+            Node<K, V> tmp = Root;
 
             while (tmp != null)
             {
@@ -473,7 +428,7 @@ namespace Ryujinx.Common.Collections
             {
                 throw new ArgumentNullException(nameof(key));
             }
-            Node<K, V> tmp = _root;
+            Node<K, V> tmp = Root;
 
             while (tmp != null)
             {
@@ -515,294 +470,6 @@ namespace Ryujinx.Common.Collections
             return null;
         }
 
-        /// <summary>
-        /// Finds the node with the key is immediately greater than <paramref name="node"/>.
-        /// </summary>
-        /// <param name="node">Node to find the successor of</param>
-        /// <returns>Successor of <paramref name="node"/></returns>
-        private static Node<K, V> SuccessorOf(Node<K, V> node)
-        {
-            if (node.Right != null)
-            {
-                return Minimum(node.Right);
-            }
-            Node<K, V> parent = node.Parent;
-            while (parent != null && node == parent.Right)
-            {
-                node = parent;
-                parent = parent.Parent;
-            }
-            return parent;
-        }
-
-        /// <summary>
-        /// Finds the node whose key is immediately less than <paramref name="node"/>.
-        /// </summary>
-        /// <param name="node">Node to find the predecessor of</param>
-        /// <returns>Predecessor of <paramref name="node"/></returns>
-        private static Node<K, V> PredecessorOf(Node<K, V> node)
-        {
-            if (node.Left != null)
-            {
-                return Maximum(node.Left);
-            }
-            Node<K, V> parent = node.Parent;
-            while (parent != null && node == parent.Left)
-            {
-                node = parent;
-                parent = parent.Parent;
-            }
-            return parent;
-        }
-
-        #endregion
-
-        #region Private Methods (RBL)
-
-        private void RestoreBalanceAfterRemoval(Node<K, V> balanceNode)
-        {
-            Node<K, V> ptr = balanceNode;
-
-            while (ptr != _root && ColorOf(ptr) == Black)
-            {
-                if (ptr == LeftOf(ParentOf(ptr)))
-                {
-                    Node<K, V> sibling = RightOf(ParentOf(ptr));
-
-                    if (ColorOf(sibling) == Red)
-                    {
-                        SetColor(sibling, Black);
-                        SetColor(ParentOf(ptr), Red);
-                        RotateLeft(ParentOf(ptr));
-                        sibling = RightOf(ParentOf(ptr));
-                    }
-                    if (ColorOf(LeftOf(sibling)) == Black && ColorOf(RightOf(sibling)) == Black)
-                    {
-                        SetColor(sibling, Red);
-                        ptr = ParentOf(ptr);
-                    }
-                    else
-                    {
-                        if (ColorOf(RightOf(sibling)) == Black)
-                        {
-                            SetColor(LeftOf(sibling), Black);
-                            SetColor(sibling, Red);
-                            RotateRight(sibling);
-                            sibling = RightOf(ParentOf(ptr));
-                        }
-                        SetColor(sibling, ColorOf(ParentOf(ptr)));
-                        SetColor(ParentOf(ptr), Black);
-                        SetColor(RightOf(sibling), Black);
-                        RotateLeft(ParentOf(ptr));
-                        ptr = _root;
-                    }
-                }
-                else
-                {
-                    Node<K, V> sibling = LeftOf(ParentOf(ptr));
-
-                    if (ColorOf(sibling) == Red)
-                    {
-                        SetColor(sibling, Black);
-                        SetColor(ParentOf(ptr), Red);
-                        RotateRight(ParentOf(ptr));
-                        sibling = LeftOf(ParentOf(ptr));
-                    }
-                    if (ColorOf(RightOf(sibling)) == Black && ColorOf(LeftOf(sibling)) == Black)
-                    {
-                        SetColor(sibling, Red);
-                        ptr = ParentOf(ptr);
-                    }
-                    else
-                    {
-                        if (ColorOf(LeftOf(sibling)) == Black)
-                        {
-                            SetColor(RightOf(sibling), Black);
-                            SetColor(sibling, Red);
-                            RotateLeft(sibling);
-                            sibling = LeftOf(ParentOf(ptr));
-                        }
-                        SetColor(sibling, ColorOf(ParentOf(ptr)));
-                        SetColor(ParentOf(ptr), Black);
-                        SetColor(LeftOf(sibling), Black);
-                        RotateRight(ParentOf(ptr));
-                        ptr = _root;
-                    }
-                }
-            }
-            SetColor(ptr, Black);
-        }
-
-        private void RestoreBalanceAfterInsertion(Node<K, V> balanceNode)
-        {
-            SetColor(balanceNode, Red);
-            while (balanceNode != null && balanceNode != _root && ColorOf(ParentOf(balanceNode)) == Red)
-            {
-                if (ParentOf(balanceNode) == LeftOf(ParentOf(ParentOf(balanceNode))))
-                {
-                    Node<K, V> sibling = RightOf(ParentOf(ParentOf(balanceNode)));
-
-                    if (ColorOf(sibling) == Red)
-                    {
-                        SetColor(ParentOf(balanceNode), Black);
-                        SetColor(sibling, Black);
-                        SetColor(ParentOf(ParentOf(balanceNode)), Red);
-                        balanceNode = ParentOf(ParentOf(balanceNode));
-                    }
-                    else
-                    {
-                        if (balanceNode == RightOf(ParentOf(balanceNode)))
-                        {
-                            balanceNode = ParentOf(balanceNode);
-                            RotateLeft(balanceNode);
-                        }
-                        SetColor(ParentOf(balanceNode), Black);
-                        SetColor(ParentOf(ParentOf(balanceNode)), Red);
-                        RotateRight(ParentOf(ParentOf(balanceNode)));
-                    }
-                }
-                else
-                {
-                    Node<K, V> sibling = LeftOf(ParentOf(ParentOf(balanceNode)));
-
-                    if (ColorOf(sibling) == Red)
-                    {
-                        SetColor(ParentOf(balanceNode), Black);
-                        SetColor(sibling, Black);
-                        SetColor(ParentOf(ParentOf(balanceNode)), Red);
-                        balanceNode = ParentOf(ParentOf(balanceNode));
-                    }
-                    else
-                    {
-                        if (balanceNode == LeftOf(ParentOf(balanceNode)))
-                        {
-                            balanceNode = ParentOf(balanceNode);
-                            RotateRight(balanceNode);
-                        }
-                        SetColor(ParentOf(balanceNode), Black);
-                        SetColor(ParentOf(ParentOf(balanceNode)), Red);
-                        RotateLeft(ParentOf(ParentOf(balanceNode)));
-                    }
-                }
-            }
-            SetColor(_root, Black);
-        }
-
-        private void RotateLeft(Node<K, V> node)
-        {
-            if (node != null)
-            {
-                Node<K, V> right = RightOf(node);
-                node.Right = LeftOf(right);
-                if (LeftOf(right) != null)
-                {
-                    LeftOf(right).Parent = node;
-                }
-                right.Parent = ParentOf(node);
-                if (ParentOf(node) == null)
-                {
-                    _root = right;
-                }
-                else if (node == LeftOf(ParentOf(node)))
-                {
-                    ParentOf(node).Left = right;
-                }
-                else
-                {
-                    ParentOf(node).Right = right;
-                }
-                right.Left = node;
-                node.Parent = right;
-            }
-        }
-
-        private void RotateRight(Node<K, V> node)
-        {
-            if (node != null)
-            {
-                Node<K, V> left = LeftOf(node);
-                node.Left = RightOf(left);
-                if (RightOf(left) != null)
-                {
-                    RightOf(left).Parent = node;
-                }
-                left.Parent = node.Parent;
-                if (ParentOf(node) == null)
-                {
-                    _root = left;
-                }
-                else if (node == RightOf(ParentOf(node)))
-                {
-                    ParentOf(node).Right = left;
-                }
-                else
-                {
-                    ParentOf(node).Left = left;
-                }
-                left.Right = node;
-                node.Parent = left;
-            }
-        }
-        #endregion
-
-        #region Safety-Methods
-
-        // These methods save memory by allowing us to forego sentinel nil nodes, as well as serve as protection against NullReferenceExceptions.
-
-        /// <summary>
-        /// Returns the color of <paramref name="node"/>, or Black if it is null.
-        /// </summary>
-        /// <param name="node">Node</param>
-        /// <returns>The boolean color of <paramref name="node"/>, or black if null</returns>
-        private static bool ColorOf(Node<K, V> node)
-        {
-            return node == null || node.Color;
-        }
-
-        /// <summary>
-        /// Sets the color of <paramref name="node"/> node to <paramref name="color"/>.
-        /// <br></br>
-        /// This method does nothing if <paramref name="node"/> is null.
-        /// </summary>
-        /// <param name="node">Node to set the color of</param>
-        /// <param name="color">Color (Boolean)</param>
-        private static void SetColor(Node<K, V> node, bool color)
-        {
-            if (node != null)
-            {
-                node.Color = color;
-            }
-        }
-
-        /// <summary>
-        /// This method returns the left node of <paramref name="node"/>, or null if <paramref name="node"/> is null.
-        /// </summary>
-        /// <param name="node">Node to retrieve the left child from</param>
-        /// <returns>Left child of <paramref name="node"/></returns>
-        private static Node<K, V> LeftOf(Node<K, V> node)
-        {
-            return node?.Left;
-        }
-
-        /// <summary>
-        /// This method returns the right node of <paramref name="node"/>, or null if <paramref name="node"/> is null.
-        /// </summary>
-        /// <param name="node">Node to retrieve the right child from</param>
-        /// <returns>Right child of <paramref name="node"/></returns>
-        private static Node<K, V> RightOf(Node<K, V> node)
-        {
-            return node?.Right;
-        }
-
-        /// <summary>
-        /// Returns the parent node of <paramref name="node"/>, or null if <paramref name="node"/> is null.
-        /// </summary>
-        /// <param name="node">Node to retrieve the parent from</param>
-        /// <returns>Parent of <paramref name="node"/></returns>
-        private static Node<K, V> ParentOf(Node<K, V> node)
-        {
-            return node?.Parent;
-        }
         #endregion
 
         #region Interface Implementations
@@ -819,9 +486,9 @@ namespace Ryujinx.Common.Collections
 
         bool IDictionary<K, V>.Remove(K key)
         {
-            int count = _count;
+            int count = Count;
             Remove(key);
-            return count > _count;
+            return count > Count;
         }
 
         public bool TryGetValue(K key, [MaybeNullWhen(false)] out V value)
@@ -845,12 +512,6 @@ namespace Ryujinx.Common.Collections
             Add(item.Key, item.Value);
         }
 
-        public void Clear()
-        {
-            _root = null;
-            _count = 0;
-        }
-
         public bool Contains(KeyValuePair<K, V> item)
         {
             if (item.Key == null)
@@ -895,9 +556,9 @@ namespace Ryujinx.Common.Collections
 
             if (node.Value.Equals(item.Value))
             {
-                int count = _count;
+                int count = Count;
                 Remove(item.Key);
-                return count > _count;
+                return count > Count;
             }
 
             return false;
@@ -913,8 +574,6 @@ namespace Ryujinx.Common.Collections
             return GetKeyValues().GetEnumerator();
         }
 
-        public int Count => _count;
-
         public ICollection<K> Keys => GetKeyValues().Keys;
 
         public ICollection<V> Values => GetKeyValues().Values;
@@ -928,6 +587,7 @@ namespace Ryujinx.Common.Collections
         }
 
         #endregion
+
         #region Private Interface Helper Methods
 
         /// <summary>
@@ -938,14 +598,13 @@ namespace Ryujinx.Common.Collections
         {
             SortedList<K, V> set = new SortedList<K, V>();
             Queue<Node<K, V>> queue = new Queue<Node<K, V>>();
-            if (_root != null)
+            if (Root != null)
             {
-                queue.Enqueue(_root);
+                queue.Enqueue(Root);
             }
 
-            while (queue.Count > 0)
+            while (queue.TryDequeue(out Node<K, V> node))
             {
-                Node<K, V> node = queue.Dequeue();
                 set.Add(node.Key, node.Value);
                 if (null != node.Left)
                 {
@@ -959,6 +618,7 @@ namespace Ryujinx.Common.Collections
 
             return set;
         }
+
         #endregion
     }
 
@@ -967,16 +627,12 @@ namespace Ryujinx.Common.Collections
     /// </summary>
     /// <typeparam name="K">Key of the node</typeparam>
     /// <typeparam name="V">Value of the node</typeparam>
-    class Node<K, V>
+    public class Node<K, V> : IntrusiveRedBlackTreeNode<Node<K, V>> where K : IComparable<K>
     {
-        public bool Color = true;
-        public Node<K, V> Left = null;
-        public Node<K, V> Right = null;
-        public Node<K, V> Parent = null;
-        public K Key;
-        public V Value;
+        internal K Key;
+        internal V Value;
 
-        public Node(K key, V value, Node<K, V> parent)
+        internal Node(K key, V value, Node<K, V> parent)
         {
             Key = key;
             Value = value;

Ryujinx.Graphics.Gpu/Image/FormatTable.cs

@@ -8,195 +8,542 @@ namespace Ryujinx.Graphics.Gpu.Image
     /// </summary>
     static class FormatTable
     {
-        private static Dictionary<uint, FormatInfo> _textureFormats = new Dictionary<uint, FormatInfo>()
+        private enum TextureFormat : uint
         {
-            { 0x2491d, new FormatInfo(Format.R8Unorm,           1,  1,  1,  1) },
-            { 0x1249d, new FormatInfo(Format.R8Snorm,           1,  1,  1,  1) },
-            { 0x4921d, new FormatInfo(Format.R8Uint,            1,  1,  1,  1) },
-            { 0x36d9d, new FormatInfo(Format.R8Sint,            1,  1,  1,  1) },
-            { 0x7ff9b, new FormatInfo(Format.R16Float,          1,  1,  2,  1) },
-            { 0x2491b, new FormatInfo(Format.R16Unorm,          1,  1,  2,  1) },
-            { 0x1249b, new FormatInfo(Format.R16Snorm,          1,  1,  2,  1) },
-            { 0x4921b, new FormatInfo(Format.R16Uint,           1,  1,  2,  1) },
-            { 0x36d9b, new FormatInfo(Format.R16Sint,           1,  1,  2,  1) },
-            { 0x7ff8f, new FormatInfo(Format.R32Float,          1,  1,  4,  1) },
-            { 0x4920f, new FormatInfo(Format.R32Uint,           1,  1,  4,  1) },
-            { 0x36d8f, new FormatInfo(Format.R32Sint,           1,  1,  4,  1) },
-            { 0x24918, new FormatInfo(Format.R8G8Unorm,         1,  1,  2,  2) },
-            { 0x12498, new FormatInfo(Format.R8G8Snorm,         1,  1,  2,  2) },
-            { 0x49218, new FormatInfo(Format.R8G8Uint,          1,  1,  2,  2) },
-            { 0x36d98, new FormatInfo(Format.R8G8Sint,          1,  1,  2,  2) },
-            { 0x7ff8c, new FormatInfo(Format.R16G16Float,       1,  1,  4,  2) },
-            { 0x2490c, new FormatInfo(Format.R16G16Unorm,       1,  1,  4,  2) },
-            { 0x1248c, new FormatInfo(Format.R16G16Snorm,       1,  1,  4,  2) },
-            { 0x4920c, new FormatInfo(Format.R16G16Uint,        1,  1,  4,  2) },
-            { 0x36d8c, new FormatInfo(Format.R16G16Sint,        1,  1,  4,  2) },
-            { 0x7ff84, new FormatInfo(Format.R32G32Float,       1,  1,  8,  2) },
-            { 0x49204, new FormatInfo(Format.R32G32Uint,        1,  1,  8,  2) },
-            { 0x36d84, new FormatInfo(Format.R32G32Sint,        1,  1,  8,  2) },
-            { 0x7ff82, new FormatInfo(Format.R32G32B32Float,    1,  1,  12, 3) },
-            { 0x49202, new FormatInfo(Format.R32G32B32Uint,     1,  1,  12, 3) },
-            { 0x36d82, new FormatInfo(Format.R32G32B32Sint,     1,  1,  12, 3) },
-            { 0x24908, new FormatInfo(Format.R8G8B8A8Unorm,     1,  1,  4,  4) },
-            { 0x12488, new FormatInfo(Format.R8G8B8A8Snorm,     1,  1,  4,  4) },
-            { 0x49208, new FormatInfo(Format.R8G8B8A8Uint,      1,  1,  4,  4) },
-            { 0x36d88, new FormatInfo(Format.R8G8B8A8Sint,      1,  1,  4,  4) },
-            { 0x7ff83, new FormatInfo(Format.R16G16B16A16Float, 1,  1,  8,  4) },
-            { 0x24903, new FormatInfo(Format.R16G16B16A16Unorm, 1,  1,  8,  4) },
-            { 0x12483, new FormatInfo(Format.R16G16B16A16Snorm, 1,  1,  8,  4) },
-            { 0x49203, new FormatInfo(Format.R16G16B16A16Uint,  1,  1,  8,  4) },
-            { 0x36d83, new FormatInfo(Format.R16G16B16A16Sint,  1,  1,  8,  4) },
-            { 0x7ff81, new FormatInfo(Format.R32G32B32A32Float, 1,  1,  16, 4) },
-            { 0x49201, new FormatInfo(Format.R32G32B32A32Uint,  1,  1,  16, 4) },
-            { 0x36d81, new FormatInfo(Format.R32G32B32A32Sint,  1,  1,  16, 4) },
-            { 0x2493a, new FormatInfo(Format.D16Unorm,          1,  1,  2,  1) },
-            { 0x493af, new FormatInfo(Format.D32Float,          1,  1,  4,  1) },
-            { 0x7ffaf, new FormatInfo(Format.D32Float,          1,  1,  4,  1) },
-            { 0x24a0e, new FormatInfo(Format.D24UnormS8Uint,    1,  1,  4,  2) },
-            { 0x24a29, new FormatInfo(Format.D24UnormS8Uint,    1,  1,  4,  2) },
-            { 0x48a29, new FormatInfo(Format.D24UnormS8Uint,    1,  1,  4,  2) },
-            { 0x4912b, new FormatInfo(Format.S8UintD24Unorm,    1,  1,  4,  2) },
-            { 0x25385, new FormatInfo(Format.D32FloatS8Uint,    1,  1,  8,  2) },
-            { 0x253b0, new FormatInfo(Format.D32FloatS8Uint,    1,  1,  8,  2) },
-            { 0xa4908, new FormatInfo(Format.R8G8B8A8Srgb,      1,  1,  4,  4) },
-            { 0x2491e, new FormatInfo(Format.R4G4Unorm,         1,  1,  1,  2) },
-            { 0x24912, new FormatInfo(Format.R4G4B4A4Unorm,     1,  1,  2,  4) },
-            { 0x24914, new FormatInfo(Format.R5G5B5A1Unorm,     1,  1,  2,  4) },
-            { 0x24915, new FormatInfo(Format.R5G6B5Unorm,       1,  1,  2,  3) },
-            { 0x24909, new FormatInfo(Format.R10G10B10A2Unorm,  1,  1,  4,  4) },
-            { 0x49209, new FormatInfo(Format.R10G10B10A2Uint,   1,  1,  4,  4) },
-            { 0x7ffa1, new FormatInfo(Format.R11G11B10Float,    1,  1,  4,  3) },
-            { 0x7ffa0, new FormatInfo(Format.R9G9B9E5Float,     1,  1,  4,  4) },
-            { 0x24924, new FormatInfo(Format.Bc1RgbaUnorm,      4,  4,  8,  4) },
-            { 0x24925, new FormatInfo(Format.Bc2Unorm,          4,  4,  16, 4) },
-            { 0x24926, new FormatInfo(Format.Bc3Unorm,          4,  4,  16, 4) },
-            { 0xa4924, new FormatInfo(Format.Bc1RgbaSrgb,       4,  4,  8,  4) },
-            { 0xa4925, new FormatInfo(Format.Bc2Srgb,           4,  4,  16, 4) },
-            { 0xa4926, new FormatInfo(Format.Bc3Srgb,           4,  4,  16, 4) },
-            { 0x24927, new FormatInfo(Format.Bc4Unorm,          4,  4,  8,  1) },
-            { 0x124a7, new FormatInfo(Format.Bc4Snorm,          4,  4,  8,  1) },
-            { 0x24928, new FormatInfo(Format.Bc5Unorm,          4,  4,  16, 2) },
-            { 0x124a8, new FormatInfo(Format.Bc5Snorm,          4,  4,  16, 2) },
-            { 0x24917, new FormatInfo(Format.Bc7Unorm,          4,  4,  16, 4) },
-            { 0xa4917, new FormatInfo(Format.Bc7Srgb,           4,  4,  16, 4) },
-            { 0x7ff90, new FormatInfo(Format.Bc6HSfloat,        4,  4,  16, 4) },
-            { 0x7ff91, new FormatInfo(Format.Bc6HUfloat,        4,  4,  16, 4) },
-            { 0x24906, new FormatInfo(Format.Etc2RgbUnorm,      4,  4,  8,  3) },
-            { 0x2490b, new FormatInfo(Format.Etc2RgbaUnorm,     4,  4,  16, 4) },
-            { 0xa4906, new FormatInfo(Format.Etc2RgbSrgb,       4,  4,  8,  3) },
-            { 0xa490b, new FormatInfo(Format.Etc2RgbaSrgb,      4,  4,  16, 4) },
-            { 0x24940, new FormatInfo(Format.Astc4x4Unorm,      4,  4,  16, 4) },
-            { 0x24950, new FormatInfo(Format.Astc5x4Unorm,      5,  4,  16, 4) },
-            { 0x24941, new FormatInfo(Format.Astc5x5Unorm,      5,  5,  16, 4) },
-            { 0x24951, new FormatInfo(Format.Astc6x5Unorm,      6,  5,  16, 4) },
-            { 0x24942, new FormatInfo(Format.Astc6x6Unorm,      6,  6,  16, 4) },
-            { 0x24955, new FormatInfo(Format.Astc8x5Unorm,      8,  5,  16, 4) },
-            { 0x24952, new FormatInfo(Format.Astc8x6Unorm,      8,  6,  16, 4) },
-            { 0x24944, new FormatInfo(Format.Astc8x8Unorm,      8,  8,  16, 4) },
-            { 0x24956, new FormatInfo(Format.Astc10x5Unorm,     10, 5,  16, 4) },
-            { 0x24957, new FormatInfo(Format.Astc10x6Unorm,     10, 6,  16, 4) },
-            { 0x24953, new FormatInfo(Format.Astc10x8Unorm,     10, 8,  16, 4) },
-            { 0x24945, new FormatInfo(Format.Astc10x10Unorm,    10, 10, 16, 4) },
-            { 0x24954, new FormatInfo(Format.Astc12x10Unorm,    12, 10, 16, 4) },
-            { 0x24946, new FormatInfo(Format.Astc12x12Unorm,    12, 12, 16, 4) },
-            { 0xa4940, new FormatInfo(Format.Astc4x4Srgb,       4,  4,  16, 4) },
-            { 0xa4950, new FormatInfo(Format.Astc5x4Srgb,       5,  4,  16, 4) },
-            { 0xa4941, new FormatInfo(Format.Astc5x5Srgb,       5,  5,  16, 4) },
-            { 0xa4951, new FormatInfo(Format.Astc6x5Srgb,       6,  5,  16, 4) },
-            { 0xa4942, new FormatInfo(Format.Astc6x6Srgb,       6,  6,  16, 4) },
-            { 0xa4955, new FormatInfo(Format.Astc8x5Srgb,       8,  5,  16, 4) },
-            { 0xa4952, new FormatInfo(Format.Astc8x6Srgb,       8,  6,  16, 4) },
-            { 0xa4944, new FormatInfo(Format.Astc8x8Srgb,       8,  8,  16, 4) },
-            { 0xa4956, new FormatInfo(Format.Astc10x5Srgb,      10, 5,  16, 4) },
-            { 0xa4957, new FormatInfo(Format.Astc10x6Srgb,      10, 6,  16, 4) },
-            { 0xa4953, new FormatInfo(Format.Astc10x8Srgb,      10, 8,  16, 4) },
-            { 0xa4945, new FormatInfo(Format.Astc10x10Srgb,     10, 10, 16, 4) },
-            { 0xa4954, new FormatInfo(Format.Astc12x10Srgb,     12, 10, 16, 4) },
-            { 0xa4946, new FormatInfo(Format.Astc12x12Srgb,     12, 12, 16, 4) },
-            { 0x24913, new FormatInfo(Format.A1B5G5R5Unorm,     1,  1,  2,  4) }
+            // Formats
+            R32G32B32A32 = 0x01,
+            R32G32B32 = 0x02,
+            R16G16B16A16 = 0x03,
+            R32G32 = 0x04,
+            R32B24G8 = 0x05,
+            X8B8G8R8 = 0x07,
+            A8B8G8R8 = 0x08,
+            A2B10G10R10 = 0x09,
+            R16G16 = 0x0c,
+            G8R24 = 0x0d,
+            G24R8 = 0x0e,
+            R32 = 0x0f,
+            A4B4G4R4 = 0x12,
+            A5B5G5R1 = 0x13,
+            A1B5G5R5 = 0x14,
+            B5G6R5 = 0x15,
+            B6G5R5 = 0x16,
+            G8R8 = 0x18,
+            R16 = 0x1b,
+            Y8Video = 0x1c,
+            R8 = 0x1d,
+            G4R4 = 0x1e,
+            R1 = 0x1f,
+            E5B9G9R9SharedExp = 0x20,
+            Bf10Gf11Rf11 = 0x21,
+            G8B8G8R8 = 0x22,
+            B8G8R8G8 = 0x23,
+            Bc1 = 0x24,
+            Bc2 = 0x25,
+            Bc3 = 0x26,
+            Bc4 = 0x27,
+            Bc5 = 0x28,
+            Bc6HSf16 = 0x10,
+            Bc6HUf16 = 0x11,
+            Bc7U = 0x17,
+            Etc2Rgb = 0x06,
+            Etc2RgbPta = 0x0a,
+            Etc2Rgba = 0x0b,
+            Eac = 0x19,
+            Eacx2 = 0x1a,
+            Z24S8 = 0x29,
+            X8Z24 = 0x2a,
+            S8Z24 = 0x2b,
+            X4V4Z24Cov4R4V = 0x2c,
+            X4V4Z24Cov8R8V = 0x2d,
+            V8Z24Cov4R12V = 0x2e,
+            Zf32 = 0x2f,
+            Zf32X24S8 = 0x30,
+            X8Z24X20V4S8Cov4R4V = 0x31,
+            X8Z24X20V4S8Cov8R8V = 0x32,
+            Zf32X20V4X8Cov4R4V = 0x33,
+            Zf32X20V4X8Cov8R8V = 0x34,
+            Zf32X20V4S8Cov4R4V = 0x35,
+            Zf32X20V4S8Cov8R8V = 0x36,
+            X8Z24X16V8S8Cov4R12V = 0x37,
+            Zf32X16V8X8Cov4R12V = 0x38,
+            Zf32X16V8S8Cov4R12V = 0x39,
+            Z16 = 0x3a,
+            V8Z24Cov8R24V = 0x3b,
+            X8Z24X16V8S8Cov8R24V = 0x3c,
+            Zf32X16V8X8Cov8R24V = 0x3d,
+            Zf32X16V8S8Cov8R24V = 0x3e,
+            Astc2D4x4 = 0x40,
+            Astc2D5x4 = 0x50,
+            Astc2D5x5 = 0x41,
+            Astc2D6x5 = 0x51,
+            Astc2D6x6 = 0x42,
+            Astc2D8x5 = 0x55,
+            Astc2D8x6 = 0x52,
+            Astc2D8x8 = 0x44,
+            Astc2D10x5 = 0x56,
+            Astc2D10x6 = 0x57,
+            Astc2D10x8 = 0x53,
+            Astc2D10x10 = 0x45,
+            Astc2D12x10 = 0x54,
+            Astc2D12x12 = 0x46,
+
+            // Types
+            Snorm = 0x1,
+            Unorm = 0x2,
+            Sint = 0x3,
+            Uint = 0x4,
+            SnormForceFp16 = 0x5,
+            UnormForceFp16 = 0x6,
+            Float = 0x7,
+
+            // Component Types
+            RSnorm = Snorm << 7,
+            GSnorm = Snorm << 10,
+            BSnorm = Snorm << 13,
+            ASnorm = Snorm << 16,
+
+            RUnorm = Unorm << 7,
+            GUnorm = Unorm << 10,
+            BUnorm = Unorm << 13,
+            AUnorm = Unorm << 16,
+
+            RSint = Sint << 7,
+            GSint = Sint << 10,
+            BSint = Sint << 13,
+            ASint = Sint << 16,
+
+            RUint = Uint << 7,
+            GUint = Uint << 10,
+            BUint = Uint << 13,
+            AUint = Uint << 16,
+
+            RSnormForceFp16 = SnormForceFp16 << 7,
+            GSnormForceFp16 = SnormForceFp16 << 10,
+            BSnormForceFp16 = SnormForceFp16 << 13,
+            ASnormForceFp16 = SnormForceFp16 << 16,
+
+            RUnormForceFp16 = UnormForceFp16 << 7,
+            GUnormForceFp16 = UnormForceFp16 << 10,
+            BUnormForceFp16 = UnormForceFp16 << 13,
+            AUnormForceFp16 = UnormForceFp16 << 16,
+
+            RFloat = Float << 7,
+            GFloat = Float << 10,
+            BFloat = Float << 13,
+            AFloat = Float << 16,
+
+            Srgb = 0x1 << 19, // Custom encoding
+
+            // Combinations
+            R8Unorm                          = R8                | RUnorm | GUnorm | BUnorm | AUnorm,        // 0x2491d
+            R8Snorm                          = R8                | RSnorm | GSnorm | BSnorm | ASnorm,        // 0x1249d
+            R8Uint                           = R8                | RUint  | GUint  | BUint  | AUint,         // 0x4921d
+            R8Sint                           = R8                | RSint  | GSint  | BSint  | ASint,         // 0x36d9d
+            R16Float                         = R16               | RFloat | GFloat | BFloat | AFloat,        // 0x7ff9b
+            R16Unorm                         = R16               | RUnorm | GUnorm | BUnorm | AUnorm,        // 0x2491b
+            R16Snorm                         = R16               | RSnorm | GSnorm | BSnorm | ASnorm,        // 0x1249b
+            R16Uint                          = R16               | RUint  | GUint  | BUint  | AUint,         // 0x4921b
+            R16Sint                          = R16               | RSint  | GSint  | BSint  | ASint,         // 0x36d9b
+            R32Float                         = R32               | RFloat | GFloat | BFloat | AFloat,        // 0x7ff8f
+            R32Uint                          = R32               | RUint  | GUint  | BUint  | AUint,         // 0x4920f
+            R32Sint                          = R32               | RSint  | GSint  | BSint  | ASint,         // 0x36d8f
+            G8R8Unorm                        = G8R8              | RUnorm | GUnorm | BUnorm | AUnorm,        // 0x24918
+            G8R8Snorm                        = G8R8              | RSnorm | GSnorm | BSnorm | ASnorm,        // 0x12498
+            G8R8Uint                         = G8R8              | RUint  | GUint  | BUint  | AUint,         // 0x49218
+            G8R8Sint                         = G8R8              | RSint  | GSint  | BSint  | ASint,         // 0x36d98
+            R16G16Float                      = R16G16            | RFloat | GFloat | BFloat | AFloat,        // 0x7ff8c
+            R16G16Unorm                      = R16G16            | RUnorm | GUnorm | BUnorm | AUnorm,        // 0x2490c
+            R16G16Snorm                      = R16G16            | RSnorm | GSnorm | BSnorm | ASnorm,        // 0x1248c
+            R16G16Uint                       = R16G16            | RUint  | GUint  | BUint  | AUint,         // 0x4920c
+            R16G16Sint                       = R16G16            | RSint  | GSint  | BSint  | ASint,         // 0x36d8c
+            R32G32Float                      = R32G32            | RFloat | GFloat | BFloat | AFloat,        // 0x7ff84
+            R32G32Uint                       = R32G32            | RUint  | GUint  | BUint  | AUint,         // 0x49204
+            R32G32Sint                       = R32G32            | RSint  | GSint  | BSint  | ASint,         // 0x36d84
+            R32G32B32Float                   = R32G32B32         | RFloat | GFloat | BFloat | AFloat,        // 0x7ff82
+            R32G32B32Uint                    = R32G32B32         | RUint  | GUint  | BUint  | AUint,         // 0x49202
+            R32G32B32Sint                    = R32G32B32         | RSint  | GSint  | BSint  | ASint,         // 0x36d82
+            A8B8G8R8Unorm                    = A8B8G8R8          | RUnorm | GUnorm | BUnorm | AUnorm,        // 0x24908
+            A8B8G8R8Snorm                    = A8B8G8R8          | RSnorm | GSnorm | BSnorm | ASnorm,        // 0x12488
+            A8B8G8R8Uint                     = A8B8G8R8          | RUint  | GUint  | BUint  | AUint,         // 0x49208
+            A8B8G8R8Sint                     = A8B8G8R8          | RSint  | GSint  | BSint  | ASint,         // 0x36d88
+            R16G16B16A16Float                = R16G16B16A16      | RFloat | GFloat | BFloat | AFloat,        // 0x7ff83
+            R16G16B16A16Unorm                = R16G16B16A16      | RUnorm | GUnorm | BUnorm | AUnorm,        // 0x24903
+            R16G16B16A16Snorm                = R16G16B16A16      | RSnorm | GSnorm | BSnorm | ASnorm,        // 0x12483
+            R16G16B16A16Uint                 = R16G16B16A16      | RUint  | GUint  | BUint  | AUint,         // 0x49203
+            R16G16B16A16Sint                 = R16G16B16A16      | RSint  | GSint  | BSint  | ASint,         // 0x36d83
+            R32G32B32A32Float                = R32G32B32A32      | RFloat | GFloat | BFloat | AFloat,        // 0x7ff81
+            R32G32B32A32Uint                 = R32G32B32A32      | RUint  | GUint  | BUint  | AUint,         // 0x49201
+            R32G32B32A32Sint                 = R32G32B32A32      | RSint  | GSint  | BSint  | ASint,         // 0x36d81
+            Z16Unorm                         = Z16               | RUnorm | GUnorm | BUnorm | AUnorm,        // 0x2493a
+            Zf32RFloatGUintBUintAUint        = Zf32              | RFloat | GUint  | BUint  | AUint,         // 0x493af
+            Zf32Float                        = Zf32              | RFloat | GFloat | BFloat | AFloat,        // 0x7ffaf
+            G24R8RUintGUnormBUnormAUnorm     = G24R8             | RUint  | GUnorm | BUnorm | AUnorm,        // 0x24a0e
+            Z24S8RUintGUnormBUnormAUnorm     = Z24S8             | RUint  | GUnorm | BUnorm | AUnorm,        // 0x24a29
+            Z24S8RUintGUnormBUintAUint       = Z24S8             | RUint  | GUnorm | BUint  | AUint,         // 0x48a29
+            S8Z24RUnormGUintBUintAUint       = S8Z24             | RUnorm | GUint  | BUint  | AUint,         // 0x4912b
+            R32B24G8RFloatGUintBUnormAUnorm  = R32B24G8          | RFloat | GUint  | BUnorm | AUnorm,        // 0x25385
+            Zf32X24S8RFloatGUintBUnormAUnorm = Zf32X24S8         | RFloat | GUint  | BUnorm | AUnorm,        // 0x253b0
+            A8B8G8R8UnormSrgb                = A8B8G8R8          | RUnorm | GUnorm | BUnorm | AUnorm | Srgb, // 0xa4908
+            G4R4Unorm                        = G4R4              | RUnorm | GUnorm | BUnorm | AUnorm,        // 0x2491e
+            A4B4G4R4Unorm                    = A4B4G4R4          | RUnorm | GUnorm | BUnorm | AUnorm,        // 0x24912
+            A1B5G5R5Unorm                    = A1B5G5R5          | RUnorm | GUnorm | BUnorm | AUnorm,        // 0x24914
+            B5G6R5Unorm                      = B5G6R5            | RUnorm | GUnorm | BUnorm | AUnorm,        // 0x24915
+            A2B10G10R10Unorm                 = A2B10G10R10       | RUnorm | GUnorm | BUnorm | AUnorm,        // 0x24909
+            A2B10G10R10Uint                  = A2B10G10R10       | RUint  | GUint  | BUint  | AUint,         // 0x49209
+            Bf10Gf11Rf11Float                = Bf10Gf11Rf11      | RFloat | GFloat | BFloat | AFloat,        // 0x7ffa1
+            E5B9G9R9SharedExpFloat           = E5B9G9R9SharedExp | RFloat | GFloat | BFloat | AFloat,        // 0x7ffa0
+            Bc1Unorm                         = Bc1               | RUnorm | GUnorm | BUnorm | AUnorm,        // 0x24924
+            Bc2Unorm                         = Bc2               | RUnorm | GUnorm | BUnorm | AUnorm,        // 0x24925
+            Bc3Unorm                         = Bc3               | RUnorm | GUnorm | BUnorm | AUnorm,        // 0x24926
+            Bc1UnormSrgb                     = Bc1               | RUnorm | GUnorm | BUnorm | AUnorm | Srgb, // 0xa4924
+            Bc2UnormSrgb                     = Bc2               | RUnorm | GUnorm | BUnorm | AUnorm | Srgb, // 0xa4925
+            Bc3UnormSrgb                     = Bc3               | RUnorm | GUnorm | BUnorm | AUnorm | Srgb, // 0xa4926
+            Bc4Unorm                         = Bc4               | RUnorm | GUnorm | BUnorm | AUnorm,        // 0x24927
+            Bc4Snorm                         = Bc4               | RSnorm | GSnorm | BSnorm | ASnorm,        // 0x124a7
+            Bc5Unorm                         = Bc5               | RUnorm | GUnorm | BUnorm | AUnorm,        // 0x24928
+            Bc5Snorm                         = Bc5               | RSnorm | GSnorm | BSnorm | ASnorm,        // 0x124a8
+            Bc7UUnorm                        = Bc7U              | RUnorm | GUnorm | BUnorm | AUnorm,        // 0x24917
+            Bc7UUnormSrgb                    = Bc7U              | RUnorm | GUnorm | BUnorm | AUnorm | Srgb, // 0xa4917
+            Bc6HSf16Float                    = Bc6HSf16          | RFloat | GFloat | BFloat | AFloat,        // 0x7ff90
+            Bc6HUf16Float                    = Bc6HUf16          | RFloat | GFloat | BFloat | AFloat,        // 0x7ff91
+            Etc2RgbUnorm                     = Etc2Rgb           | RUnorm | GUnorm | BUnorm | AUnorm,        // 0x24906
+            Etc2RgbaUnorm                    = Etc2Rgba          | RUnorm | GUnorm | BUnorm | AUnorm,        // 0x2490b
+            Etc2RgbUnormSrgb                 = Etc2Rgb           | RUnorm | GUnorm | BUnorm | AUnorm | Srgb, // 0xa4906
+            Etc2RgbaUnormSrgb                = Etc2Rgba          | RUnorm | GUnorm | BUnorm | AUnorm | Srgb, // 0xa490b
+            Astc2D4x4Unorm                   = Astc2D4x4         | RUnorm | GUnorm | BUnorm | AUnorm,        // 0x24940
+            Astc2D5x4Unorm                   = Astc2D5x4         | RUnorm | GUnorm | BUnorm | AUnorm,        // 0x24950
+            Astc2D5x5Unorm                   = Astc2D5x5         | RUnorm | GUnorm | BUnorm | AUnorm,        // 0x24941
+            Astc2D6x5Unorm                   = Astc2D6x5         | RUnorm | GUnorm | BUnorm | AUnorm,        // 0x24951
+            Astc2D6x6Unorm                   = Astc2D6x6         | RUnorm | GUnorm | BUnorm | AUnorm,        // 0x24942
+            Astc2D8x5Unorm                   = Astc2D8x5         | RUnorm | GUnorm | BUnorm | AUnorm,        // 0x24955
+            Astc2D8x6Unorm                   = Astc2D8x6         | RUnorm | GUnorm | BUnorm | AUnorm,        // 0x24952
+            Astc2D8x8Unorm                   = Astc2D8x8         | RUnorm | GUnorm | BUnorm | AUnorm,        // 0x24944
+            Astc2D10x5Unorm                  = Astc2D10x5        | RUnorm | GUnorm | BUnorm | AUnorm,        // 0x24956
+            Astc2D10x6Unorm                  = Astc2D10x6        | RUnorm | GUnorm | BUnorm | AUnorm,        // 0x24957
+            Astc2D10x8Unorm                  = Astc2D10x8        | RUnorm | GUnorm | BUnorm | AUnorm,        // 0x24953
+            Astc2D10x10Unorm                 = Astc2D10x10       | RUnorm | GUnorm | BUnorm | AUnorm,        // 0x24945
+            Astc2D12x10Unorm                 = Astc2D12x10       | RUnorm | GUnorm | BUnorm | AUnorm,        // 0x24954
+            Astc2D12x12Unorm                 = Astc2D12x12       | RUnorm | GUnorm | BUnorm | AUnorm,        // 0x24946
+            Astc2D4x4UnormSrgb               = Astc2D4x4         | RUnorm | GUnorm | BUnorm | AUnorm | Srgb, // 0xa4940
+            Astc2D5x4UnormSrgb               = Astc2D5x4         | RUnorm | GUnorm | BUnorm | AUnorm | Srgb, // 0xa4950
+            Astc2D5x5UnormSrgb               = Astc2D5x5         | RUnorm | GUnorm | BUnorm | AUnorm | Srgb, // 0xa4941
+            Astc2D6x5UnormSrgb               = Astc2D6x5         | RUnorm | GUnorm | BUnorm | AUnorm | Srgb, // 0xa4951
+            Astc2D6x6UnormSrgb               = Astc2D6x6         | RUnorm | GUnorm | BUnorm | AUnorm | Srgb, // 0xa4942
+            Astc2D8x5UnormSrgb               = Astc2D8x5         | RUnorm | GUnorm | BUnorm | AUnorm | Srgb, // 0xa4955
+            Astc2D8x6UnormSrgb               = Astc2D8x6         | RUnorm | GUnorm | BUnorm | AUnorm | Srgb, // 0xa4952
+            Astc2D8x8UnormSrgb               = Astc2D8x8         | RUnorm | GUnorm | BUnorm | AUnorm | Srgb, // 0xa4944
+            Astc2D10x5UnormSrgb              = Astc2D10x5        | RUnorm | GUnorm | BUnorm | AUnorm | Srgb, // 0xa4956
+            Astc2D10x6UnormSrgb              = Astc2D10x6        | RUnorm | GUnorm | BUnorm | AUnorm | Srgb, // 0xa4957
+            Astc2D10x8UnormSrgb              = Astc2D10x8        | RUnorm | GUnorm | BUnorm | AUnorm | Srgb, // 0xa4953
+            Astc2D10x10UnormSrgb             = Astc2D10x10       | RUnorm | GUnorm | BUnorm | AUnorm | Srgb, // 0xa4945
+            Astc2D12x10UnormSrgb             = Astc2D12x10       | RUnorm | GUnorm | BUnorm | AUnorm | Srgb, // 0xa4954
+            Astc2D12x12UnormSrgb             = Astc2D12x12       | RUnorm | GUnorm | BUnorm | AUnorm | Srgb, // 0xa4946
+            A5B5G5R1Unorm                    = A5B5G5R1          | RUnorm | GUnorm | BUnorm | AUnorm,        // 0x24913
+        }
+
+        private enum VertexAttributeFormat : uint
+        {
+            // Width
+            R32G32B32A32 = 0x01,
+            R32G32B32 = 0x02,
+            R16G16B16A16 = 0x03,
+            R32G32 = 0x04,
+            R16G16B16 = 0x05,
+            A8B8G8R8 = 0x2f,
+            R8G8B8A8 = 0x0a,
+            X8B8G8R8 = 0x33,
+            A2B10G10R10 = 0x30,
+            B10G11R11 = 0x31,
+            R16G16 = 0x0f,
+            R32 = 0x12,
+            R8G8B8 = 0x13,
+            G8R8 = 0x32,
+            R8G8 = 0x18,
+            R16 = 0x1b,
+            R8 = 0x1d,
+            A8 = 0x34,
+
+            // Type
+            Snorm = 0x01,
+            Unorm = 0x02,
+            Sint = 0x03,
+            Uint = 0x04,
+            Uscaled = 0x05,
+            Sscaled = 0x06,
+            Float = 0x07,
+
+            // Combinations
+            R8Unorm             = (R8 << 21)           | (Unorm << 27),   // 0x13a00000
+            R8Snorm             = (R8 << 21)           | (Snorm << 27),   // 0x0ba00000
+            R8Uint              = (R8 << 21)           | (Uint << 27),    // 0x23a00000
+            R8Sint              = (R8 << 21)           | (Sint << 27),    // 0x1ba00000
+            R16Float            = (R16 << 21)          | (Float << 27),   // 0x3b600000
+            R16Unorm            = (R16 << 21)          | (Unorm << 27),   // 0x13600000
+            R16Snorm            = (R16 << 21)          | (Snorm << 27),   // 0x0b600000
+            R16Uint             = (R16 << 21)          | (Uint << 27),    // 0x23600000
+            R16Sint             = (R16 << 21)          | (Sint << 27),    // 0x1b600000
+            R32Float            = (R32 << 21)          | (Float << 27),   // 0x3a400000
+            R32Uint             = (R32 << 21)          | (Uint << 27),    // 0x22400000
+            R32Sint             = (R32 << 21)          | (Sint << 27),    // 0x1a400000
+            R8G8Unorm           = (R8G8 << 21)         | (Unorm << 27),   // 0x13000000
+            R8G8Snorm           = (R8G8 << 21)         | (Snorm << 27),   // 0x0b000000
+            R8G8Uint            = (R8G8 << 21)         | (Uint << 27),    // 0x23000000
+            R8G8Sint            = (R8G8 << 21)         | (Sint << 27),    // 0x1b000000
+            R16G16Float         = (R16G16 << 21)       | (Float << 27),   // 0x39e00000
+            R16G16Unorm         = (R16G16 << 21)       | (Unorm << 27),   // 0x11e00000
+            R16G16Snorm         = (R16G16 << 21)       | (Snorm << 27),   // 0x09e00000
+            R16G16Uint          = (R16G16 << 21)       | (Uint << 27),    // 0x21e00000
+            R16G16Sint          = (R16G16 << 21)       | (Sint << 27),    // 0x19e00000
+            R32G32Float         = (R32G32 << 21)       | (Float << 27),   // 0x38800000
+            R32G32Uint          = (R32G32 << 21)       | (Uint << 27),    // 0x20800000
+            R32G32Sint          = (R32G32 << 21)       | (Sint << 27),    // 0x18800000
+            R8G8B8Unorm         = (R8G8B8 << 21)       | (Unorm << 27),   // 0x12600000
+            R8G8B8Snorm         = (R8G8B8 << 21)       | (Snorm << 27),   // 0x0a600000
+            R8G8B8Uint          = (R8G8B8 << 21)       | (Uint << 27),    // 0x22600000
+            R8G8B8Sint          = (R8G8B8 << 21)       | (Sint << 27),    // 0x1a600000
+            R16G16B16Float      = (R16G16B16 << 21)    | (Float << 27),   // 0x38a00000
+            R16G16B16Unorm      = (R16G16B16 << 21)    | (Unorm << 27),   // 0x10a00000
+            R16G16B16Snorm      = (R16G16B16 << 21)    | (Snorm << 27),   // 0x08a00000
+            R16G16B16Uint       = (R16G16B16 << 21)    | (Uint << 27),    // 0x20a00000
+            R16G16B16Sint       = (R16G16B16 << 21)    | (Sint << 27),    // 0x18a00000
+            R32G32B32Float      = (R32G32B32 << 21)    | (Float << 27),   // 0x38400000
+            R32G32B32Uint       = (R32G32B32 << 21)    | (Uint << 27),    // 0x20400000
+            R32G32B32Sint       = (R32G32B32 << 21)    | (Sint << 27),    // 0x18400000
+            R8G8B8A8Unorm       = (R8G8B8A8 << 21)     | (Unorm << 27),   // 0x11400000
+            R8G8B8A8Snorm       = (R8G8B8A8 << 21)     | (Snorm << 27),   // 0x09400000
+            R8G8B8A8Uint        = (R8G8B8A8 << 21)     | (Uint << 27),    // 0x21400000
+            R8G8B8A8Sint        = (R8G8B8A8 << 21)     | (Sint << 27),    // 0x19400000
+            R16G16B16A16Float   = (R16G16B16A16 << 21) | (Float << 27),   // 0x38600000
+            R16G16B16A16Unorm   = (R16G16B16A16 << 21) | (Unorm << 27),   // 0x10600000
+            R16G16B16A16Snorm   = (R16G16B16A16 << 21) | (Snorm << 27),   // 0x08600000
+            R16G16B16A16Uint    = (R16G16B16A16 << 21) | (Uint << 27),    // 0x20600000
+            R16G16B16A16Sint    = (R16G16B16A16 << 21) | (Sint << 27),    // 0x18600000
+            R32G32B32A32Float   = (R32G32B32A32 << 21) | (Float << 27),   // 0x38200000
+            R32G32B32A32Uint    = (R32G32B32A32 << 21) | (Uint << 27),    // 0x20200000
+            R32G32B32A32Sint    = (R32G32B32A32 << 21) | (Sint << 27),    // 0x18200000
+            A2B10G10R10Unorm    = (A2B10G10R10 << 21)  | (Unorm << 27),   // 0x16000000
+            A2B10G10R10Uint     = (A2B10G10R10 << 21)  | (Uint << 27),    // 0x26000000
+            B10G11R11Float      = (B10G11R11 << 21)    | (Float << 27),   // 0x3e200000
+            R8Uscaled           = (R8 << 21)           | (Uscaled << 27), // 0x2ba00000
+            R8Sscaled           = (R8 << 21)           | (Sscaled << 27), // 0x33a00000
+            R16Uscaled          = (R16 << 21)          | (Uscaled << 27), // 0x2b600000
+            R16Sscaled          = (R16 << 21)          | (Sscaled << 27), // 0x33600000
+            R32Uscaled          = (R32 << 21)          | (Uscaled << 27), // 0x2a400000
+            R32Sscaled          = (R32 << 21)          | (Sscaled << 27), // 0x32400000
+            R8G8Uscaled         = (R8G8 << 21)         | (Uscaled << 27), // 0x2b000000
+            R8G8Sscaled         = (R8G8 << 21)         | (Sscaled << 27), // 0x33000000
+            R16G16Uscaled       = (R16G16 << 21)       | (Uscaled << 27), // 0x29e00000
+            R16G16Sscaled       = (R16G16 << 21)       | (Sscaled << 27), // 0x31e00000
+            R32G32Uscaled       = (R32G32 << 21)       | (Uscaled << 27), // 0x28800000
+            R32G32Sscaled       = (R32G32 << 21)       | (Sscaled << 27), // 0x30800000
+            R8G8B8Uscaled       = (R8G8B8 << 21)       | (Uscaled << 27), // 0x2a600000
+            R8G8B8Sscaled       = (R8G8B8 << 21)       | (Sscaled << 27), // 0x32600000
+            R16G16B16Uscaled    = (R16G16B16 << 21)    | (Uscaled << 27), // 0x28a00000
+            R16G16B16Sscaled    = (R16G16B16 << 21)    | (Sscaled << 27), // 0x30a00000
+            R32G32B32Uscaled    = (R32G32B32 << 21)    | (Uscaled << 27), // 0x28400000
+            R32G32B32Sscaled    = (R32G32B32 << 21)    | (Sscaled << 27), // 0x30400000
+            R8G8B8A8Uscaled     = (R8G8B8A8 << 21)     | (Uscaled << 27), // 0x29400000
+            R8G8B8A8Sscaled     = (R8G8B8A8 << 21)     | (Sscaled << 27), // 0x31400000
+            R16G16B16A16Uscaled = (R16G16B16A16 << 21) | (Uscaled << 27), // 0x28600000
+            R16G16B16A16Sscaled = (R16G16B16A16 << 21) | (Sscaled << 27), // 0x30600000
+            R32G32B32A32Uscaled = (R32G32B32A32 << 21) | (Uscaled << 27), // 0x28200000
+            R32G32B32A32Sscaled = (R32G32B32A32 << 21) | (Sscaled << 27), // 0x30200000
+            A2B10G10R10Snorm    = (A2B10G10R10 << 21)  | (Snorm << 27),   // 0x0e000000
+            A2B10G10R10Sint     = (A2B10G10R10 << 21)  | (Sint << 27),    // 0x1e000000
+            A2B10G10R10Uscaled  = (A2B10G10R10 << 21)  | (Uscaled << 27), // 0x2e000000
+            A2B10G10R10Sscaled  = (A2B10G10R10 << 21)  | (Sscaled << 27), // 0x36000000
+        }
+
+        private static readonly Dictionary<TextureFormat, FormatInfo> _textureFormats = new Dictionary<TextureFormat, FormatInfo>()
+        {
+            { TextureFormat.R8Unorm,                          new FormatInfo(Format.R8Unorm,           1,  1,  1,  1) },
+            { TextureFormat.R8Snorm,                          new FormatInfo(Format.R8Snorm,           1,  1,  1,  1) },
+            { TextureFormat.R8Uint,                           new FormatInfo(Format.R8Uint,            1,  1,  1,  1) },
+            { TextureFormat.R8Sint,                           new FormatInfo(Format.R8Sint,            1,  1,  1,  1) },
+            { TextureFormat.R16Float,                         new FormatInfo(Format.R16Float,          1,  1,  2,  1) },
+            { TextureFormat.R16Unorm,                         new FormatInfo(Format.R16Unorm,          1,  1,  2,  1) },
+            { TextureFormat.R16Snorm,                         new FormatInfo(Format.R16Snorm,          1,  1,  2,  1) },
+            { TextureFormat.R16Uint,                          new FormatInfo(Format.R16Uint,           1,  1,  2,  1) },
+            { TextureFormat.R16Sint,                          new FormatInfo(Format.R16Sint,           1,  1,  2,  1) },
+            { TextureFormat.R32Float,                         new FormatInfo(Format.R32Float,          1,  1,  4,  1) },
+            { TextureFormat.R32Uint,                          new FormatInfo(Format.R32Uint,           1,  1,  4,  1) },
+            { TextureFormat.R32Sint,                          new FormatInfo(Format.R32Sint,           1,  1,  4,  1) },
+            { TextureFormat.G8R8Unorm,                        new FormatInfo(Format.R8G8Unorm,         1,  1,  2,  2) },
+            { TextureFormat.G8R8Snorm,                        new FormatInfo(Format.R8G8Snorm,         1,  1,  2,  2) },
+            { TextureFormat.G8R8Uint,                         new FormatInfo(Format.R8G8Uint,          1,  1,  2,  2) },
+            { TextureFormat.G8R8Sint,                         new FormatInfo(Format.R8G8Sint,          1,  1,  2,  2) },
+            { TextureFormat.R16G16Float,                      new FormatInfo(Format.R16G16Float,       1,  1,  4,  2) },
+            { TextureFormat.R16G16Unorm,                      new FormatInfo(Format.R16G16Unorm,       1,  1,  4,  2) },
+            { TextureFormat.R16G16Snorm,                      new FormatInfo(Format.R16G16Snorm,       1,  1,  4,  2) },
+            { TextureFormat.R16G16Uint,                       new FormatInfo(Format.R16G16Uint,        1,  1,  4,  2) },
+            { TextureFormat.R16G16Sint,                       new FormatInfo(Format.R16G16Sint,        1,  1,  4,  2) },
+            { TextureFormat.R32G32Float,                      new FormatInfo(Format.R32G32Float,       1,  1,  8,  2) },
+            { TextureFormat.R32G32Uint,                       new FormatInfo(Format.R32G32Uint,        1,  1,  8,  2) },
+            { TextureFormat.R32G32Sint,                       new FormatInfo(Format.R32G32Sint,        1,  1,  8,  2) },
+            { TextureFormat.R32G32B32Float,                   new FormatInfo(Format.R32G32B32Float,    1,  1,  12, 3) },
+            { TextureFormat.R32G32B32Uint,                    new FormatInfo(Format.R32G32B32Uint,     1,  1,  12, 3) },
+            { TextureFormat.R32G32B32Sint,                    new FormatInfo(Format.R32G32B32Sint,     1,  1,  12, 3) },
+            { TextureFormat.A8B8G8R8Unorm,                    new FormatInfo(Format.R8G8B8A8Unorm,     1,  1,  4,  4) },
+            { TextureFormat.A8B8G8R8Snorm,                    new FormatInfo(Format.R8G8B8A8Snorm,     1,  1,  4,  4) },
+            { TextureFormat.A8B8G8R8Uint,                     new FormatInfo(Format.R8G8B8A8Uint,      1,  1,  4,  4) },
+            { TextureFormat.A8B8G8R8Sint,                     new FormatInfo(Format.R8G8B8A8Sint,      1,  1,  4,  4) },
+            { TextureFormat.R16G16B16A16Float,                new FormatInfo(Format.R16G16B16A16Float, 1,  1,  8,  4) },
+            { TextureFormat.R16G16B16A16Unorm,                new FormatInfo(Format.R16G16B16A16Unorm, 1,  1,  8,  4) },
+            { TextureFormat.R16G16B16A16Snorm,                new FormatInfo(Format.R16G16B16A16Snorm, 1,  1,  8,  4) },
+            { TextureFormat.R16G16B16A16Uint,                 new FormatInfo(Format.R16G16B16A16Uint,  1,  1,  8,  4) },
+            { TextureFormat.R16G16B16A16Sint,                 new FormatInfo(Format.R16G16B16A16Sint,  1,  1,  8,  4) },
+            { TextureFormat.R32G32B32A32Float,                new FormatInfo(Format.R32G32B32A32Float, 1,  1,  16, 4) },
+            { TextureFormat.R32G32B32A32Uint,                 new FormatInfo(Format.R32G32B32A32Uint,  1,  1,  16, 4) },
+            { TextureFormat.R32G32B32A32Sint,                 new FormatInfo(Format.R32G32B32A32Sint,  1,  1,  16, 4) },
+            { TextureFormat.Z16Unorm,                         new FormatInfo(Format.D16Unorm,          1,  1,  2,  1) },
+            { TextureFormat.Zf32RFloatGUintBUintAUint,        new FormatInfo(Format.D32Float,          1,  1,  4,  1) },
+            { TextureFormat.Zf32Float,                        new FormatInfo(Format.D32Float,          1,  1,  4,  1) },
+            { TextureFormat.G24R8RUintGUnormBUnormAUnorm,     new FormatInfo(Format.D24UnormS8Uint,    1,  1,  4,  2) },
+            { TextureFormat.Z24S8RUintGUnormBUnormAUnorm,     new FormatInfo(Format.D24UnormS8Uint,    1,  1,  4,  2) },
+            { TextureFormat.Z24S8RUintGUnormBUintAUint,       new FormatInfo(Format.D24UnormS8Uint,    1,  1,  4,  2) },
+            { TextureFormat.S8Z24RUnormGUintBUintAUint,       new FormatInfo(Format.S8UintD24Unorm,    1,  1,  4,  2) },
+            { TextureFormat.R32B24G8RFloatGUintBUnormAUnorm,  new FormatInfo(Format.D32FloatS8Uint,    1,  1,  8,  2) },
+            { TextureFormat.Zf32X24S8RFloatGUintBUnormAUnorm, new FormatInfo(Format.D32FloatS8Uint,    1,  1,  8,  2) },
+            { TextureFormat.A8B8G8R8UnormSrgb,                new FormatInfo(Format.R8G8B8A8Srgb,      1,  1,  4,  4) },
+            { TextureFormat.G4R4Unorm,                        new FormatInfo(Format.R4G4Unorm,         1,  1,  1,  2) },
+            { TextureFormat.A4B4G4R4Unorm,                    new FormatInfo(Format.R4G4B4A4Unorm,     1,  1,  2,  4) },
+            { TextureFormat.A1B5G5R5Unorm,                    new FormatInfo(Format.R5G5B5A1Unorm,     1,  1,  2,  4) },
+            { TextureFormat.B5G6R5Unorm,                      new FormatInfo(Format.R5G6B5Unorm,       1,  1,  2,  3) },
+            { TextureFormat.A2B10G10R10Unorm,                 new FormatInfo(Format.R10G10B10A2Unorm,  1,  1,  4,  4) },
+            { TextureFormat.A2B10G10R10Uint,                  new FormatInfo(Format.R10G10B10A2Uint,   1,  1,  4,  4) },
+            { TextureFormat.Bf10Gf11Rf11Float,                new FormatInfo(Format.R11G11B10Float,    1,  1,  4,  3) },
+            { TextureFormat.E5B9G9R9SharedExpFloat,           new FormatInfo(Format.R9G9B9E5Float,     1,  1,  4,  4) },
+            { TextureFormat.Bc1Unorm,                         new FormatInfo(Format.Bc1RgbaUnorm,      4,  4,  8,  4) },
+            { TextureFormat.Bc2Unorm,                         new FormatInfo(Format.Bc2Unorm,          4,  4,  16, 4) },
+            { TextureFormat.Bc3Unorm,                         new FormatInfo(Format.Bc3Unorm,          4,  4,  16, 4) },
+            { TextureFormat.Bc1UnormSrgb,                     new FormatInfo(Format.Bc1RgbaSrgb,       4,  4,  8,  4) },
+            { TextureFormat.Bc2UnormSrgb,                     new FormatInfo(Format.Bc2Srgb,           4,  4,  16, 4) },
+            { TextureFormat.Bc3UnormSrgb,                     new FormatInfo(Format.Bc3Srgb,           4,  4,  16, 4) },
+            { TextureFormat.Bc4Unorm,                         new FormatInfo(Format.Bc4Unorm,          4,  4,  8,  1) },
+            { TextureFormat.Bc4Snorm,                         new FormatInfo(Format.Bc4Snorm,          4,  4,  8,  1) },
+            { TextureFormat.Bc5Unorm,                         new FormatInfo(Format.Bc5Unorm,          4,  4,  16, 2) },
+            { TextureFormat.Bc5Snorm,                         new FormatInfo(Format.Bc5Snorm,          4,  4,  16, 2) },
+            { TextureFormat.Bc7UUnorm,                        new FormatInfo(Format.Bc7Unorm,          4,  4,  16, 4) },
+            { TextureFormat.Bc7UUnormSrgb,                    new FormatInfo(Format.Bc7Srgb,           4,  4,  16, 4) },
+            { TextureFormat.Bc6HSf16Float,                    new FormatInfo(Format.Bc6HSfloat,        4,  4,  16, 4) },
+            { TextureFormat.Bc6HUf16Float,                    new FormatInfo(Format.Bc6HUfloat,        4,  4,  16, 4) },
+            { TextureFormat.Etc2RgbUnorm,                     new FormatInfo(Format.Etc2RgbUnorm,      4,  4,  8,  3) },
+            { TextureFormat.Etc2RgbaUnorm,                    new FormatInfo(Format.Etc2RgbaUnorm,     4,  4,  16, 4) },
+            { TextureFormat.Etc2RgbUnormSrgb,                 new FormatInfo(Format.Etc2RgbSrgb,       4,  4,  8,  3) },
+            { TextureFormat.Etc2RgbaUnormSrgb,                new FormatInfo(Format.Etc2RgbaSrgb,      4,  4,  16, 4) },
+            { TextureFormat.Astc2D4x4Unorm,                   new FormatInfo(Format.Astc4x4Unorm,      4,  4,  16, 4) },
+            { TextureFormat.Astc2D5x4Unorm,                   new FormatInfo(Format.Astc5x4Unorm,      5,  4,  16, 4) },
+            { TextureFormat.Astc2D5x5Unorm,                   new FormatInfo(Format.Astc5x5Unorm,      5,  5,  16, 4) },
+            { TextureFormat.Astc2D6x5Unorm,                   new FormatInfo(Format.Astc6x5Unorm,      6,  5,  16, 4) },
+            { TextureFormat.Astc2D6x6Unorm,                   new FormatInfo(Format.Astc6x6Unorm,      6,  6,  16, 4) },
+            { TextureFormat.Astc2D8x5Unorm,                   new FormatInfo(Format.Astc8x5Unorm,      8,  5,  16, 4) },
+            { TextureFormat.Astc2D8x6Unorm,                   new FormatInfo(Format.Astc8x6Unorm,      8,  6,  16, 4) },
+            { TextureFormat.Astc2D8x8Unorm,                   new FormatInfo(Format.Astc8x8Unorm,      8,  8,  16, 4) },
+            { TextureFormat.Astc2D10x5Unorm,                  new FormatInfo(Format.Astc10x5Unorm,     10, 5,  16, 4) },
+            { TextureFormat.Astc2D10x6Unorm,                  new FormatInfo(Format.Astc10x6Unorm,     10, 6,  16, 4) },
+            { TextureFormat.Astc2D10x8Unorm,                  new FormatInfo(Format.Astc10x8Unorm,     10, 8,  16, 4) },
+            { TextureFormat.Astc2D10x10Unorm,                 new FormatInfo(Format.Astc10x10Unorm,    10, 10, 16, 4) },
+            { TextureFormat.Astc2D12x10Unorm,                 new FormatInfo(Format.Astc12x10Unorm,    12, 10, 16, 4) },
+            { TextureFormat.Astc2D12x12Unorm,                 new FormatInfo(Format.Astc12x12Unorm,    12, 12, 16, 4) },
+            { TextureFormat.Astc2D4x4UnormSrgb,               new FormatInfo(Format.Astc4x4Srgb,       4,  4,  16, 4) },
+            { TextureFormat.Astc2D5x4UnormSrgb,               new FormatInfo(Format.Astc5x4Srgb,       5,  4,  16, 4) },
+            { TextureFormat.Astc2D5x5UnormSrgb,               new FormatInfo(Format.Astc5x5Srgb,       5,  5,  16, 4) },
+            { TextureFormat.Astc2D6x5UnormSrgb,               new FormatInfo(Format.Astc6x5Srgb,       6,  5,  16, 4) },
+            { TextureFormat.Astc2D6x6UnormSrgb,               new FormatInfo(Format.Astc6x6Srgb,       6,  6,  16, 4) },
+            { TextureFormat.Astc2D8x5UnormSrgb,               new FormatInfo(Format.Astc8x5Srgb,       8,  5,  16, 4) },
+            { TextureFormat.Astc2D8x6UnormSrgb,               new FormatInfo(Format.Astc8x6Srgb,       8,  6,  16, 4) },
+            { TextureFormat.Astc2D8x8UnormSrgb,               new FormatInfo(Format.Astc8x8Srgb,       8,  8,  16, 4) },
+            { TextureFormat.Astc2D10x5UnormSrgb,              new FormatInfo(Format.Astc10x5Srgb,      10, 5,  16, 4) },
+            { TextureFormat.Astc2D10x6UnormSrgb,              new FormatInfo(Format.Astc10x6Srgb,      10, 6,  16, 4) },
+            { TextureFormat.Astc2D10x8UnormSrgb,              new FormatInfo(Format.Astc10x8Srgb,      10, 8,  16, 4) },
+            { TextureFormat.Astc2D10x10UnormSrgb,             new FormatInfo(Format.Astc10x10Srgb,     10, 10, 16, 4) },
+            { TextureFormat.Astc2D12x10UnormSrgb,             new FormatInfo(Format.Astc12x10Srgb,     12, 10, 16, 4) },
+            { TextureFormat.Astc2D12x12UnormSrgb,             new FormatInfo(Format.Astc12x12Srgb,     12, 12, 16, 4) },
+            { TextureFormat.A5B5G5R1Unorm,                    new FormatInfo(Format.A1B5G5R5Unorm,     1,  1,  2,  4) }
         };
 
-        private static Dictionary<ulong, Format> _attribFormats = new Dictionary<ulong, Format>()
+        private static readonly Dictionary<VertexAttributeFormat, Format> _attribFormats = new Dictionary<VertexAttributeFormat, Format>()
         {
-            { 0x13a00000, Format.R8Unorm             },
-            { 0x0ba00000, Format.R8Snorm             },
-            { 0x23a00000, Format.R8Uint              },
-            { 0x1ba00000, Format.R8Sint              },
-            { 0x3b600000, Format.R16Float            },
-            { 0x13600000, Format.R16Unorm            },
-            { 0x0b600000, Format.R16Snorm            },
-            { 0x23600000, Format.R16Uint             },
-            { 0x1b600000, Format.R16Sint             },
-            { 0x3a400000, Format.R32Float            },
-            { 0x22400000, Format.R32Uint             },
-            { 0x1a400000, Format.R32Sint             },
-            { 0x13000000, Format.R8G8Unorm           },
-            { 0x0b000000, Format.R8G8Snorm           },
-            { 0x23000000, Format.R8G8Uint            },
-            { 0x1b000000, Format.R8G8Sint            },
-            { 0x39e00000, Format.R16G16Float         },
-            { 0x11e00000, Format.R16G16Unorm         },
-            { 0x09e00000, Format.R16G16Snorm         },
-            { 0x21e00000, Format.R16G16Uint          },
-            { 0x19e00000, Format.R16G16Sint          },
-            { 0x38800000, Format.R32G32Float         },
-            { 0x20800000, Format.R32G32Uint          },
-            { 0x18800000, Format.R32G32Sint          },
-            { 0x12600000, Format.R8G8B8Unorm         },
-            { 0x0a600000, Format.R8G8B8Snorm         },
-            { 0x22600000, Format.R8G8B8Uint          },
-            { 0x1a600000, Format.R8G8B8Sint          },
-            { 0x38a00000, Format.R16G16B16Float      },
-            { 0x10a00000, Format.R16G16B16Unorm      },
-            { 0x08a00000, Format.R16G16B16Snorm      },
-            { 0x20a00000, Format.R16G16B16Uint       },
-            { 0x18a00000, Format.R16G16B16Sint       },
-            { 0x38400000, Format.R32G32B32Float      },
-            { 0x20400000, Format.R32G32B32Uint       },
-            { 0x18400000, Format.R32G32B32Sint       },
-            { 0x11400000, Format.R8G8B8A8Unorm       },
-            { 0x09400000, Format.R8G8B8A8Snorm       },
-            { 0x21400000, Format.R8G8B8A8Uint        },
-            { 0x19400000, Format.R8G8B8A8Sint        },
-            { 0x38600000, Format.R16G16B16A16Float   },
-            { 0x10600000, Format.R16G16B16A16Unorm   },
-            { 0x08600000, Format.R16G16B16A16Snorm   },
-            { 0x20600000, Format.R16G16B16A16Uint    },
-            { 0x18600000, Format.R16G16B16A16Sint    },
-            { 0x38200000, Format.R32G32B32A32Float   },
-            { 0x20200000, Format.R32G32B32A32Uint    },
-            { 0x18200000, Format.R32G32B32A32Sint    },
-            { 0x16000000, Format.R10G10B10A2Unorm    },
-            { 0x26000000, Format.R10G10B10A2Uint     },
-            { 0x3e200000, Format.R11G11B10Float      },
-            { 0x2ba00000, Format.R8Uscaled           },
-            { 0x33a00000, Format.R8Sscaled           },
-            { 0x2b600000, Format.R16Uscaled          },
-            { 0x33600000, Format.R16Sscaled          },
-            { 0x2a400000, Format.R32Uscaled          },
-            { 0x32400000, Format.R32Sscaled          },
-            { 0x2b000000, Format.R8G8Uscaled         },
-            { 0x33000000, Format.R8G8Sscaled         },
-            { 0x29e00000, Format.R16G16Uscaled       },
-            { 0x31e00000, Format.R16G16Sscaled       },
-            { 0x28800000, Format.R32G32Uscaled       },
-            { 0x30800000, Format.R32G32Sscaled       },
-            { 0x2a600000, Format.R8G8B8Uscaled       },
-            { 0x32600000, Format.R8G8B8Sscaled       },
-            { 0x28a00000, Format.R16G16B16Uscaled    },
-            { 0x30a00000, Format.R16G16B16Sscaled    },
-            { 0x28400000, Format.R32G32B32Uscaled    },
-            { 0x30400000, Format.R32G32B32Sscaled    },
-            { 0x29400000, Format.R8G8B8A8Uscaled     },
-            { 0x31400000, Format.R8G8B8A8Sscaled     },
-            { 0x28600000, Format.R16G16B16A16Uscaled },
-            { 0x30600000, Format.R16G16B16A16Sscaled },
-            { 0x28200000, Format.R32G32B32A32Uscaled },
-            { 0x30200000, Format.R32G32B32A32Sscaled },
-            { 0x0e000000, Format.R10G10B10A2Snorm    },
-            { 0x1e000000, Format.R10G10B10A2Sint     },
-            { 0x2e000000, Format.R10G10B10A2Uscaled  },
-            { 0x36000000, Format.R10G10B10A2Sscaled  }
+            { VertexAttributeFormat.R8Unorm,             Format.R8Unorm             },
+            { VertexAttributeFormat.R8Snorm,             Format.R8Snorm             },
+            { VertexAttributeFormat.R8Uint,              Format.R8Uint              },
+            { VertexAttributeFormat.R8Sint,              Format.R8Sint              },
+            { VertexAttributeFormat.R16Float,            Format.R16Float            },
+            { VertexAttributeFormat.R16Unorm,            Format.R16Unorm            },
+            { VertexAttributeFormat.R16Snorm,            Format.R16Snorm            },
+            { VertexAttributeFormat.R16Uint,             Format.R16Uint             },
+            { VertexAttributeFormat.R16Sint,             Format.R16Sint             },
+            { VertexAttributeFormat.R32Float,            Format.R32Float            },
+            { VertexAttributeFormat.R32Uint,             Format.R32Uint             },
+            { VertexAttributeFormat.R32Sint,             Format.R32Sint             },
+            { VertexAttributeFormat.R8G8Unorm,           Format.R8G8Unorm           },
+            { VertexAttributeFormat.R8G8Snorm,           Format.R8G8Snorm           },
+            { VertexAttributeFormat.R8G8Uint,            Format.R8G8Uint            },
+            { VertexAttributeFormat.R8G8Sint,            Format.R8G8Sint            },
+            { VertexAttributeFormat.R16G16Float,         Format.R16G16Float         },
+            { VertexAttributeFormat.R16G16Unorm,         Format.R16G16Unorm         },
+            { VertexAttributeFormat.R16G16Snorm,         Format.R16G16Snorm         },
+            { VertexAttributeFormat.R16G16Uint,          Format.R16G16Uint          },
+            { VertexAttributeFormat.R16G16Sint,          Format.R16G16Sint          },
+            { VertexAttributeFormat.R32G32Float,         Format.R32G32Float         },
+            { VertexAttributeFormat.R32G32Uint,          Format.R32G32Uint          },
+            { VertexAttributeFormat.R32G32Sint,          Format.R32G32Sint          },
+            { VertexAttributeFormat.R8G8B8Unorm,         Format.R8G8B8Unorm         },
+            { VertexAttributeFormat.R8G8B8Snorm,         Format.R8G8B8Snorm         },
+            { VertexAttributeFormat.R8G8B8Uint,          Format.R8G8B8Uint          },
+            { VertexAttributeFormat.R8G8B8Sint,          Format.R8G8B8Sint          },
+            { VertexAttributeFormat.R16G16B16Float,      Format.R16G16B16Float      },
+            { VertexAttributeFormat.R16G16B16Unorm,      Format.R16G16B16Unorm      },
+            { VertexAttributeFormat.R16G16B16Snorm,      Format.R16G16B16Snorm      },
+            { VertexAttributeFormat.R16G16B16Uint,       Format.R16G16B16Uint       },
+            { VertexAttributeFormat.R16G16B16Sint,       Format.R16G16B16Sint       },
+            { VertexAttributeFormat.R32G32B32Float,      Format.R32G32B32Float      },
+            { VertexAttributeFormat.R32G32B32Uint,       Format.R32G32B32Uint       },
+            { VertexAttributeFormat.R32G32B32Sint,       Format.R32G32B32Sint       },
+            { VertexAttributeFormat.R8G8B8A8Unorm,       Format.R8G8B8A8Unorm       },
+            { VertexAttributeFormat.R8G8B8A8Snorm,       Format.R8G8B8A8Snorm       },
+            { VertexAttributeFormat.R8G8B8A8Uint,        Format.R8G8B8A8Uint        },
+            { VertexAttributeFormat.R8G8B8A8Sint,        Format.R8G8B8A8Sint        },
+            { VertexAttributeFormat.R16G16B16A16Float,   Format.R16G16B16A16Float   },
+            { VertexAttributeFormat.R16G16B16A16Unorm,   Format.R16G16B16A16Unorm   },
+            { VertexAttributeFormat.R16G16B16A16Snorm,   Format.R16G16B16A16Snorm   },
+            { VertexAttributeFormat.R16G16B16A16Uint,    Format.R16G16B16A16Uint    },
+            { VertexAttributeFormat.R16G16B16A16Sint,    Format.R16G16B16A16Sint    },
+            { VertexAttributeFormat.R32G32B32A32Float,   Format.R32G32B32A32Float   },
+            { VertexAttributeFormat.R32G32B32A32Uint,    Format.R32G32B32A32Uint    },
+            { VertexAttributeFormat.R32G32B32A32Sint,    Format.R32G32B32A32Sint    },
+            { VertexAttributeFormat.A2B10G10R10Unorm,    Format.R10G10B10A2Unorm    },
+            { VertexAttributeFormat.A2B10G10R10Uint,     Format.R10G10B10A2Uint     },
+            { VertexAttributeFormat.B10G11R11Float,      Format.R11G11B10Float      },
+            { VertexAttributeFormat.R8Uscaled,           Format.R8Uscaled           },
+            { VertexAttributeFormat.R8Sscaled,           Format.R8Sscaled           },
+            { VertexAttributeFormat.R16Uscaled,          Format.R16Uscaled          },
+            { VertexAttributeFormat.R16Sscaled,          Format.R16Sscaled          },
+            { VertexAttributeFormat.R32Uscaled,          Format.R32Uscaled          },
+            { VertexAttributeFormat.R32Sscaled,          Format.R32Sscaled          },
+            { VertexAttributeFormat.R8G8Uscaled,         Format.R8G8Uscaled         },
+            { VertexAttributeFormat.R8G8Sscaled,         Format.R8G8Sscaled         },
+            { VertexAttributeFormat.R16G16Uscaled,       Format.R16G16Uscaled       },
+            { VertexAttributeFormat.R16G16Sscaled,       Format.R16G16Sscaled       },
+            { VertexAttributeFormat.R32G32Uscaled,       Format.R32G32Uscaled       },
+            { VertexAttributeFormat.R32G32Sscaled,       Format.R32G32Sscaled       },
+            { VertexAttributeFormat.R8G8B8Uscaled,       Format.R8G8B8Uscaled       },
+            { VertexAttributeFormat.R8G8B8Sscaled,       Format.R8G8B8Sscaled       },
+            { VertexAttributeFormat.R16G16B16Uscaled,    Format.R16G16B16Uscaled    },
+            { VertexAttributeFormat.R16G16B16Sscaled,    Format.R16G16B16Sscaled    },
+            { VertexAttributeFormat.R32G32B32Uscaled,    Format.R32G32B32Uscaled    },
+            { VertexAttributeFormat.R32G32B32Sscaled,    Format.R32G32B32Sscaled    },
+            { VertexAttributeFormat.R8G8B8A8Uscaled,     Format.R8G8B8A8Uscaled     },
+            { VertexAttributeFormat.R8G8B8A8Sscaled,     Format.R8G8B8A8Sscaled     },
+            { VertexAttributeFormat.R16G16B16A16Uscaled, Format.R16G16B16A16Uscaled },
+            { VertexAttributeFormat.R16G16B16A16Sscaled, Format.R16G16B16A16Sscaled },
+            { VertexAttributeFormat.R32G32B32A32Uscaled, Format.R32G32B32A32Uscaled },
+            { VertexAttributeFormat.R32G32B32A32Sscaled, Format.R32G32B32A32Sscaled },
+            { VertexAttributeFormat.A2B10G10R10Snorm,    Format.R10G10B10A2Snorm    },
+            { VertexAttributeFormat.A2B10G10R10Sint,     Format.R10G10B10A2Sint     },
+            { VertexAttributeFormat.A2B10G10R10Uscaled,  Format.R10G10B10A2Uscaled  },
+            { VertexAttributeFormat.A2B10G10R10Sscaled,  Format.R10G10B10A2Sscaled  }
         };
 
         /// <summary>
@@ -210,7 +557,7 @@ namespace Ryujinx.Graphics.Gpu.Image
         {
             encoded |= (isSrgb ? 1u << 19 : 0u);
 
-            return _textureFormats.TryGetValue(encoded, out format);
+            return _textureFormats.TryGetValue((TextureFormat)encoded, out format);
         }
 
         /// <summary>
@@ -221,7 +568,7 @@ namespace Ryujinx.Graphics.Gpu.Image
         /// <returns>True if the format is valid, false otherwise</returns>
         public static bool TryGetAttribFormat(uint encoded, out Format format)
         {
-            return _attribFormats.TryGetValue(encoded, out format);
+            return _attribFormats.TryGetValue((VertexAttributeFormat)encoded, out format);
         }
     }
 }

Ryujinx.HLE/HOS/Kernel/Memory/KMemoryBlock.cs

@@ -1,42 +1,43 @@
+using Ryujinx.Common.Collections;
 using System;
 
 namespace Ryujinx.HLE.HOS.Kernel.Memory
 {
-    class KMemoryBlock
+    class KMemoryBlock : IntrusiveRedBlackTreeNode<KMemoryBlock>, IComparable<KMemoryBlock>, IComparable<ulong>
     {
         public ulong BaseAddress { get; private set; }
-        public ulong PagesCount  { get; private set; }
+        public ulong PagesCount { get; private set; }
 
-        public MemoryState      State            { get; private set; }
-        public KMemoryPermission Permission       { get; private set; }
-        public MemoryAttribute  Attribute        { get; private set; }
+        public MemoryState State { get; private set; }
+        public KMemoryPermission Permission { get; private set; }
+        public MemoryAttribute Attribute { get; private set; }
         public KMemoryPermission SourcePermission { get; private set; }
 
-        public int IpcRefCount    { get; private set; }
+        public int IpcRefCount { get; private set; }
         public int DeviceRefCount { get; private set; }
 
         public KMemoryBlock(
-            ulong            baseAddress,
-            ulong            pagesCount,
-            MemoryState      state,
+            ulong baseAddress,
+            ulong pagesCount,
+            MemoryState state,
             KMemoryPermission permission,
-            MemoryAttribute  attribute,
-            int              ipcRefCount    = 0,
-            int              deviceRefCount = 0)
+            MemoryAttribute attribute,
+            int ipcRefCount = 0,
+            int deviceRefCount = 0)
         {
-            BaseAddress    = baseAddress;
-            PagesCount     = pagesCount;
-            State          = state;
-            Attribute      = attribute;
-            Permission     = permission;
-            IpcRefCount    = ipcRefCount;
+            BaseAddress = baseAddress;
+            PagesCount = pagesCount;
+            State = state;
+            Attribute = attribute;
+            Permission = permission;
+            IpcRefCount = ipcRefCount;
             DeviceRefCount = deviceRefCount;
         }
 
         public void SetState(KMemoryPermission permission, MemoryState state, MemoryAttribute attribute)
         {
             Permission = permission;
-            State      = state;
+            State = state;
             Attribute &= MemoryAttribute.IpcAndDeviceMapped;
             Attribute |= attribute;
         }
@@ -55,7 +56,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
                 SourcePermission = Permission;
 
                 Permission &= ~KMemoryPermission.ReadAndWrite;
-                Permission |=  KMemoryPermission.ReadAndWrite & newPermission;
+                Permission |= KMemoryPermission.ReadAndWrite & newPermission;
             }
 
             Attribute |= MemoryAttribute.IpcMapped;
@@ -119,5 +120,37 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
                 IpcRefCount,
                 DeviceRefCount);
         }
+
+        public int CompareTo(KMemoryBlock other)
+        {
+            if (BaseAddress < other.BaseAddress)
+            {
+                return -1;
+            }
+            else if (BaseAddress <= other.BaseAddress + other.PagesCount * KPageTableBase.PageSize - 1UL)
+            {
+                return 0;
+            }
+            else
+            {
+                return 1;
+            }
+        }
+
+        public int CompareTo(ulong address)
+        {
+            if (address < BaseAddress)
+            {
+                return 1;
+            }
+            else if (address <= BaseAddress + PagesCount * KPageTableBase.PageSize - 1UL)
+            {
+                return 0;
+            }
+            else
+            {
+                return -1;
+            }
+        }
     }
 }

Ryujinx.HLE/HOS/Kernel/Memory/KMemoryBlockManager.cs

@@ -1,5 +1,5 @@
-using Ryujinx.HLE.HOS.Kernel.Common;
-using System.Collections.Generic;
+using Ryujinx.Common.Collections;
+using Ryujinx.HLE.HOS.Kernel.Common;
 using System.Diagnostics;
 
 namespace Ryujinx.HLE.HOS.Kernel.Memory
@@ -8,26 +8,27 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
     {
         private const int PageSize = KPageTableBase.PageSize;
 
-        private readonly LinkedList<KMemoryBlock> _blocks;
+        private readonly IntrusiveRedBlackTree<KMemoryBlock> _blockTree;
 
-        public int BlocksCount => _blocks.Count;
+        public int BlocksCount => _blockTree.Count;
 
         private KMemoryBlockSlabManager _slabManager;
 
+        private ulong _addrSpaceStart;
         private ulong _addrSpaceEnd;
 
         public KMemoryBlockManager()
         {
-            _blocks = new LinkedList<KMemoryBlock>();
+            _blockTree = new IntrusiveRedBlackTree<KMemoryBlock>();
         }
 
         public KernelResult Initialize(ulong addrSpaceStart, ulong addrSpaceEnd, KMemoryBlockSlabManager slabManager)
         {
             _slabManager = slabManager;
+            _addrSpaceStart = addrSpaceStart;
             _addrSpaceEnd = addrSpaceEnd;
 
-            // First insertion will always need only a single block,
-            // because there's nothing else to split.
+            // First insertion will always need only a single block, because there's nothing to split.
             if (!slabManager.CanAllocate(1))
             {
                 return KernelResult.OutOfResource;
@@ -35,7 +36,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
 
             ulong addrSpacePagesCount = (addrSpaceEnd - addrSpaceStart) / PageSize;
 
-            _blocks.AddFirst(new KMemoryBlock(
+            _blockTree.Add(new KMemoryBlock(
                 addrSpaceStart,
                 addrSpacePagesCount,
                 MemoryState.Unmapped,
@@ -58,20 +59,17 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
             // Insert new block on the list only on areas where the state
             // of the block matches the state specified on the old* state
             // arguments, otherwise leave it as is.
-            int oldCount = _blocks.Count;
+
+            int oldCount = _blockTree.Count;
 
             oldAttribute |= MemoryAttribute.IpcAndDeviceMapped;
 
             ulong endAddr = baseAddress + pagesCount * PageSize;
 
-            LinkedListNode<KMemoryBlock> node = _blocks.First;
+            KMemoryBlock currBlock = FindBlock(baseAddress);
 
-            while (node != null)
+            while (currBlock != null)
             {
-                LinkedListNode<KMemoryBlock> newNode = node;
-
-                KMemoryBlock currBlock = node.Value;
-
                 ulong currBaseAddr = currBlock.BaseAddress;
                 ulong currEndAddr = currBlock.PagesCount * PageSize + currBaseAddr;
 
@@ -83,24 +81,27 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
                         currBlock.Permission != oldPermission ||
                         currBlockAttr != oldAttribute)
                     {
-                        node = node.Next;
+                        currBlock = currBlock.Successor;
 
                         continue;
                     }
 
                     if (baseAddress > currBaseAddr)
                     {
-                        _blocks.AddBefore(node, currBlock.SplitRightAtAddress(baseAddress));
+                        KMemoryBlock newBlock = currBlock.SplitRightAtAddress(baseAddress);
+                        _blockTree.Add(newBlock);
                     }
 
                     if (endAddr < currEndAddr)
                     {
-                        newNode = _blocks.AddBefore(node, currBlock.SplitRightAtAddress(endAddr));
+                        KMemoryBlock newBlock = currBlock.SplitRightAtAddress(endAddr);
+                        _blockTree.Add(newBlock);
+                        currBlock = newBlock;
                     }
 
-                    newNode.Value.SetState(newPermission, newState, newAttribute);
+                    currBlock.SetState(newPermission, newState, newAttribute);
 
-                    newNode = MergeEqualStateNeighbors(newNode);
+                    currBlock = MergeEqualStateNeighbors(currBlock);
                 }
 
                 if (currEndAddr - 1 >= endAddr - 1)
@@ -108,10 +109,10 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
                     break;
                 }
 
-                node = newNode.Next;
+                currBlock = currBlock.Successor;
             }
 
-            _slabManager.Count += _blocks.Count - oldCount;
+            _slabManager.Count += _blockTree.Count - oldCount;
 
             ValidateInternalState();
         }
@@ -125,18 +126,15 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
         {
             // Inserts new block at the list, replacing and splitting
             // existing blocks as needed.
-            int oldCount = _blocks.Count;
+
+            int oldCount = _blockTree.Count;
 
             ulong endAddr = baseAddress + pagesCount * PageSize;
 
-            LinkedListNode<KMemoryBlock> node = _blocks.First;
+            KMemoryBlock currBlock = FindBlock(baseAddress);
 
-            while (node != null)
+            while (currBlock != null)
             {
-                LinkedListNode<KMemoryBlock> newNode = node;
-
-                KMemoryBlock currBlock = node.Value;
-
                 ulong currBaseAddr = currBlock.BaseAddress;
                 ulong currEndAddr = currBlock.PagesCount * PageSize + currBaseAddr;
 
@@ -144,17 +142,20 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
                 {
                     if (baseAddress > currBaseAddr)
                     {
-                        _blocks.AddBefore(node, currBlock.SplitRightAtAddress(baseAddress));
+                        KMemoryBlock newBlock = currBlock.SplitRightAtAddress(baseAddress);
+                        _blockTree.Add(newBlock);
                     }
 
                     if (endAddr < currEndAddr)
                     {
-                        newNode = _blocks.AddBefore(node, currBlock.SplitRightAtAddress(endAddr));
+                        KMemoryBlock newBlock = currBlock.SplitRightAtAddress(endAddr);
+                        _blockTree.Add(newBlock);
+                        currBlock = newBlock;
                     }
 
-                    newNode.Value.SetState(permission, state, attribute);
+                    currBlock.SetState(permission, state, attribute);
 
-                    newNode = MergeEqualStateNeighbors(newNode);
+                    currBlock = MergeEqualStateNeighbors(currBlock);
                 }
 
                 if (currEndAddr - 1 >= endAddr - 1)
@@ -162,10 +163,10 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
                     break;
                 }
 
-                node = newNode.Next;
+                currBlock = currBlock.Successor;
             }
 
-            _slabManager.Count += _blocks.Count - oldCount;
+            _slabManager.Count += _blockTree.Count - oldCount;
 
             ValidateInternalState();
         }
@@ -181,18 +182,15 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
             // Inserts new block at the list, replacing and splitting
             // existing blocks as needed, then calling the callback
             // function on the new block.
-            int oldCount = _blocks.Count;
+
+            int oldCount = _blockTree.Count;
 
             ulong endAddr = baseAddress + pagesCount * PageSize;
 
-            LinkedListNode<KMemoryBlock> node = _blocks.First;
+            KMemoryBlock currBlock = FindBlock(baseAddress);
 
-            while (node != null)
+            while (currBlock != null)
             {
-                LinkedListNode<KMemoryBlock> newNode = node;
-
-                KMemoryBlock currBlock = node.Value;
-
                 ulong currBaseAddr = currBlock.BaseAddress;
                 ulong currEndAddr = currBlock.PagesCount * PageSize + currBaseAddr;
 
@@ -200,19 +198,20 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
                 {
                     if (baseAddress > currBaseAddr)
                     {
-                        _blocks.AddBefore(node, currBlock.SplitRightAtAddress(baseAddress));
+                        KMemoryBlock newBlock = currBlock.SplitRightAtAddress(baseAddress);
+                        _blockTree.Add(newBlock);
                     }
 
                     if (endAddr < currEndAddr)
                     {
-                        newNode = _blocks.AddBefore(node, currBlock.SplitRightAtAddress(endAddr));
+                        KMemoryBlock newBlock = currBlock.SplitRightAtAddress(endAddr);
+                        _blockTree.Add(newBlock);
+                        currBlock = newBlock;
                     }
 
-                    KMemoryBlock newBlock = newNode.Value;
+                    blockMutate(currBlock, permission);
 
-                    blockMutate(newBlock, permission);
-
-                    newNode = MergeEqualStateNeighbors(newNode);
+                    currBlock = MergeEqualStateNeighbors(currBlock);
                 }
 
                 if (currEndAddr - 1 >= endAddr - 1)
@@ -220,10 +219,10 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
                     break;
                 }
 
-                node = newNode.Next;
+                currBlock = currBlock.Successor;
             }
 
-            _slabManager.Count += _blocks.Count - oldCount;
+            _slabManager.Count += _blockTree.Count - oldCount;
 
             ValidateInternalState();
         }
@@ -233,58 +232,42 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
         {
             ulong expectedAddress = 0;
 
-            LinkedListNode<KMemoryBlock> node = _blocks.First;
+            KMemoryBlock currBlock = FindBlock(_addrSpaceStart);
 
-            while (node != null)
+            while (currBlock != null)
             {
-                LinkedListNode<KMemoryBlock> newNode = node;
-
-                KMemoryBlock currBlock = node.Value;
-
                 Debug.Assert(currBlock.BaseAddress == expectedAddress);
 
                 expectedAddress = currBlock.BaseAddress + currBlock.PagesCount * PageSize;
 
-                node = newNode.Next;
+                currBlock = currBlock.Successor;
             }
 
             Debug.Assert(expectedAddress == _addrSpaceEnd);
         }
 
-        private LinkedListNode<KMemoryBlock> MergeEqualStateNeighbors(LinkedListNode<KMemoryBlock> node)
+        private KMemoryBlock MergeEqualStateNeighbors(KMemoryBlock block)
         {
-            KMemoryBlock block = node.Value;
+            KMemoryBlock previousBlock = block.Predecessor;
+            KMemoryBlock nextBlock = block.Successor;
 
-            if (node.Previous != null)
+            if (previousBlock != null && BlockStateEquals(block, previousBlock))
             {
-                KMemoryBlock previousBlock = node.Previous.Value;
+                _blockTree.Remove(block);
 
-                if (BlockStateEquals(block, previousBlock))
-                {
-                    LinkedListNode<KMemoryBlock> previousNode = node.Previous;
+                previousBlock.AddPages(block.PagesCount);
 
-                    _blocks.Remove(node);
-
-                    previousBlock.AddPages(block.PagesCount);
-
-                    node = previousNode;
-                    block = previousBlock;
-                }
+                block = previousBlock;
             }
 
-            if (node.Next != null)
+            if (nextBlock != null && BlockStateEquals(block, nextBlock))
             {
-                KMemoryBlock nextBlock = node.Next.Value;
+                _blockTree.Remove(nextBlock);
 
-                if (BlockStateEquals(block, nextBlock))
-                {
-                    _blocks.Remove(node.Next);
-
-                    block.AddPages(nextBlock.PagesCount);
-                }
+                block.AddPages(nextBlock.PagesCount);
             }
 
-            return node;
+            return block;
         }
 
         private static bool BlockStateEquals(KMemoryBlock lhs, KMemoryBlock rhs)
@@ -299,31 +282,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
 
         public KMemoryBlock FindBlock(ulong address)
         {
-            return FindBlockNode(address)?.Value;
-        }
-
-        public LinkedListNode<KMemoryBlock> FindBlockNode(ulong address)
-        {
-            lock (_blocks)
-            {
-                LinkedListNode<KMemoryBlock> node = _blocks.First;
-
-                while (node != null)
-                {
-                    KMemoryBlock block = node.Value;
-
-                    ulong currEndAddr = block.PagesCount * PageSize + block.BaseAddress;
-
-                    if (block.BaseAddress <= address && currEndAddr - 1 >= address)
-                    {
-                        return node;
-                    }
-
-                    node = node.Next;
-                }
-            }
-
-            return null;
+            return _blockTree.GetNodeByKey(address);
         }
     }
 }

Ryujinx.HLE/HOS/Kernel/Memory/KPageTableBase.cs

@@ -2447,9 +2447,9 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
         {
             ulong endAddr = address + size;
 
-            LinkedListNode<KMemoryBlock> node = _blockManager.FindBlockNode(address);
+            KMemoryBlock currBlock = _blockManager.FindBlock(address);
 
-            KMemoryInfo info = node.Value.GetInfo();
+            KMemoryInfo info = currBlock.GetInfo();
 
             MemoryState firstState = info.State;
             KMemoryPermission firstPermission = info.Permission;
@@ -2457,7 +2457,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
 
             do
             {
-                info = node.Value.GetInfo();
+                info = currBlock.GetInfo();
 
                 // Check if the block state matches what we expect.
                 if (firstState != info.State ||
@@ -2474,7 +2474,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
                     return false;
                 }
             }
-            while (info.Address + info.Size - 1 < endAddr - 1 && (node = node.Next) != null);
+            while (info.Address + info.Size - 1 < endAddr - 1 && (currBlock = currBlock.Successor) != null);
 
             outState = firstState;
             outPermission = firstPermission;
@@ -2509,17 +2509,17 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
 
         private IEnumerable<KMemoryInfo> IterateOverRange(ulong start, ulong end)
         {
-            LinkedListNode<KMemoryBlock> node = _blockManager.FindBlockNode(start);
+            KMemoryBlock currBlock = _blockManager.FindBlock(start);
 
             KMemoryInfo info;
 
             do
             {
-                info = node.Value.GetInfo();
+                info = currBlock.GetInfo();
 
                 yield return info;
             }
-            while (info.Address + info.Size - 1 < end - 1 && (node = node.Next) != null);
+            while (info.Address + info.Size - 1 < end - 1 && (currBlock = currBlock.Successor) != null);
         }
 
         private ulong AllocateVa(ulong regionStart, ulong regionPagesCount, ulong neededPagesCount, int alignment)
@@ -2605,9 +2605,9 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
 
             ulong regionEndAddr = regionStart + regionPagesCount * PageSize;
 
-            LinkedListNode<KMemoryBlock> node = _blockManager.FindBlockNode(regionStart);
+            KMemoryBlock currBlock = _blockManager.FindBlock(regionStart);
 
-            KMemoryInfo info = node.Value.GetInfo();
+            KMemoryInfo info = currBlock.GetInfo();
 
             while (regionEndAddr >= info.Address)
             {
@@ -2636,14 +2636,14 @@ namespace Ryujinx.HLE.HOS.Kernel.Memory
                     }
                 }
 
-                node = node.Next;
+                currBlock = currBlock.Successor;
 
-                if (node == null)
+                if (currBlock == null)
                 {
                     break;
                 }
 
-                info = node.Value.GetInfo();
+                info = currBlock.GetInfo();
             }
 
             return 0;

Ryujinx.HLE/HOS/Services/Sockets/Bsd/Impl/ManagedSocket.cs

@@ -323,9 +323,14 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd
 
                 int value = optionValue.Length >= 4 ? MemoryMarshal.Read<int>(optionValue) : MemoryMarshal.Read<byte>(optionValue);
 
-                if (option == BsdSocketOption.SoLinger)
+                if (level == SocketOptionLevel.Socket && option == BsdSocketOption.SoLinger)
                 {
-                    int value2 = MemoryMarshal.Read<int>(optionValue[4..]);
+                    int value2 = 0;
+
+                    if (optionValue.Length >= 8)
+                    {
+                        value2 = MemoryMarshal.Read<int>(optionValue[4..]);
+                    }
 
                     Socket.SetSocketOption(level, SocketOptionName.Linger, new LingerOption(value != 0, value2));
                 }

Ryujinx.Memory/WindowsShared/IntervalTree.cs

@@ -1,3 +1,4 @@
+using Ryujinx.Common.Collections;
 using System;
 using System.Collections.Generic;
 
@@ -8,19 +9,10 @@ namespace Ryujinx.Memory.WindowsShared
     /// </summary>
     /// <typeparam name="K">Key</typeparam>
     /// <typeparam name="V">Value</typeparam>
-    class IntervalTree<K, V> where K : IComparable<K>
+    class IntervalTree<K, V> : IntrusiveRedBlackTreeImpl<IntervalTreeNode<K, V>> where K : IComparable<K>
     {
         private const int ArrayGrowthSize = 32;
 
-        private const bool Black = true;
-        private const bool Red = false;
-        private IntervalTreeNode<K, V> _root = null;
-        private int _count = 0;
-
-        public int Count => _count;
-
-        public IntervalTree() { }
-
         #region Public Methods
 
         /// <summary>
@@ -53,7 +45,7 @@ namespace Ryujinx.Memory.WindowsShared
         /// <returns>Number of intervals found</returns>
         public int Get(K start, K end, ref IntervalTreeNode<K, V>[] overlaps, int overlapCount = 0)
         {
-            GetNodes(_root, start, end, ref overlaps, ref overlapCount);
+            GetNodes(Root, start, end, ref overlaps, ref overlapCount);
 
             return overlapCount;
         }
@@ -99,7 +91,7 @@ namespace Ryujinx.Memory.WindowsShared
 
             Delete(nodeToDelete);
 
-            _count--;
+            Count--;
 
             return 1;
         }
@@ -112,7 +104,7 @@ namespace Ryujinx.Memory.WindowsShared
         {
             List<V> list = new List<V>();
 
-            AddToList(_root, list);
+            AddToList(Root, list);
 
             return list;
         }
@@ -153,7 +145,7 @@ namespace Ryujinx.Memory.WindowsShared
                 throw new ArgumentNullException(nameof(key));
             }
 
-            IntervalTreeNode<K, V> node = _root;
+            IntervalTreeNode<K, V> node = Root;
             while (node != null)
             {
                 int cmp = key.CompareTo(node.Start);
@@ -271,7 +263,7 @@ namespace Ryujinx.Memory.WindowsShared
         private bool BSTInsert(K start, K end, V value, Func<K, V, V> updateFactoryCallback, out IntervalTreeNode<K, V> outNode)
         {
             IntervalTreeNode<K, V> parent = null;
-            IntervalTreeNode<K, V> node = _root;
+            IntervalTreeNode<K, V> node = Root;
 
             while (node != null)
             {
@@ -319,7 +311,7 @@ namespace Ryujinx.Memory.WindowsShared
             IntervalTreeNode<K, V> newNode = new IntervalTreeNode<K, V>(start, end, value, parent);
             if (newNode.Parent == null)
             {
-                _root = newNode;
+                Root = newNode;
             }
             else if (start.CompareTo(parent.Start) < 0)
             {
@@ -331,7 +323,7 @@ namespace Ryujinx.Memory.WindowsShared
             }
 
             PropagateIncrease(newNode);
-            _count++;
+            Count++;
             RestoreBalanceAfterInsertion(newNode);
             outNode = newNode;
             return true;
@@ -351,7 +343,7 @@ namespace Ryujinx.Memory.WindowsShared
             }
             else
             {
-                replacementNode = PredecessorOf(nodeToDelete);
+                replacementNode = nodeToDelete.Predecessor;
             }
 
             IntervalTreeNode<K, V> tmp = LeftOf(replacementNode) ?? RightOf(replacementNode);
@@ -363,7 +355,7 @@ namespace Ryujinx.Memory.WindowsShared
 
             if (ParentOf(replacementNode) == null)
             {
-                _root = tmp;
+                Root = tmp;
             }
             else if (replacementNode == LeftOf(ParentOf(replacementNode)))
             {
@@ -390,232 +382,25 @@ namespace Ryujinx.Memory.WindowsShared
             }
         }
 
-        /// <summary>
-        /// Returns the node with the largest key where <paramref name="node"/> is considered the root node.
-        /// </summary>
-        /// <param name="node">Root Node</param>
-        /// <returns>Node with the maximum key in the tree of <paramref name="node"/></returns>
-        private static IntervalTreeNode<K, V> Maximum(IntervalTreeNode<K, V> node)
-        {
-            IntervalTreeNode<K, V> tmp = node;
-            while (tmp.Right != null)
-            {
-                tmp = tmp.Right;
-            }
-
-            return tmp;
-        }
-
-        /// <summary>
-        /// Finds the node whose key is immediately less than <paramref name="node"/>.
-        /// </summary>
-        /// <param name="node">Node to find the predecessor of</param>
-        /// <returns>Predecessor of <paramref name="node"/></returns>
-        private static IntervalTreeNode<K, V> PredecessorOf(IntervalTreeNode<K, V> node)
-        {
-            if (node.Left != null)
-            {
-                return Maximum(node.Left);
-            }
-            IntervalTreeNode<K, V> parent = node.Parent;
-            while (parent != null && node == parent.Left)
-            {
-                node = parent;
-                parent = parent.Parent;
-            }
-            return parent;
-        }
-
         #endregion
 
         #region Private Methods (RBL)
 
-        private void RestoreBalanceAfterRemoval(IntervalTreeNode<K, V> balanceNode)
-        {
-            IntervalTreeNode<K, V> ptr = balanceNode;
-
-            while (ptr != _root && ColorOf(ptr) == Black)
-            {
-                if (ptr == LeftOf(ParentOf(ptr)))
-                {
-                    IntervalTreeNode<K, V> sibling = RightOf(ParentOf(ptr));
-
-                    if (ColorOf(sibling) == Red)
-                    {
-                        SetColor(sibling, Black);
-                        SetColor(ParentOf(ptr), Red);
-                        RotateLeft(ParentOf(ptr));
-                        sibling = RightOf(ParentOf(ptr));
-                    }
-                    if (ColorOf(LeftOf(sibling)) == Black && ColorOf(RightOf(sibling)) == Black)
-                    {
-                        SetColor(sibling, Red);
-                        ptr = ParentOf(ptr);
-                    }
-                    else
-                    {
-                        if (ColorOf(RightOf(sibling)) == Black)
-                        {
-                            SetColor(LeftOf(sibling), Black);
-                            SetColor(sibling, Red);
-                            RotateRight(sibling);
-                            sibling = RightOf(ParentOf(ptr));
-                        }
-                        SetColor(sibling, ColorOf(ParentOf(ptr)));
-                        SetColor(ParentOf(ptr), Black);
-                        SetColor(RightOf(sibling), Black);
-                        RotateLeft(ParentOf(ptr));
-                        ptr = _root;
-                    }
-                }
-                else
-                {
-                    IntervalTreeNode<K, V> sibling = LeftOf(ParentOf(ptr));
-
-                    if (ColorOf(sibling) == Red)
-                    {
-                        SetColor(sibling, Black);
-                        SetColor(ParentOf(ptr), Red);
-                        RotateRight(ParentOf(ptr));
-                        sibling = LeftOf(ParentOf(ptr));
-                    }
-                    if (ColorOf(RightOf(sibling)) == Black && ColorOf(LeftOf(sibling)) == Black)
-                    {
-                        SetColor(sibling, Red);
-                        ptr = ParentOf(ptr);
-                    }
-                    else
-                    {
-                        if (ColorOf(LeftOf(sibling)) == Black)
-                        {
-                            SetColor(RightOf(sibling), Black);
-                            SetColor(sibling, Red);
-                            RotateLeft(sibling);
-                            sibling = LeftOf(ParentOf(ptr));
-                        }
-                        SetColor(sibling, ColorOf(ParentOf(ptr)));
-                        SetColor(ParentOf(ptr), Black);
-                        SetColor(LeftOf(sibling), Black);
-                        RotateRight(ParentOf(ptr));
-                        ptr = _root;
-                    }
-                }
-            }
-            SetColor(ptr, Black);
-        }
-
-        private void RestoreBalanceAfterInsertion(IntervalTreeNode<K, V> balanceNode)
-        {
-            SetColor(balanceNode, Red);
-            while (balanceNode != null && balanceNode != _root && ColorOf(ParentOf(balanceNode)) == Red)
-            {
-                if (ParentOf(balanceNode) == LeftOf(ParentOf(ParentOf(balanceNode))))
-                {
-                    IntervalTreeNode<K, V> sibling = RightOf(ParentOf(ParentOf(balanceNode)));
-
-                    if (ColorOf(sibling) == Red)
-                    {
-                        SetColor(ParentOf(balanceNode), Black);
-                        SetColor(sibling, Black);
-                        SetColor(ParentOf(ParentOf(balanceNode)), Red);
-                        balanceNode = ParentOf(ParentOf(balanceNode));
-                    }
-                    else
-                    {
-                        if (balanceNode == RightOf(ParentOf(balanceNode)))
-                        {
-                            balanceNode = ParentOf(balanceNode);
-                            RotateLeft(balanceNode);
-                        }
-                        SetColor(ParentOf(balanceNode), Black);
-                        SetColor(ParentOf(ParentOf(balanceNode)), Red);
-                        RotateRight(ParentOf(ParentOf(balanceNode)));
-                    }
-                }
-                else
-                {
-                    IntervalTreeNode<K, V> sibling = LeftOf(ParentOf(ParentOf(balanceNode)));
-
-                    if (ColorOf(sibling) == Red)
-                    {
-                        SetColor(ParentOf(balanceNode), Black);
-                        SetColor(sibling, Black);
-                        SetColor(ParentOf(ParentOf(balanceNode)), Red);
-                        balanceNode = ParentOf(ParentOf(balanceNode));
-                    }
-                    else
-                    {
-                        if (balanceNode == LeftOf(ParentOf(balanceNode)))
-                        {
-                            balanceNode = ParentOf(balanceNode);
-                            RotateRight(balanceNode);
-                        }
-                        SetColor(ParentOf(balanceNode), Black);
-                        SetColor(ParentOf(ParentOf(balanceNode)), Red);
-                        RotateLeft(ParentOf(ParentOf(balanceNode)));
-                    }
-                }
-            }
-            SetColor(_root, Black);
-        }
-
-        private void RotateLeft(IntervalTreeNode<K, V> node)
+        protected override void RotateLeft(IntervalTreeNode<K, V> node)
         {
             if (node != null)
             {
-                IntervalTreeNode<K, V> right = RightOf(node);
-                node.Right = LeftOf(right);
-                if (node.Right != null)
-                {
-                    node.Right.Parent = node;
-                }
-                IntervalTreeNode<K, V> nodeParent = ParentOf(node);
-                right.Parent = nodeParent;
-                if (nodeParent == null)
-                {
-                    _root = right;
-                }
-                else if (node == LeftOf(nodeParent))
-                {
-                    nodeParent.Left = right;
-                }
-                else
-                {
-                    nodeParent.Right = right;
-                }
-                right.Left = node;
-                node.Parent = right;
+                base.RotateLeft(node);
 
                 PropagateFull(node);
             }
         }
 
-        private void RotateRight(IntervalTreeNode<K, V> node)
+        protected override void RotateRight(IntervalTreeNode<K, V> node)
         {
             if (node != null)
             {
-                IntervalTreeNode<K, V> left = LeftOf(node);
-                node.Left = RightOf(left);
-                if (node.Left != null)
-                {
-                    node.Left.Parent = node;
-                }
-                IntervalTreeNode<K, V> nodeParent = ParentOf(node);
-                left.Parent = nodeParent;
-                if (nodeParent == null)
-                {
-                    _root = left;
-                }
-                else if (node == RightOf(nodeParent))
-                {
-                    nodeParent.Right = left;
-                }
-                else
-                {
-                    nodeParent.Left = left;
-                }
-                left.Right = node;
-                node.Parent = left;
+                base.RotateRight(node);
 
                 PropagateFull(node);
             }
@@ -623,77 +408,10 @@ namespace Ryujinx.Memory.WindowsShared
 
         #endregion
 
-        #region Safety-Methods
-
-        // These methods save memory by allowing us to forego sentinel nil nodes, as well as serve as protection against NullReferenceExceptions.
-
-        /// <summary>
-        /// Returns the color of <paramref name="node"/>, or Black if it is null.
-        /// </summary>
-        /// <param name="node">Node</param>
-        /// <returns>The boolean color of <paramref name="node"/>, or black if null</returns>
-        private static bool ColorOf(IntervalTreeNode<K, V> node)
-        {
-            return node == null || node.Color;
-        }
-
-        /// <summary>
-        /// Sets the color of <paramref name="node"/> node to <paramref name="color"/>.
-        /// <br></br>
-        /// This method does nothing if <paramref name="node"/> is null.
-        /// </summary>
-        /// <param name="node">Node to set the color of</param>
-        /// <param name="color">Color (Boolean)</param>
-        private static void SetColor(IntervalTreeNode<K, V> node, bool color)
-        {
-            if (node != null)
-            {
-                node.Color = color;
-            }
-        }
-
-        /// <summary>
-        /// This method returns the left node of <paramref name="node"/>, or null if <paramref name="node"/> is null.
-        /// </summary>
-        /// <param name="node">Node to retrieve the left child from</param>
-        /// <returns>Left child of <paramref name="node"/></returns>
-        private static IntervalTreeNode<K, V> LeftOf(IntervalTreeNode<K, V> node)
-        {
-            return node?.Left;
-        }
-
-        /// <summary>
-        /// This method returns the right node of <paramref name="node"/>, or null if <paramref name="node"/> is null.
-        /// </summary>
-        /// <param name="node">Node to retrieve the right child from</param>
-        /// <returns>Right child of <paramref name="node"/></returns>
-        private static IntervalTreeNode<K, V> RightOf(IntervalTreeNode<K, V> node)
-        {
-            return node?.Right;
-        }
-
-        /// <summary>
-        /// Returns the parent node of <paramref name="node"/>, or null if <paramref name="node"/> is null.
-        /// </summary>
-        /// <param name="node">Node to retrieve the parent from</param>
-        /// <returns>Parent of <paramref name="node"/></returns>
-        private static IntervalTreeNode<K, V> ParentOf(IntervalTreeNode<K, V> node)
-        {
-            return node?.Parent;
-        }
-
-        #endregion
-
         public bool ContainsKey(K key)
         {
             return GetNode(key) != null;
         }
-
-        public void Clear()
-        {
-            _root = null;
-            _count = 0;
-        }
     }
 
     /// <summary>
@@ -701,13 +419,8 @@ namespace Ryujinx.Memory.WindowsShared
     /// </summary>
     /// <typeparam name="K">Key type of the node</typeparam>
     /// <typeparam name="V">Value type of the node</typeparam>
-    class IntervalTreeNode<K, V>
+    class IntervalTreeNode<K, V> : IntrusiveRedBlackTreeNode<IntervalTreeNode<K, V>>
     {
-        public bool Color = true;
-        public IntervalTreeNode<K, V> Left = null;
-        public IntervalTreeNode<K, V> Right = null;
-        public IntervalTreeNode<K, V> Parent = null;
-
         /// <summary>
         /// The start of the range.
         /// </summary>