Implement another non-indexed draw method on GPU (#4123)

Fixes a regression caused by #4003 where the code that writes `_vtgWritesRtLayer` was removed, breaking the crowd in mario strikers.

ARMeilleure/Signal/UnixSignalHandlerRegistration.cs

@@ -18,17 +18,17 @@ namespace ARMeilleure.Signal
         public IntPtr sa_restorer;
     }
 
-    static class UnixSignalHandlerRegistration
+    static partial class UnixSignalHandlerRegistration
     {
         private const int SIGSEGV = 11;
         private const int SIGBUS = 10;
         private const int SA_SIGINFO = 0x00000004;
 
-        [DllImport("libc", SetLastError = true)]
+        [LibraryImport("libc", SetLastError = true)]
-        private static extern int sigaction(int signum, ref SigAction sigAction, out SigAction oldAction);
+        private static partial int sigaction(int signum, ref SigAction sigAction, out SigAction oldAction);
 
-        [DllImport("libc", SetLastError = true)]
+        [LibraryImport("libc", SetLastError = true)]
-        private static extern int sigemptyset(ref SigSet set);
+        private static partial int sigemptyset(ref SigSet set);
 
         public static SigAction RegisterExceptionHandler(IntPtr action)
         {

ARMeilleure/Signal/WindowsSignalHandlerRegistration.cs

@@ -3,19 +3,19 @@ using System.Runtime.InteropServices;
 
 namespace ARMeilleure.Signal
 {
-    unsafe class WindowsSignalHandlerRegistration
+    unsafe partial class WindowsSignalHandlerRegistration
     {
-        [DllImport("kernel32.dll")]
+        [LibraryImport("kernel32.dll")]
-        private static extern IntPtr AddVectoredExceptionHandler(uint first, IntPtr handler);
+        private static partial IntPtr AddVectoredExceptionHandler(uint first, IntPtr handler);
 
-        [DllImport("kernel32.dll")]
+        [LibraryImport("kernel32.dll")]
-        private static extern ulong RemoveVectoredExceptionHandler(IntPtr handle);
+        private static partial ulong RemoveVectoredExceptionHandler(IntPtr handle);
 
-        [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Ansi)]
+        [LibraryImport("kernel32.dll", SetLastError = true, EntryPoint = "LoadLibraryA")]
-        static extern IntPtr LoadLibrary([MarshalAs(UnmanagedType.LPStr)] string lpFileName);
+        private static partial IntPtr LoadLibrary([MarshalAs(UnmanagedType.LPStr)] string lpFileName);
 
-        [DllImport("kernel32.dll", CharSet = CharSet.Ansi, ExactSpelling = true, SetLastError = true)]
+        [LibraryImport("kernel32.dll", SetLastError = true)]
-        private static extern IntPtr GetProcAddress(IntPtr hModule, string procName);
+        private static partial IntPtr GetProcAddress(IntPtr hModule, [MarshalAs(UnmanagedType.LPStr)] string procName);
 
         private static IntPtr _getCurrentThreadIdPtr;
 

ARMeilleure/Translation/Cache/JitUnwindWindows.cs

@@ -7,7 +7,7 @@ using System.Runtime.InteropServices;
 
 namespace ARMeilleure.Translation.Cache
 {
-    static class JitUnwindWindows
+    static partial class JitUnwindWindows
     {
         private const int MaxUnwindCodesArraySize = 32; // Must be an even value.
 
@@ -42,14 +42,15 @@ namespace ARMeilleure.Translation.Cache
 
         private unsafe delegate RuntimeFunction* GetRuntimeFunctionCallback(ulong controlPc, IntPtr context);
 
-        [DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
+        [LibraryImport("kernel32.dll")]
-        private static unsafe extern bool RtlInstallFunctionTableCallback(
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static unsafe partial bool RtlInstallFunctionTableCallback(
             ulong tableIdentifier,
             ulong baseAddress,
             uint length,
             GetRuntimeFunctionCallback callback,
             IntPtr context,
-            string outOfProcessCallbackDll);
+            [MarshalAs(UnmanagedType.LPWStr)] string outOfProcessCallbackDll);
 
         private static GetRuntimeFunctionCallback _getRuntimeFunctionCallback;
 

Ryujinx.Ava/AppHost.cs

@@ -17,7 +17,7 @@ using Ryujinx.Ava.Ui.Windows;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
-using Ryujinx.Common.System;
+using Ryujinx.Common.SystemInterop;
 using Ryujinx.Graphics.GAL;
 using Ryujinx.Graphics.GAL.Multithreading;
 using Ryujinx.Graphics.Gpu;

Ryujinx.Ava/Helper/MetalHelper.cs

@@ -8,7 +8,7 @@ namespace Ryujinx.Ava.Ui.Helper
     public delegate void UpdateBoundsCallbackDelegate(Rect rect);
 
     [SupportedOSPlatform("macos")]
-    static class MetalHelper
+    static partial class MetalHelper
     {
         private const string LibObjCImport = "/usr/lib/libobjc.A.dylib";
 
@@ -100,28 +100,28 @@ namespace Ryujinx.Ava.Ui.Helper
             // TODO
         }
 
-        [DllImport(LibObjCImport)]
+        [LibraryImport(LibObjCImport)]
-        private static unsafe extern IntPtr sel_registerName(byte* data);
+        private static unsafe partial IntPtr sel_registerName(byte* data);
 
-        [DllImport(LibObjCImport)]
+        [LibraryImport(LibObjCImport)]
-        private static unsafe extern IntPtr objc_getClass(byte* data);
+        private static unsafe partial IntPtr objc_getClass(byte* data);
 
-        [DllImport(LibObjCImport)]
+        [LibraryImport(LibObjCImport)]
-        private static extern void objc_msgSend(IntPtr receiver, Selector selector);
+        private static partial void objc_msgSend(IntPtr receiver, Selector selector);
 
-        [DllImport(LibObjCImport)]
+        [LibraryImport(LibObjCImport)]
-        private static extern void objc_msgSend(IntPtr receiver, Selector selector, byte value);
+        private static partial void objc_msgSend(IntPtr receiver, Selector selector, byte value);
 
-        [DllImport(LibObjCImport)]
+        [LibraryImport(LibObjCImport)]
-        private static extern void objc_msgSend(IntPtr receiver, Selector selector, IntPtr value);
+        private static partial void objc_msgSend(IntPtr receiver, Selector selector, IntPtr value);
 
-        [DllImport(LibObjCImport)]
+        [LibraryImport(LibObjCImport)]
-        private static extern void objc_msgSend(IntPtr receiver, Selector selector, NSRect point);
+        private static partial void objc_msgSend(IntPtr receiver, Selector selector, NSRect point);
 
-        [DllImport(LibObjCImport)]
+        [LibraryImport(LibObjCImport)]
-        private static extern void objc_msgSend(IntPtr receiver, Selector selector, double value);
+        private static partial void objc_msgSend(IntPtr receiver, Selector selector, double value);
 
-        [DllImport(LibObjCImport, EntryPoint = "objc_msgSend")]
+        [LibraryImport(LibObjCImport, EntryPoint = "objc_msgSend")]
-        private static extern IntPtr IntPtr_objc_msgSend(IntPtr receiver, Selector selector);
+        private static partial IntPtr IntPtr_objc_msgSend(IntPtr receiver, Selector selector);
     }
 }

Ryujinx.Ava/Program.cs

@@ -6,7 +6,7 @@ using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.GraphicsDriver;
 using Ryujinx.Common.Logging;
-using Ryujinx.Common.System;
+using Ryujinx.Common.SystemInterop;
 using Ryujinx.Common.SystemInfo;
 using Ryujinx.Modules;
 using Ryujinx.SDL2.Common;
@@ -20,7 +20,7 @@ using System.Threading.Tasks;
 
 namespace Ryujinx.Ava
 {
-    internal class Program
+    internal partial class Program
     {
         public static double WindowScaleFactor  { get; set; }
         public static double DesktopScaleFactor { get; set; } = 1.0;
@@ -28,8 +28,8 @@ namespace Ryujinx.Ava
         public static string ConfigurationPath  { get; private set; }
         public static bool   PreviewerDetached {  get; private set; }
 
-        [DllImport("user32.dll", SetLastError = true)]
+        [LibraryImport("user32.dll", SetLastError = true)]
-        public static extern int MessageBoxA(IntPtr hWnd, string text, string caption, uint type);
+        public static partial int MessageBoxA(IntPtr hWnd, [MarshalAs(UnmanagedType.LPStr)] string text, [MarshalAs(UnmanagedType.LPStr)] string caption, uint type);
 
         private const uint MB_ICONWARNING = 0x30;
 

Ryujinx.Ava/Ui/Applet/SwkbdAppletDialog.axaml.cs

@@ -111,7 +111,7 @@ namespace Ryujinx.Ava.Ui.Controls
 
                 overlay.Position = window.PointToScreen(new Point());
 
-                await contentDialog.ShowAsync();
+                await contentDialog.ShowAsync(overlay);
                 contentDialog.Closed -= handler;
                 overlay.Close();
             };

Ryujinx.Ava/Ui/Controls/EmbeddedWindow.cs

@@ -125,9 +125,9 @@ namespace Ryujinx.Ava.Ui.Controls
             {
                 cbSize = Marshal.SizeOf<WNDCLASSEX>(),
                 hInstance = GetModuleHandle(null),
-                lpfnWndProc = _wndProcDelegate,
+                lpfnWndProc = Marshal.GetFunctionPointerForDelegate(_wndProcDelegate),
                 style = ClassStyles.CS_OWNDC,
-                lpszClassName = _className,
+                lpszClassName = Marshal.StringToHGlobalUni(_className),
                 hCursor = LoadCursor(IntPtr.Zero, (IntPtr)Cursors.IDC_ARROW)
             };
 
@@ -148,7 +148,9 @@ namespace Ryujinx.Ava.Ui.Controls
                 IntPtr.Zero);
 
             WindowHandle = handle;
-
+            
+            Marshal.FreeHGlobal(wndClassEx.lpszClassName);
+            
             return new PlatformHandle(WindowHandle, "HWND");
         }
 

Ryujinx.Ava/Ui/Controls/Win32NativeInterop.cs

@@ -5,7 +5,7 @@ using System.Runtime.Versioning;
 namespace Ryujinx.Ava.Ui.Controls
 {
     [SupportedOSPlatform("windows")]
-    internal class Win32NativeInterop
+    internal partial class Win32NativeInterop
     {
         [Flags]
         public enum ClassStyles : uint
@@ -48,58 +48,52 @@ namespace Ryujinx.Ava.Ui.Controls
         [UnmanagedFunctionPointer(CallingConvention.Winapi)]
         internal delegate IntPtr WindowProc(IntPtr hWnd, WindowsMessages msg, IntPtr wParam, IntPtr lParam);
 
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+        [StructLayout(LayoutKind.Sequential)]
         public struct WNDCLASSEX
         {
             public int cbSize;
             public ClassStyles style;
-            [MarshalAs(UnmanagedType.FunctionPtr)]
+            public IntPtr lpfnWndProc; // not WndProc
-            public WindowProc lpfnWndProc; // not WndProc
             public int cbClsExtra;
             public int cbWndExtra;
             public IntPtr hInstance;
             public IntPtr hIcon;
             public IntPtr hCursor;
             public IntPtr hbrBackground;
-            [MarshalAs(UnmanagedType.LPWStr)]
+            public IntPtr lpszMenuName;
-            public string lpszMenuName;
+            public IntPtr lpszClassName;
-            [MarshalAs(UnmanagedType.LPWStr)]
-            public string lpszClassName;
             public IntPtr hIconSm;
 
-            public static WNDCLASSEX Create()
+            public WNDCLASSEX()
             {
-                return new WNDCLASSEX
+                cbSize = Marshal.SizeOf<WNDCLASSEX>();
-                {
-                    cbSize = Marshal.SizeOf<WNDCLASSEX>()
-                };
             }
         }
 
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+        [LibraryImport("user32.dll", SetLastError = true, EntryPoint = "RegisterClassExW")]
-        public static extern ushort RegisterClassEx(ref WNDCLASSEX param);
+        public static partial ushort RegisterClassEx(ref WNDCLASSEX param);
 
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+        [LibraryImport("user32.dll", SetLastError = true, EntryPoint = "UnregisterClassW")]
-        public static extern short UnregisterClass([MarshalAs(UnmanagedType.LPWStr)] string lpClassName, IntPtr instance);
+        public static partial short UnregisterClass([MarshalAs(UnmanagedType.LPWStr)] string lpClassName, IntPtr instance);
 
-        [DllImport("user32.dll", CharSet = CharSet.Unicode)]
+        [LibraryImport("user32.dll", EntryPoint = "DefWindowProcW")]
-        public static extern IntPtr DefWindowProc(IntPtr hWnd, WindowsMessages msg, IntPtr wParam, IntPtr lParam);
+        public static partial IntPtr DefWindowProc(IntPtr hWnd, WindowsMessages msg, IntPtr wParam, IntPtr lParam);
 
-        [DllImport("kernel32.dll")]
+        [LibraryImport("kernel32.dll", EntryPoint = "GetModuleHandleA")]
-        public static extern IntPtr GetModuleHandle(string lpModuleName);
+        public static partial IntPtr GetModuleHandle([MarshalAs(UnmanagedType.LPStr)] string lpModuleName);
 
-        [DllImport("user32.dll", SetLastError = true)]
+        [LibraryImport("user32.dll", SetLastError = true)]
         [return: MarshalAs(UnmanagedType.Bool)]
-        public static extern bool DestroyWindow(IntPtr hwnd);
+        public static partial bool DestroyWindow(IntPtr hwnd);
 
-        [DllImport("user32.dll", SetLastError = true)]
+        [LibraryImport("user32.dll", SetLastError = true, EntryPoint = "LoadCursorA")]
-        public static extern IntPtr LoadCursor(IntPtr hInstance, IntPtr lpCursorName);
+        public static partial IntPtr LoadCursor(IntPtr hInstance, IntPtr lpCursorName);
 
-        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
+        [LibraryImport("user32.dll", SetLastError = true, EntryPoint = "CreateWindowExW")]
-        public static extern IntPtr CreateWindowEx(
+        public static partial IntPtr CreateWindowEx(
            uint dwExStyle,
-           string lpClassName,
+           [MarshalAs(UnmanagedType.LPWStr)] string lpClassName,
-           string lpWindowName,
+           [MarshalAs(UnmanagedType.LPWStr)] string lpWindowName,
            WindowStyles dwStyle,
            int x,
            int y,

Ryujinx.Common/GraphicsDriver/NVThreadedOptimization.cs

@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 
 namespace Ryujinx.Common.GraphicsDriver
 {
-    static class NVThreadedOptimization
+    static partial class NVThreadedOptimization
     {
         private const string ProfileName = "Ryujinx Nvidia Profile";
 
@@ -19,8 +19,8 @@ namespace Ryujinx.Common.GraphicsDriver
         private const uint NvAPI_DRS_SaveSettings_ID = 0xFCBC7E14;
         private const uint NvAPI_DRS_DestroySession_ID = 0x0DAD9CFF8;
 
-        [DllImport("nvapi64")]
+        [LibraryImport("nvapi64")]
-        private static extern IntPtr nvapi_QueryInterface(uint id);
+        private static partial IntPtr nvapi_QueryInterface(uint id);
 
         private delegate int NvAPI_InitializeDelegate();
         private static NvAPI_InitializeDelegate NvAPI_Initialize;

Ryujinx.Common/Memory/PartialUnmaps/PartialUnmapState.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.Marshalling;
 using System.Runtime.Versioning;
 using System.Threading;
 
@@ -12,7 +13,7 @@ namespace Ryujinx.Common.Memory.PartialUnmaps
     /// State for partial unmaps. Intended to be used on Windows.
     /// </summary>
     [StructLayout(LayoutKind.Sequential, Pack = 1)]
-    public struct PartialUnmapState
+    public partial struct PartialUnmapState
     {
         public NativeReaderWriterLock PartialUnmapLock;
         public int PartialUnmapsCount;
@@ -25,20 +26,22 @@ namespace Ryujinx.Common.Memory.PartialUnmaps
         public readonly static IntPtr GlobalState;
 
         [SupportedOSPlatform("windows")]
-        [DllImport("kernel32.dll")]
+        [LibraryImport("kernel32.dll")]
-        public static extern int GetCurrentThreadId();
+        public static partial int GetCurrentThreadId();
 
         [SupportedOSPlatform("windows")]
-        [DllImport("kernel32.dll", SetLastError = true)]
+        [LibraryImport("kernel32.dll", SetLastError = true)]
-        static extern IntPtr OpenThread(int dwDesiredAccess, bool bInheritHandle, uint dwThreadId);
+        private static partial IntPtr OpenThread(int dwDesiredAccess, [MarshalAs(UnmanagedType.Bool)] bool bInheritHandle, uint dwThreadId);
 
         [SupportedOSPlatform("windows")]
-        [DllImport("kernel32.dll", SetLastError = true)]
+        [LibraryImport("kernel32.dll", SetLastError = true)]
-        public static extern bool CloseHandle(IntPtr hObject);
+        [return: MarshalAs (UnmanagedType.Bool)]
+        public static partial bool CloseHandle(IntPtr hObject);
 
         [SupportedOSPlatform("windows")]
-        [DllImport("kernel32.dll", SetLastError = true)]
+        [LibraryImport("kernel32.dll", SetLastError = true)]
-        static extern bool GetExitCodeThread(IntPtr hThread, out uint lpExitCode);
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static partial bool GetExitCodeThread(IntPtr hThread, out uint lpExitCode);
 
         /// <summary>
         /// Creates a global static PartialUnmapState and populates the field offsets.

Ryujinx.Common/SystemInfo/MacOSSystemInfo.cs

@@ -8,7 +8,7 @@ using Ryujinx.Common.Logging;
 namespace Ryujinx.Common.SystemInfo
 {
     [SupportedOSPlatform("macos")]
-    class MacOSSystemInfo : SystemInfo
+    partial class MacOSSystemInfo : SystemInfo
     {
         internal MacOSSystemInfo()
         {
@@ -60,8 +60,8 @@ namespace Ryujinx.Common.SystemInfo
 
         private const string SystemLibraryName = "libSystem.dylib";
 
-        [DllImport(SystemLibraryName, CharSet = CharSet.Ansi, SetLastError = true)]
+        [LibraryImport(SystemLibraryName, SetLastError = true)]
-        private static extern int sysctlbyname(string name, IntPtr oldValue, ref ulong oldSize, IntPtr newValue, ulong newValueSize);
+        private static partial int sysctlbyname([MarshalAs(UnmanagedType.LPStr)] string name, IntPtr oldValue, ref ulong oldSize, IntPtr newValue, ulong newValueSize);
 
         private static int sysctlbyname(string name, IntPtr oldValue, ref ulong oldSize)
         {
@@ -116,11 +116,11 @@ namespace Ryujinx.Common.SystemInfo
             return res;
         }
 
-        [DllImport(SystemLibraryName, CharSet = CharSet.Ansi, SetLastError = true)]
+        [LibraryImport(SystemLibraryName, SetLastError = true)]
-        private static extern uint mach_host_self();
+        private static partial uint mach_host_self();
 
-        [DllImport(SystemLibraryName, CharSet = CharSet.Ansi, SetLastError = true)]
+        [LibraryImport(SystemLibraryName, SetLastError = true)]
-        private static extern int host_page_size(uint host, ref uint out_page_size);
+        private static partial int host_page_size(uint host, ref uint out_page_size);
 
         [StructLayout(LayoutKind.Sequential, Pack = 8)]
         struct VMStatistics64
@@ -151,7 +151,7 @@ namespace Ryujinx.Common.SystemInfo
             public ulong TotalUncompressedPagesInCompressor;
         }
 
-        [DllImport(SystemLibraryName, CharSet = CharSet.Ansi, SetLastError = true)]
+        [LibraryImport(SystemLibraryName, SetLastError = true)]
-        private static extern int host_statistics64(uint host_priv, int host_flavor, ref VMStatistics64 host_info64_out, ref uint host_info64_outCnt);
+        private static partial int host_statistics64(uint host_priv, int host_flavor, ref VMStatistics64 host_info64_out, ref uint host_info64_outCnt);
     }
 }

Ryujinx.Common/SystemInfo/WindowsSystemInfo.cs

@@ -7,7 +7,7 @@ using Ryujinx.Common.Logging;
 namespace Ryujinx.Common.SystemInfo
 {
     [SupportedOSPlatform("windows")]
-    class WindowsSystemInfo : SystemInfo
+    partial class WindowsSystemInfo : SystemInfo
     {
         internal WindowsSystemInfo()
         {
@@ -18,7 +18,7 @@ namespace Ryujinx.Common.SystemInfo
         private static (ulong Total, ulong Available) GetMemoryStats()
         {
             MemoryStatusEx memStatus = new MemoryStatusEx();
-            if (GlobalMemoryStatusEx(memStatus))
+            if (GlobalMemoryStatusEx(ref memStatus))
             {
                 return (memStatus.TotalPhys, memStatus.AvailPhys); // Bytes
             }
@@ -45,8 +45,8 @@ namespace Ryujinx.Common.SystemInfo
             return Environment.GetEnvironmentVariable("PROCESSOR_IDENTIFIER").Trim();
         }
 
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
+        [StructLayout(LayoutKind.Sequential)]
-        private class MemoryStatusEx
+        private struct MemoryStatusEx
         {
             public uint Length;
             public uint MemoryLoad;
@@ -64,9 +64,9 @@ namespace Ryujinx.Common.SystemInfo
             }
         }
 
+        [LibraryImport("kernel32.dll", SetLastError = true)]
         [return: MarshalAs(UnmanagedType.Bool)]
-        [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+        private static partial bool GlobalMemoryStatusEx(ref MemoryStatusEx lpBuffer);
-        private static extern bool GlobalMemoryStatusEx([In, Out] MemoryStatusEx lpBuffer);
 
         private static ManagementObjectCollection GetWMIObjects(string scope, string query)
         {

Ryujinx.Common/SystemInterop/DisplaySleep.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Ryujinx.Common.System
+namespace Ryujinx.Common.SystemInterop
 {
-    public class DisplaySleep
+    public partial class DisplaySleep
     {
         [Flags]
         enum EXECUTION_STATE : uint
@@ -13,8 +13,8 @@ namespace Ryujinx.Common.System
             ES_SYSTEM_REQUIRED = 0x00000001
         }
 
-        [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+        [LibraryImport("kernel32.dll", SetLastError = true)]
-        static extern EXECUTION_STATE SetThreadExecutionState(EXECUTION_STATE esFlags);
+        private static partial EXECUTION_STATE SetThreadExecutionState(EXECUTION_STATE esFlags);
 
         static public void Prevent()
         {

Ryujinx.Common/SystemInterop/ForceDpiAware.cs

@@ -3,29 +3,30 @@ using System;
 using System.Globalization;
 using System.Runtime.InteropServices;
 
-namespace Ryujinx.Common.System
+namespace Ryujinx.Common.SystemInterop
 {
-    public static class ForceDpiAware
+    public static partial class ForceDpiAware
     {
-        [DllImport("user32.dll")]
+        [LibraryImport("user32.dll")]
-        private static extern bool SetProcessDPIAware();
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static partial bool SetProcessDPIAware();
 
         private const string X11LibraryName = "libX11.so.6";
 
-        [DllImport(X11LibraryName)]
+        [LibraryImport(X11LibraryName)]
-        private static extern IntPtr XOpenDisplay(string display);
+        private static partial IntPtr XOpenDisplay([MarshalAs(UnmanagedType.LPStr)] string display);
 
-        [DllImport(X11LibraryName)]
+        [LibraryImport(X11LibraryName)]
-        private static extern IntPtr XGetDefault(IntPtr display, string program, string option);
+        private static partial IntPtr XGetDefault(IntPtr display, [MarshalAs(UnmanagedType.LPStr)] string program, [MarshalAs(UnmanagedType.LPStr)] string option);
 
-        [DllImport(X11LibraryName)]
+        [LibraryImport(X11LibraryName)]
-        private static extern int XDisplayWidth(IntPtr display, int screenNumber);
+        private static partial int XDisplayWidth(IntPtr display, int screenNumber);
 
-        [DllImport(X11LibraryName)]
+        [LibraryImport(X11LibraryName)]
-        private static extern int XDisplayWidthMM(IntPtr display, int screenNumber);
+        private static partial int XDisplayWidthMM(IntPtr display, int screenNumber);
 
-        [DllImport(X11LibraryName)]
+        [LibraryImport(X11LibraryName)]
-        private static extern int XCloseDisplay(IntPtr display);
+        private static partial int XCloseDisplay(IntPtr display);
 
         private static readonly double _standardDpiScale = 96.0;
         private static readonly double _maxScaleFactor   = 1.25;

Ryujinx.Common/SystemInterop/GdiPlusHelper.cs

@@ -2,10 +2,10 @@
 using System.Runtime.InteropServices;
 using System.Runtime.Versioning;
 
-namespace Ryujinx.Common.System
+namespace Ryujinx.Common.SystemInterop
 {
     [SupportedOSPlatform("windows")]
-    public static class GdiPlusHelper
+    public static partial class GdiPlusHelper
     {
         private const string LibraryName = "gdiplus.dll";
 
@@ -52,17 +52,17 @@ namespace Ryujinx.Common.System
             public IntPtr NotificationUnhook;
         }
 
-        [DllImport(LibraryName)]
+        [LibraryImport(LibraryName)]
-        private static extern int GdiplusStartup(out IntPtr token, in StartupInputEx input, out StartupOutput output);
+        private static partial int GdiplusStartup(out IntPtr token, in StartupInputEx input, out StartupOutput output);
 
-        [DllImport(LibraryName)]
+        [LibraryImport(LibraryName)]
-        private static extern int GdipCreateFromHWND(IntPtr hwnd, out IntPtr graphics);
+        private static partial int GdipCreateFromHWND(IntPtr hwnd, out IntPtr graphics);
 
-        [DllImport(LibraryName)]
+        [LibraryImport(LibraryName)]
-        private static extern int GdipDeleteGraphics(IntPtr graphics);
+        private static partial int GdipDeleteGraphics(IntPtr graphics);
 
-        [DllImport(LibraryName)]
+        [LibraryImport(LibraryName)]
-        private static extern int GdipGetDpiX(IntPtr graphics, out float dpi);
+        private static partial int GdipGetDpiX(IntPtr graphics, out float dpi);
 
         public static float GetDpiX(IntPtr hwnd)
         {

Ryujinx.Common/SystemInterop/WindowsMultimediaTimerResolution.cs

@@ -4,13 +4,13 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Runtime.Versioning;
 
-namespace Ryujinx.Common.System
+namespace Ryujinx.Common.SystemInterop
 {
     /// <summary>
     /// Handle Windows Multimedia timer resolution.
     /// </summary>
     [SupportedOSPlatform("windows")]
-    public class WindowsMultimediaTimerResolution : IDisposable
+    public partial class WindowsMultimediaTimerResolution : IDisposable
     {
         [StructLayout(LayoutKind.Sequential)]
         public struct TimeCaps
@@ -19,14 +19,14 @@ namespace Ryujinx.Common.System
             public uint wPeriodMax;
         };
 
-        [DllImport("winmm.dll", EntryPoint = "timeGetDevCaps", SetLastError = true)]
+        [LibraryImport("winmm.dll", EntryPoint = "timeGetDevCaps", SetLastError = true)]
-        private static extern uint TimeGetDevCaps(ref TimeCaps timeCaps, uint sizeTimeCaps);
+        private static partial uint TimeGetDevCaps(ref TimeCaps timeCaps, uint sizeTimeCaps);
 
-        [DllImport("winmm.dll", EntryPoint = "timeBeginPeriod")]
+        [LibraryImport("winmm.dll", EntryPoint = "timeBeginPeriod")]
-        private static extern uint TimeBeginPeriod(uint uMilliseconds);
+        private static partial uint TimeBeginPeriod(uint uMilliseconds);
 
-        [DllImport("winmm.dll", EntryPoint = "timeEndPeriod")]
+        [LibraryImport("winmm.dll", EntryPoint = "timeEndPeriod")]
-        private static extern uint TimeEndPeriod(uint uMilliseconds);
+        private static partial uint TimeEndPeriod(uint uMilliseconds);
 
         private uint _targetResolutionInMilliseconds;
         private bool _isActive;

Ryujinx.Graphics.Gpu/Engine/Threed/DrawManager.cs

@@ -98,7 +98,12 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
         /// <param name="argument">Method call argument</param>
         public void DrawEnd(ThreedClass engine, int argument)
         {
-            DrawEnd(engine, _state.State.IndexBufferState.First, (int)_state.State.IndexBufferCount);
+            DrawEnd(
+                engine,
+                _state.State.IndexBufferState.First,
+                (int)_state.State.IndexBufferCount,
+                _state.State.VertexBufferDrawState.First,
+                _state.State.VertexBufferDrawState.Count);
         }
 
         /// <summary>
@@ -108,7 +113,9 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
         /// <param name="engine">3D engine where this method is being called</param>
         /// <param name="firstIndex">Index of the first index buffer element used on the draw</param>
         /// <param name="indexCount">Number of index buffer elements used on the draw</param>
-        private void DrawEnd(ThreedClass engine, int firstIndex, int indexCount)
+        /// <param name="drawFirstVertex">Index of the first vertex used on the draw</param>
+        /// <param name="drawVertexCount">Number of vertices used on the draw</param>
+        private void DrawEnd(ThreedClass engine, int firstIndex, int indexCount, int drawFirstVertex, int drawVertexCount)
         {
             ConditionalRenderEnabled renderEnable = ConditionalRendering.GetRenderEnable(
                 _context,
@@ -195,7 +202,7 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
             {
                 var drawState = _state.State.VertexBufferDrawState;
 
-                _context.Renderer.Pipeline.Draw(drawState.Count, 1, drawState.First, firstInstance);
+                _context.Renderer.Pipeline.Draw(drawVertexCount, 1, drawFirstVertex, firstInstance);
             }
 
             _drawState.DrawIndexed = false;
@@ -216,16 +223,8 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
             bool incrementInstance = (argument & (1 << 26)) != 0;
             bool resetInstance = (argument & (1 << 27)) == 0;
 
-            if (_state.State.PrimitiveTypeOverrideEnable)
+            PrimitiveType type = (PrimitiveType)(argument & 0xffff);
-            {
+            DrawBegin(incrementInstance, resetInstance, type);
-                PrimitiveTypeOverride typeOverride = _state.State.PrimitiveTypeOverride;
-                DrawBegin(incrementInstance, resetInstance, typeOverride.Convert());
-            }
-            else
-            {
-                PrimitiveType type = (PrimitiveType)(argument & 0xffff);
-                DrawBegin(incrementInstance, resetInstance, type.Convert());
-            }
         }
 
         /// <summary>
@@ -234,8 +233,8 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
         /// </summary>
         /// <param name="incrementInstance">Indicates if the current instance should be incremented</param>
         /// <param name="resetInstance">Indicates if the current instance should be set to zero</param>
-        /// <param name="topology">Primitive topology</param>
+        /// <param name="primitiveType">Primitive type</param>
-        private void DrawBegin(bool incrementInstance, bool resetInstance, PrimitiveTopology topology)
+        private void DrawBegin(bool incrementInstance, bool resetInstance, PrimitiveType primitiveType)
         {
             if (incrementInstance)
             {
@@ -248,6 +247,18 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
                 _instanceIndex = 0;
             }
 
+            PrimitiveTopology topology;
+
+            if (_state.State.PrimitiveTypeOverrideEnable)
+            {
+                PrimitiveTypeOverride typeOverride = _state.State.PrimitiveTypeOverride;
+                topology = typeOverride.Convert();
+            }
+            else
+            {
+                topology = primitiveType.Convert();
+            }
+
             UpdateTopology(topology);
         }
 
@@ -276,46 +287,70 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
             _drawState.DrawIndexed = true;
         }
 
+        // TODO: Verify if the index type is implied from the method that is called,
+        // or if it uses the state index type on hardware.
+
         /// <summary>
-        /// Performs a indexed draw with a low number of index buffer elements.
+        /// Performs a indexed draw with 8-bit index buffer elements.
         /// </summary>
         /// <param name="engine">3D engine where this method is being called</param>
         /// <param name="argument">Method call argument</param>
-        public void DrawIndexedSmall(ThreedClass engine, int argument)
+        public void DrawIndexBuffer8BeginEndInstanceFirst(ThreedClass engine, int argument)
         {
-            DrawIndexedSmall(engine, argument, false);
+            DrawIndexBufferBeginEndInstance(engine, argument, false);
         }
 
         /// <summary>
-        /// Performs a indexed draw with a low number of index buffer elements.
+        /// Performs a indexed draw with 16-bit index buffer elements.
         /// </summary>
         /// <param name="engine">3D engine where this method is being called</param>
         /// <param name="argument">Method call argument</param>
-        public void DrawIndexedSmall2(ThreedClass engine, int argument)
+        public void DrawIndexBuffer16BeginEndInstanceFirst(ThreedClass engine, int argument)
         {
-            DrawIndexedSmall(engine, argument);
+            DrawIndexBufferBeginEndInstance(engine, argument, false);
         }
 
         /// <summary>
-        /// Performs a indexed draw with a low number of index buffer elements,
+        /// Performs a indexed draw with 32-bit index buffer elements.
+        /// </summary>
+        /// <param name="engine">3D engine where this method is being called</param>
+        /// <param name="argument">Method call argument</param>
+        public void DrawIndexBuffer32BeginEndInstanceFirst(ThreedClass engine, int argument)
+        {
+            DrawIndexBufferBeginEndInstance(engine, argument, false);
+        }
+
+        /// <summary>
+        /// Performs a indexed draw with 8-bit index buffer elements,
         /// while also pre-incrementing the current instance value.
         /// </summary>
         /// <param name="engine">3D engine where this method is being called</param>
         /// <param name="argument">Method call argument</param>
-        public void DrawIndexedSmallIncInstance(ThreedClass engine, int argument)
+        public void DrawIndexBuffer8BeginEndInstanceSubsequent(ThreedClass engine, int argument)
         {
-            DrawIndexedSmall(engine, argument, true);
+            DrawIndexBufferBeginEndInstance(engine, argument, true);
         }
 
         /// <summary>
-        /// Performs a indexed draw with a low number of index buffer elements,
+        /// Performs a indexed draw with 16-bit index buffer elements,
         /// while also pre-incrementing the current instance value.
         /// </summary>
         /// <param name="engine">3D engine where this method is being called</param>
         /// <param name="argument">Method call argument</param>
-        public void DrawIndexedSmallIncInstance2(ThreedClass engine, int argument)
+        public void DrawIndexBuffer16BeginEndInstanceSubsequent(ThreedClass engine, int argument)
         {
-            DrawIndexedSmallIncInstance(engine, argument);
+            DrawIndexBufferBeginEndInstance(engine, argument, true);
+        }
+
+        /// <summary>
+        /// Performs a indexed draw with 32-bit index buffer elements,
+        /// while also pre-incrementing the current instance value.
+        /// </summary>
+        /// <param name="engine">3D engine where this method is being called</param>
+        /// <param name="argument">Method call argument</param>
+        public void DrawIndexBuffer32BeginEndInstanceSubsequent(ThreedClass engine, int argument)
+        {
+            DrawIndexBufferBeginEndInstance(engine, argument, true);
         }
 
         /// <summary>
@@ -325,11 +360,9 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
         /// <param name="engine">3D engine where this method is being called</param>
         /// <param name="argument">Method call argument</param>
         /// <param name="instanced">True to increment the current instance value, false otherwise</param>
-        private void DrawIndexedSmall(ThreedClass engine, int argument, bool instanced)
+        private void DrawIndexBufferBeginEndInstance(ThreedClass engine, int argument, bool instanced)
         {
-            PrimitiveTypeOverride typeOverride = _state.State.PrimitiveTypeOverride;
+            DrawBegin(instanced, !instanced, (PrimitiveType)((argument >> 28) & 0xf));
-
-            DrawBegin(instanced, !instanced, typeOverride.Convert());
 
             int firstIndex = argument & 0xffff;
             int indexCount = (argument >> 16) & 0xfff;
@@ -339,7 +372,51 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
             _drawState.DrawIndexed = true;
             engine.ForceStateDirty(IndexBufferCountMethodOffset * 4);
 
-            DrawEnd(engine, firstIndex, indexCount);
+            DrawEnd(engine, firstIndex, indexCount, 0, 0);
+
+            _drawState.DrawIndexed = oldDrawIndexed;
+        }
+
+        /// <summary>
+        /// Performs a non-indexed draw with the specified topology, index and count.
+        /// </summary>
+        /// <param name="engine">3D engine where this method is being called</param>
+        /// <param name="argument">Method call argument</param>
+        public void DrawVertexArrayBeginEndInstanceFirst(ThreedClass engine, int argument)
+        {
+            DrawVertexArrayBeginEndInstance(engine, argument, false);
+        }
+
+        /// <summary>
+        /// Performs a non-indexed draw with the specified topology, index and count,
+        /// while incrementing the current instance.
+        /// </summary>
+        /// <param name="engine">3D engine where this method is being called</param>
+        /// <param name="argument">Method call argument</param>
+        public void DrawVertexArrayBeginEndInstanceSubsequent(ThreedClass engine, int argument)
+        {
+            DrawVertexArrayBeginEndInstance(engine, argument, true);
+        }
+
+        /// <summary>
+        /// Performs a indexed draw with a low number of index buffer elements,
+        /// while optionally also pre-incrementing the current instance value.
+        /// </summary>
+        /// <param name="engine">3D engine where this method is being called</param>
+        /// <param name="argument">Method call argument</param>
+        /// <param name="instanced">True to increment the current instance value, false otherwise</param>
+        private void DrawVertexArrayBeginEndInstance(ThreedClass engine, int argument, bool instanced)
+        {
+            DrawBegin(instanced, !instanced, (PrimitiveType)((argument >> 28) & 0xf));
+
+            int firstVertex = argument & 0xffff;
+            int vertexCount = (argument >> 16) & 0xfff;
+
+            bool oldDrawIndexed = _drawState.DrawIndexed;
+
+            _drawState.DrawIndexed = false;
+
+            DrawEnd(engine, 0, 0, firstVertex, vertexCount);
 
             _drawState.DrawIndexed = oldDrawIndexed;
         }

Ryujinx.Graphics.Gpu/Engine/Threed/StateUpdater.cs

@@ -1,7 +1,5 @@
 using Ryujinx.Common.Logging;
-using Ryujinx.Common.Memory;
 using Ryujinx.Graphics.GAL;
-using Ryujinx.Graphics.Gpu.Engine.GPFifo;
 using Ryujinx.Graphics.Gpu.Engine.Types;
 using Ryujinx.Graphics.Gpu.Image;
 using Ryujinx.Graphics.Gpu.Shader;
@@ -1295,7 +1293,14 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
 
             for (int stageIndex = 0; stageIndex < Constants.ShaderStages; stageIndex++)
             {
-                _currentProgramInfo[stageIndex] = gs.Shaders[stageIndex + 1]?.Info;
+                ShaderProgramInfo info = gs.Shaders[stageIndex + 1]?.Info;
+
+                if (info?.UsesRtLayer == true)
+                {
+                    _vtgWritesRtLayer = true;
+                }
+
+                _currentProgramInfo[stageIndex] = info;
             }
 
             _context.Renderer.Pipeline.SetProgram(gs.HostProgram);

Ryujinx.Graphics.Gpu/Engine/Threed/ThreedClass.cs

@@ -42,6 +42,8 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
                 { nameof(ThreedClassState.TextureBarrier), new RwCallback(TextureBarrier, null) },
                 { nameof(ThreedClassState.TextureBarrierTiled), new RwCallback(TextureBarrierTiled, null) },
                 { nameof(ThreedClassState.DrawTextureSrcY), new RwCallback(DrawTexture, null) },
+                { nameof(ThreedClassState.DrawVertexArrayBeginEndInstanceFirst), new RwCallback(DrawVertexArrayBeginEndInstanceFirst, null) },
+                { nameof(ThreedClassState.DrawVertexArrayBeginEndInstanceSubsequent), new RwCallback(DrawVertexArrayBeginEndInstanceSubsequent, null) },
                 { nameof(ThreedClassState.VbElementU8), new RwCallback(VbElementU8, null) },
                 { nameof(ThreedClassState.VbElementU16), new RwCallback(VbElementU16, null) },
                 { nameof(ThreedClassState.VbElementU32), new RwCallback(VbElementU32, null) },
@@ -49,10 +51,12 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
                 { nameof(ThreedClassState.RenderEnableCondition), new RwCallback(null, Zero) },
                 { nameof(ThreedClassState.DrawEnd), new RwCallback(DrawEnd, null) },
                 { nameof(ThreedClassState.DrawBegin), new RwCallback(DrawBegin, null) },
-                { nameof(ThreedClassState.DrawIndexedSmall), new RwCallback(DrawIndexedSmall, null) },
+                { nameof(ThreedClassState.DrawIndexBuffer32BeginEndInstanceFirst), new RwCallback(DrawIndexBuffer32BeginEndInstanceFirst, null) },
-                { nameof(ThreedClassState.DrawIndexedSmall2), new RwCallback(DrawIndexedSmall2, null) },
+                { nameof(ThreedClassState.DrawIndexBuffer16BeginEndInstanceFirst), new RwCallback(DrawIndexBuffer16BeginEndInstanceFirst, null) },
-                { nameof(ThreedClassState.DrawIndexedSmallIncInstance), new RwCallback(DrawIndexedSmallIncInstance, null) },
+                { nameof(ThreedClassState.DrawIndexBuffer8BeginEndInstanceFirst), new RwCallback(DrawIndexBuffer8BeginEndInstanceFirst, null) },
-                { nameof(ThreedClassState.DrawIndexedSmallIncInstance2), new RwCallback(DrawIndexedSmallIncInstance2, null) },
+                { nameof(ThreedClassState.DrawIndexBuffer32BeginEndInstanceSubsequent), new RwCallback(DrawIndexBuffer32BeginEndInstanceSubsequent, null) },
+                { nameof(ThreedClassState.DrawIndexBuffer16BeginEndInstanceSubsequent), new RwCallback(DrawIndexBuffer16BeginEndInstanceSubsequent, null) },
+                { nameof(ThreedClassState.DrawIndexBuffer8BeginEndInstanceSubsequent), new RwCallback(DrawIndexBuffer8BeginEndInstanceSubsequent, null) },
                 { nameof(ThreedClassState.IndexBufferCount), new RwCallback(SetIndexBufferCount, null) },
                 { nameof(ThreedClassState.Clear), new RwCallback(Clear, null) },
                 { nameof(ThreedClassState.SemaphoreControl), new RwCallback(Report, null) },
@@ -303,6 +307,25 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
             _drawManager.DrawTexture(this, argument);
         }
 
+        /// <summary>
+        /// Performs a non-indexed draw with the specified topology, index and count.
+        /// </summary>
+        /// <param name="argument">Method call argument</param>
+        private void DrawVertexArrayBeginEndInstanceFirst(int argument)
+        {
+            _drawManager.DrawVertexArrayBeginEndInstanceFirst(this, argument);
+        }
+
+        /// <summary>
+        /// Performs a non-indexed draw with the specified topology, index and count,
+        /// while incrementing the current instance.
+        /// </summary>
+        /// <param name="argument">Method call argument</param>
+        private void DrawVertexArrayBeginEndInstanceSubsequent(int argument)
+        {
+            _drawManager.DrawVertexArrayBeginEndInstanceSubsequent(this, argument);
+        }
+
         /// <summary>
         /// Pushes four 8-bit index buffer elements.
         /// </summary>
@@ -370,41 +393,60 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
         }
 
         /// <summary>
-        /// Performs a indexed draw with a low number of index buffer elements.
+        /// Performs a indexed draw with 8-bit index buffer elements.
         /// </summary>
         /// <param name="argument">Method call argument</param>
-        private void DrawIndexedSmall(int argument)
+        private void DrawIndexBuffer8BeginEndInstanceFirst(int argument)
         {
-            _drawManager.DrawIndexedSmall(this, argument);
+            _drawManager.DrawIndexBuffer8BeginEndInstanceFirst(this, argument);
         }
 
         /// <summary>
-        /// Performs a indexed draw with a low number of index buffer elements.
+        /// Performs a indexed draw with 16-bit index buffer elements.
         /// </summary>
         /// <param name="argument">Method call argument</param>
-        private void DrawIndexedSmall2(int argument)
+        private void DrawIndexBuffer16BeginEndInstanceFirst(int argument)
         {
-            _drawManager.DrawIndexedSmall2(this, argument);
+            _drawManager.DrawIndexBuffer16BeginEndInstanceFirst(this, argument);
         }
 
         /// <summary>
-        /// Performs a indexed draw with a low number of index buffer elements,
+        /// Performs a indexed draw with 32-bit index buffer elements.
+        /// </summary>
+        /// <param name="argument">Method call argument</param>
+        private void DrawIndexBuffer32BeginEndInstanceFirst(int argument)
+        {
+            _drawManager.DrawIndexBuffer32BeginEndInstanceFirst(this, argument);
+        }
+
+        /// <summary>
+        /// Performs a indexed draw with 8-bit index buffer elements,
         /// while also pre-incrementing the current instance value.
         /// </summary>
         /// <param name="argument">Method call argument</param>
-        private void DrawIndexedSmallIncInstance(int argument)
+        private void DrawIndexBuffer8BeginEndInstanceSubsequent(int argument)
         {
-            _drawManager.DrawIndexedSmallIncInstance(this, argument);
+            _drawManager.DrawIndexBuffer8BeginEndInstanceSubsequent(this, argument);
         }
 
         /// <summary>
-        /// Performs a indexed draw with a low number of index buffer elements,
+        /// Performs a indexed draw with 16-bit index buffer elements,
         /// while also pre-incrementing the current instance value.
         /// </summary>
         /// <param name="argument">Method call argument</param>
-        private void DrawIndexedSmallIncInstance2(int argument)
+        private void DrawIndexBuffer16BeginEndInstanceSubsequent(int argument)
         {
-            _drawManager.DrawIndexedSmallIncInstance2(this, argument);
+            _drawManager.DrawIndexBuffer16BeginEndInstanceSubsequent(this, argument);
+        }
+
+        /// <summary>
+        /// Performs a indexed draw with 32-bit index buffer elements,
+        /// while also pre-incrementing the current instance value.
+        /// </summary>
+        /// <param name="argument">Method call argument</param>
+        private void DrawIndexBuffer32BeginEndInstanceSubsequent(int argument)
+        {
+            _drawManager.DrawIndexBuffer32BeginEndInstanceSubsequent(this, argument);
         }
 
         /// <summary>

Ryujinx.Graphics.Gpu/Engine/Threed/ThreedClassState.cs

@@ -813,7 +813,9 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
         public uint ClearFlags;
         public fixed uint Reserved10FC[25];
         public Array32<VertexAttribState> VertexAttribState;
-        public fixed uint Reserved11E0[15];
+        public fixed uint Reserved11E0[13];
+        public uint DrawVertexArrayBeginEndInstanceFirst;
+        public uint DrawVertexArrayBeginEndInstanceSubsequent;
         public RtControl RtControl;
         public fixed uint Reserved1220[2];
         public Size3D RtDepthStencilSize;
@@ -888,12 +890,13 @@ namespace Ryujinx.Graphics.Gpu.Engine.Threed
         public fixed uint Reserved164C[95];
         public IndexBufferState IndexBufferState;
         public uint IndexBufferCount;
-        public uint DrawIndexedSmall;
+        public uint DrawIndexBuffer32BeginEndInstanceFirst;
-        public uint DrawIndexedSmall2;
+        public uint DrawIndexBuffer16BeginEndInstanceFirst;
-        public uint Reserved17EC;
+        public uint DrawIndexBuffer8BeginEndInstanceFirst;
-        public uint DrawIndexedSmallIncInstance;
+        public uint DrawIndexBuffer32BeginEndInstanceSubsequent;
-        public uint DrawIndexedSmallIncInstance2;
+        public uint DrawIndexBuffer16BeginEndInstanceSubsequent;
-        public fixed uint Reserved17F8[33];
+        public uint DrawIndexBuffer8BeginEndInstanceSubsequent;
+        public fixed uint Reserved17FC[32];
         public float DepthBiasClamp;
         public Array16<Boolean32> VertexBufferInstanced;
         public fixed uint Reserved18C0[20];

Ryujinx.Graphics.Gpu/Shader/DiskCache/DiskCacheHostStorage.cs

@@ -22,7 +22,7 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
         private const ushort FileFormatVersionMajor = 1;
         private const ushort FileFormatVersionMinor = 2;
         private const uint FileFormatVersionPacked = ((uint)FileFormatVersionMajor << 16) | FileFormatVersionMinor;
-        private const uint CodeGenVersion = 4069;
+        private const uint CodeGenVersion = 4106;
 
         private const string SharedTocFileName = "shared.toc";
         private const string SharedDataFileName = "shared.data";

Ryujinx.Graphics.Gpu/Shader/DiskCache/ShaderBinarySerializer.cs

@@ -53,7 +53,7 @@ namespace Ryujinx.Graphics.Gpu.Shader.DiskCache
             {
                 CachedShaderStage currentStage = stages[i];
 
-                if (currentStage != null && currentStage.Info.Stage == stage && currentStage.Info != null)
+                if (currentStage?.Info != null && currentStage.Info.Stage == stage)
                 {
                     return ShaderCache.GetBindings(currentStage.Info);
                 }

Ryujinx.Graphics.Nvdec.FFmpeg/Native/FFmpegApi.cs

@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 
 namespace Ryujinx.Graphics.Nvdec.FFmpeg.Native
 {
-    static class FFmpegApi
+    static partial class FFmpegApi
     {
         public const string AvCodecLibraryName = "avcodec";
         public const string AvUtilLibraryName = "avutil";
@@ -78,52 +78,52 @@ namespace Ryujinx.Graphics.Nvdec.FFmpeg.Native
 
         public unsafe delegate void av_log_set_callback_callback(void* a0, AVLog level, [MarshalAs(UnmanagedType.LPUTF8Str)] string a2, byte* a3);
 
-        [DllImport(AvUtilLibraryName, CallingConvention = CallingConvention.Cdecl)]
+        [LibraryImport(AvUtilLibraryName)]
-        internal static unsafe extern AVFrame* av_frame_alloc();
+        internal static unsafe partial AVFrame* av_frame_alloc();
 
-        [DllImport(AvUtilLibraryName, CallingConvention = CallingConvention.Cdecl)]
+        [LibraryImport(AvUtilLibraryName)]
-        internal static unsafe extern void av_frame_unref(AVFrame* frame);
+        internal static unsafe partial void av_frame_unref(AVFrame* frame);
 
-        [DllImport(AvUtilLibraryName, CallingConvention = CallingConvention.Cdecl)]
+        [LibraryImport(AvUtilLibraryName)]
-        internal static unsafe extern void av_free(AVFrame* frame);
+        internal static unsafe partial void av_free(AVFrame* frame);
 
-        [DllImport(AvUtilLibraryName, CallingConvention = CallingConvention.Cdecl)]
+        [LibraryImport(AvUtilLibraryName)]
-        internal static unsafe extern void av_log_set_level(AVLog level);
+        internal static unsafe partial void av_log_set_level(AVLog level);
 
-        [DllImport(AvUtilLibraryName, CallingConvention = CallingConvention.Cdecl)]
+        [LibraryImport(AvUtilLibraryName)]
-        internal static unsafe extern void av_log_set_callback(av_log_set_callback_callback callback);
+        internal static unsafe partial void av_log_set_callback(av_log_set_callback_callback callback);
 
-        [DllImport(AvUtilLibraryName, CallingConvention = CallingConvention.Cdecl)]
+        [LibraryImport(AvUtilLibraryName)]
-        internal static unsafe extern AVLog av_log_get_level();
+        internal static unsafe partial AVLog av_log_get_level();
 
-        [DllImport(AvUtilLibraryName, CallingConvention = CallingConvention.Cdecl)]
+        [LibraryImport(AvUtilLibraryName)]
-        internal static unsafe extern void av_log_format_line(void* ptr, AVLog level, [MarshalAs(UnmanagedType.LPUTF8Str)] string fmt, byte* vl, byte* line, int lineSize, int* printPrefix);
+        internal static unsafe partial void av_log_format_line(void* ptr, AVLog level, [MarshalAs(UnmanagedType.LPUTF8Str)] string fmt, byte* vl, byte* line, int lineSize, int* printPrefix);
 
-        [DllImport(AvCodecLibraryName, CallingConvention = CallingConvention.Cdecl)]
+        [LibraryImport(AvCodecLibraryName)]
-        internal static unsafe extern AVCodec* avcodec_find_decoder(AVCodecID id);
+        internal static unsafe partial AVCodec* avcodec_find_decoder(AVCodecID id);
 
-        [DllImport(AvCodecLibraryName, CallingConvention = CallingConvention.Cdecl)]
+        [LibraryImport(AvCodecLibraryName)]
-        internal static unsafe extern AVCodecContext* avcodec_alloc_context3(AVCodec* codec);
+        internal static unsafe partial AVCodecContext* avcodec_alloc_context3(AVCodec* codec);
 
-        [DllImport(AvCodecLibraryName, CallingConvention = CallingConvention.Cdecl)]
+        [LibraryImport(AvCodecLibraryName)]
-        internal static unsafe extern int avcodec_open2(AVCodecContext* avctx, AVCodec* codec, void **options);
+        internal static unsafe partial int avcodec_open2(AVCodecContext* avctx, AVCodec* codec, void **options);
 
-        [DllImport(AvCodecLibraryName, CallingConvention = CallingConvention.Cdecl)]
+        [LibraryImport(AvCodecLibraryName)]
-        internal static unsafe extern int avcodec_close(AVCodecContext* avctx);
+        internal static unsafe partial int avcodec_close(AVCodecContext* avctx);
 
-        [DllImport(AvCodecLibraryName, CallingConvention = CallingConvention.Cdecl)]
+        [LibraryImport(AvCodecLibraryName)]
-        internal static unsafe extern void avcodec_free_context(AVCodecContext** avctx);
+        internal static unsafe partial void avcodec_free_context(AVCodecContext** avctx);
 
-        [DllImport(AvCodecLibraryName, CallingConvention = CallingConvention.Cdecl)]
+        [LibraryImport(AvCodecLibraryName)]
-        internal static unsafe extern AVPacket* av_packet_alloc();
+        internal static unsafe partial AVPacket* av_packet_alloc();
 
-        [DllImport(AvCodecLibraryName, CallingConvention = CallingConvention.Cdecl)]
+        [LibraryImport(AvCodecLibraryName)]
-        internal static unsafe extern void av_packet_unref(AVPacket* pkt);
+        internal static unsafe partial void av_packet_unref(AVPacket* pkt);
 
-        [DllImport(AvCodecLibraryName, CallingConvention = CallingConvention.Cdecl)]
+        [LibraryImport(AvCodecLibraryName)]
-        internal static unsafe extern void av_packet_free(AVPacket** pkt);
+        internal static unsafe partial void av_packet_free(AVPacket** pkt);
 
-        [DllImport(AvCodecLibraryName, CallingConvention = CallingConvention.Cdecl)]
+        [LibraryImport(AvCodecLibraryName)]
-        internal static unsafe extern int avcodec_version();
+        internal static unsafe partial int avcodec_version();
     }
 }

Ryujinx.Graphics.OpenGL/Helper/GLXHelper.cs

@@ -5,7 +5,7 @@ using System.Runtime.Versioning;
 namespace Ryujinx.Graphics.OpenGL.Helper
 {
     [SupportedOSPlatform("linux")]
-    internal static class GLXHelper
+    internal static partial class GLXHelper
     {
         private const string LibraryName = "glx.dll";
 
@@ -30,7 +30,7 @@ namespace Ryujinx.Graphics.OpenGL.Helper
             });
         }
 
-        [DllImport(LibraryName, EntryPoint = "glXGetCurrentContext")]
+        [LibraryImport(LibraryName, EntryPoint = "glXGetCurrentContext")]
-        public static extern IntPtr GetCurrentContext();
+        public static partial IntPtr GetCurrentContext();
     }
 }

Ryujinx.Graphics.OpenGL/Helper/WGLHelper.cs

@@ -5,11 +5,11 @@ using System.Runtime.Versioning;
 namespace Ryujinx.Graphics.OpenGL.Helper
 {
     [SupportedOSPlatform("windows")]
-    internal static class WGLHelper
+    internal static partial class WGLHelper
     {
         private const string LibraryName = "OPENGL32.DLL";
 
-        [DllImport(LibraryName, EntryPoint = "wglGetCurrentContext")]
+        [LibraryImport(LibraryName, EntryPoint = "wglGetCurrentContext")]
-        public extern static IntPtr GetCurrentContext();
+        public static partial IntPtr GetCurrentContext();
     }
 }

Ryujinx.Graphics.Shader/Translation/Optimizations/ConstantFolding.cs

@@ -262,7 +262,7 @@ namespace Ryujinx.Graphics.Shader.Translation.Optimizations
 
             value = (value >> operation.Index * 16) & 0xffff;
 
-            operation.TurnIntoCopy(ConstF(HalfConversion.HalfToSingle(value)));
+            operation.TurnIntoCopy(ConstF((float)BitConverter.UInt16BitsToHalf((ushort)value)));
         }
 
         private static void FPNegate(Operation operation)

Ryujinx.Graphics.Shader/Translation/Optimizations/HalfConversion.cs

@@ -1,47 +0,0 @@
-using System;
-
-namespace Ryujinx.Graphics.Shader.Translation.Optimizations
-{
-    static class HalfConversion
-    {
-        public static float HalfToSingle(int value)
-        {
-            int mantissa = (value >> 0)  & 0x3ff;
-            int exponent = (value >> 10) & 0x1f;
-            int sign     = (value >> 15) & 0x1;
-
-            if (exponent == 0x1f)
-            {
-                // NaN or Infinity.
-                mantissa <<= 13;
-                exponent   = 0xff;
-            }
-            else if (exponent != 0 || mantissa != 0 )
-            {
-                if (exponent == 0)
-                {
-                    // Denormal.
-                    int e = -1;
-                    int m = mantissa;
-
-                    do
-                    {
-                        e++;
-                        m <<= 1;
-                    }
-                    while ((m & 0x400) == 0);
-
-                    mantissa = m & 0x3ff;
-                    exponent = e;
-                }
-
-                mantissa <<= 13;
-                exponent   = 127 - 15 + exponent;
-            }
-
-            int output = (sign << 31) | (exponent << 23) | mantissa;
-
-            return BitConverter.Int32BitsToSingle(output);
-        }
-    }
-}

Ryujinx.Graphics.Vulkan/VulkanInitialization.cs

@@ -374,7 +374,24 @@ namespace Ryujinx.Graphics.Vulkan
             api.GetPhysicalDeviceProperties(physicalDevice, out var properties);
             bool useRobustBufferAccess = VendorUtils.FromId(properties.VendorID) == Vendor.Nvidia;
 
-            var supportedFeatures = api.GetPhysicalDeviceFeature(physicalDevice);
+            PhysicalDeviceFeatures2 features2 = new PhysicalDeviceFeatures2()
+            {
+                SType = StructureType.PhysicalDeviceFeatures2
+            };
+
+            PhysicalDeviceCustomBorderColorFeaturesEXT featuresCustomBorderColorSupported = new PhysicalDeviceCustomBorderColorFeaturesEXT()
+            {
+                SType = StructureType.PhysicalDeviceCustomBorderColorFeaturesExt
+            };
+
+            if (supportedExtensions.Contains("VK_EXT_custom_border_color"))
+            {
+                features2.PNext = &featuresCustomBorderColorSupported;
+            }
+
+            api.GetPhysicalDeviceFeatures2(physicalDevice, &features2);
+
+            var supportedFeatures = features2.Features;
 
             var features = new PhysicalDeviceFeatures()
             {
@@ -491,6 +508,23 @@ namespace Ryujinx.Graphics.Vulkan
                 pExtendedFeatures = &featuresSubgroupSizeControl;
             }
 
+            PhysicalDeviceCustomBorderColorFeaturesEXT featuresCustomBorderColor;
+
+            if (supportedExtensions.Contains("VK_EXT_custom_border_color") &&
+                featuresCustomBorderColorSupported.CustomBorderColors &&
+                featuresCustomBorderColorSupported.CustomBorderColorWithoutFormat)
+            {
+                featuresCustomBorderColor = new PhysicalDeviceCustomBorderColorFeaturesEXT()
+                {
+                    SType = StructureType.PhysicalDeviceCustomBorderColorFeaturesExt,
+                    PNext = pExtendedFeatures,
+                    CustomBorderColors = true,
+                    CustomBorderColorWithoutFormat = true,
+                };
+
+                pExtendedFeatures = &featuresCustomBorderColor;
+            }
+
             var enabledExtensions = RequiredExtensions.Union(DesirableExtensions.Intersect(supportedExtensions)).ToArray();
 
             IntPtr* ppEnabledExtensions = stackalloc IntPtr[enabledExtensions.Length];

Ryujinx.Graphics.Vulkan/VulkanRenderer.cs

@@ -177,6 +177,11 @@ namespace Ryujinx.Graphics.Vulkan
                 SType = StructureType.PhysicalDeviceShaderFloat16Int8Features
             };
 
+            PhysicalDeviceCustomBorderColorFeaturesEXT featuresCustomBorderColor = new PhysicalDeviceCustomBorderColorFeaturesEXT()
+            {
+                SType = StructureType.PhysicalDeviceCustomBorderColorFeaturesExt
+            };
+
             if (supportedExtensions.Contains("VK_EXT_robustness2"))
             {
                 features2.PNext = &featuresRobustness2;
@@ -188,8 +193,18 @@ namespace Ryujinx.Graphics.Vulkan
                 features2.PNext = &featuresShaderInt8;
             }
 
+            if (supportedExtensions.Contains("VK_EXT_custom_border_color"))
+            {
+                featuresCustomBorderColor.PNext = features2.PNext;
+                features2.PNext = &featuresCustomBorderColor;
+            }
+
             Api.GetPhysicalDeviceFeatures2(_physicalDevice, &features2);
 
+            bool customBorderColorSupported = supportedExtensions.Contains("VK_EXT_custom_border_color") &&
+                                              featuresCustomBorderColor.CustomBorderColors &&
+                                              featuresCustomBorderColor.CustomBorderColorWithoutFormat;
+
             ref var properties = ref properties2.Properties;
 
             SampleCountFlags supportedSampleCounts =
@@ -199,7 +214,7 @@ namespace Ryujinx.Graphics.Vulkan
 
             Capabilities = new HardwareCapabilities(
                 supportedExtensions.Contains("VK_EXT_index_type_uint8"),
-                supportedExtensions.Contains("VK_EXT_custom_border_color"),
+                customBorderColorSupported,
                 supportedExtensions.Contains(KhrDrawIndirectCount.ExtensionName),
                 supportedExtensions.Contains("VK_EXT_fragment_shader_interlock"),
                 supportedExtensions.Contains("VK_NV_geometry_shader_passthrough"),

Ryujinx.HLE/HOS/Services/Sockets/Sfdnsres/IResolver.cs

@@ -18,7 +18,10 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Sfdnsres
     [Service("sfdnsres")]
     class IResolver : IpcService
     {
-        public IResolver(ServiceCtx context) { }
+        public IResolver(ServiceCtx context)
+        {
+            DnsMitmResolver.Instance.ReloadEntries(context);
+        }
 
         [CommandHipc(0)]
         // SetDnsAddressesPrivateRequest(u32, buffer<unknown, 5, 0>)
@@ -259,6 +262,16 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Sfdnsres
             return ResultCode.Success;
         }
 
+        // Atmosphère extension for dns_mitm
+        [CommandHipc(65000)]
+        // AtmosphereReloadHostsFile()
+        public ResultCode AtmosphereReloadHostsFile(ServiceCtx context)
+        {
+            DnsMitmResolver.Instance.ReloadEntries(context);
+
+            return ResultCode.Success;
+        }
+
         private static ResultCode GetHostByNameRequestImpl(
             ServiceCtx context,
             ulong inputBufferPosition,
@@ -321,7 +334,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Sfdnsres
 
                     try
                     {
-                        hostEntry = Dns.GetHostEntry(targetHost);
+                        hostEntry = DnsMitmResolver.Instance.ResolveAddress(targetHost);
                     }
                     catch (SocketException exception)
                     {
@@ -537,7 +550,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Sfdnsres
 
                     try
                     {
-                        hostEntry = Dns.GetHostEntry(targetHost);
+                        hostEntry = DnsMitmResolver.Instance.ResolveAddress(targetHost);
                     }
                     catch (SocketException exception)
                     {

Ryujinx.HLE/HOS/Services/Sockets/Sfdnsres/Proxy/DnsMitmResolver.cs

@@ -0,0 +1,106 @@
+using Ryujinx.Common.Logging;
+using Ryujinx.HLE.HOS.Services.Sockets.Nsd;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.IO.Enumeration;
+using System.Net;
+
+namespace Ryujinx.HLE.HOS.Services.Sockets.Sfdnsres.Proxy
+{
+    class DnsMitmResolver
+    {
+        private const string HostsFilePath = "/atmosphere/hosts/default.txt";
+
+        private static DnsMitmResolver _instance;
+        public static DnsMitmResolver Instance => _instance ??= new DnsMitmResolver();
+
+        private readonly Dictionary<string, IPAddress> _mitmHostEntries = new();
+
+        public void ReloadEntries(ServiceCtx context)
+        {
+            string sdPath = context.Device.Configuration.VirtualFileSystem.GetSdCardPath();
+            string filePath = context.Device.Configuration.VirtualFileSystem.GetFullPath(sdPath, HostsFilePath);
+
+            _mitmHostEntries.Clear();
+
+            if (File.Exists(filePath))
+            {
+                using FileStream fileStream = File.Open(filePath, FileMode.Open, FileAccess.Read);
+                using StreamReader reader = new(fileStream);
+
+                while (!reader.EndOfStream)
+                {
+                    string line = reader.ReadLine();
+
+                    if (line == null)
+                    {
+                        break;
+                    }
+
+                    // Ignore comments and empty lines
+                    if (line.StartsWith("#") || line.Trim().Length == 0)
+                    {
+                        continue;
+                    }
+
+                    string[] entry = line.Split(new[] { ' ', '\t' }, StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries);
+
+                    // Hosts file example entry:
+                    // 127.0.0.1  localhost loopback
+
+                    // 0. Check the size of the array
+                    if (entry.Length < 2)
+                    {
+                        Logger.Warning?.PrintMsg(LogClass.ServiceBsd, $"Invalid entry in hosts file: {line}");
+
+                        continue;
+                    }
+
+                    // 1. Parse the address
+                    if (!IPAddress.TryParse(entry[0], out IPAddress address))
+                    {
+                        Logger.Warning?.PrintMsg(LogClass.ServiceBsd, $"Failed to parse IP address in hosts file: {entry[0]}");
+
+                        continue;
+                    }
+
+                    // 2. Check for AMS hosts file extension: "%"
+                    for (int i = 1; i < entry.Length; i++)
+                    {
+                        entry[i] = entry[i].Replace("%", IManager.NsdSettings.Environment);
+                    }
+
+                    // 3. Add hostname to entry dictionary (updating duplicate entries)
+                    foreach (string hostname in entry[1..])
+                    {
+                        _mitmHostEntries[hostname] = address;
+                    }
+                }
+            }
+        }
+
+        public IPHostEntry ResolveAddress(string host)
+        {
+            foreach (var hostEntry in _mitmHostEntries)
+            {
+                // Check for AMS hosts file extension: "*"
+                // NOTE: MatchesSimpleExpression also allows "?" as a wildcard
+                if (FileSystemName.MatchesSimpleExpression(hostEntry.Key, host))
+                {
+                    Logger.Info?.PrintMsg(LogClass.ServiceBsd, $"Redirecting '{host}' to: {hostEntry.Value}");
+
+                    return new IPHostEntry
+                    {
+                        AddressList = new[] { hostEntry.Value },
+                        HostName = hostEntry.Key,
+                        Aliases = Array.Empty<string>()
+                    };
+                }
+            }
+
+            // No match has been found, resolve the host using regular dns
+            return Dns.GetHostEntry(host);
+        }
+    }
+}

Ryujinx.Headless.SDL2/Program.cs

@@ -10,7 +10,7 @@ using Ryujinx.Common.Configuration.Hid.Controller;
 using Ryujinx.Common.Configuration.Hid.Controller.Motion;
 using Ryujinx.Common.Configuration.Hid.Keyboard;
 using Ryujinx.Common.Logging;
-using Ryujinx.Common.System;
+using Ryujinx.Common.SystemInterop;
 using Ryujinx.Common.Utilities;
 using Ryujinx.Graphics.GAL;
 using Ryujinx.Graphics.GAL.Multithreading;

Ryujinx.Memory/MemoryManagerUnixHelper.cs

@@ -3,7 +3,7 @@ using System.Runtime.InteropServices;
 
 namespace Ryujinx.Memory
 {
-    public static class MemoryManagerUnixHelper
+    public static partial class MemoryManagerUnixHelper
     {
         [Flags]
         public enum MmapProts : uint
@@ -51,38 +51,38 @@ namespace Ryujinx.Memory
         public const int MADV_DONTNEED = 4;
         public const int MADV_REMOVE = 9;
 
-        [DllImport("libc", EntryPoint = "mmap", SetLastError = true)]
+        [LibraryImport("libc", EntryPoint = "mmap", SetLastError = true)]
-        private static extern IntPtr Internal_mmap(IntPtr address, ulong length, MmapProts prot, int flags, int fd, long offset);
+        private static partial IntPtr Internal_mmap(IntPtr address, ulong length, MmapProts prot, int flags, int fd, long offset);
 
-        [DllImport("libc", SetLastError = true)]
+        [LibraryImport("libc", SetLastError = true)]
-        public static extern int mprotect(IntPtr address, ulong length, MmapProts prot);
+        public static partial int mprotect(IntPtr address, ulong length, MmapProts prot);
 
-        [DllImport("libc", SetLastError = true)]
+        [LibraryImport("libc", SetLastError = true)]
-        public static extern int munmap(IntPtr address, ulong length);
+        public static partial int munmap(IntPtr address, ulong length);
 
-        [DllImport("libc", SetLastError = true)]
+        [LibraryImport("libc", SetLastError = true)]
-        public static extern IntPtr mremap(IntPtr old_address, ulong old_size, ulong new_size, int flags, IntPtr new_address);
+        public static partial IntPtr mremap(IntPtr old_address, ulong old_size, ulong new_size, int flags, IntPtr new_address);
 
-        [DllImport("libc", SetLastError = true)]
+        [LibraryImport("libc", SetLastError = true)]
-        public static extern int madvise(IntPtr address, ulong size, int advice);
+        public static partial int madvise(IntPtr address, ulong size, int advice);
 
-        [DllImport("libc", SetLastError = true)]
+        [LibraryImport("libc", SetLastError = true)]
-        public static extern int mkstemp(IntPtr template);
+        public static partial int mkstemp(IntPtr template);
 
-        [DllImport("libc", SetLastError = true)]
+        [LibraryImport("libc", SetLastError = true)]
-        public static extern int unlink(IntPtr pathname);
+        public static partial int unlink(IntPtr pathname);
 
-        [DllImport("libc", SetLastError = true)]
+        [LibraryImport("libc", SetLastError = true)]
-        public static extern int ftruncate(int fildes, IntPtr length);
+        public static partial int ftruncate(int fildes, IntPtr length);
 
-        [DllImport("libc", SetLastError = true)]
+        [LibraryImport("libc", SetLastError = true)]
-        public static extern int close(int fd);
+        public static partial int close(int fd);
 
-        [DllImport("libc", SetLastError = true)]
+        [LibraryImport("libc", SetLastError = true)]
-        public static extern int shm_open(IntPtr name, int oflag, uint mode);
+        public static partial int shm_open(IntPtr name, int oflag, uint mode);
 
-        [DllImport("libc", SetLastError = true)]
+        [LibraryImport("libc", SetLastError = true)]
-        public static extern int shm_unlink(IntPtr name);
+        public static partial int shm_unlink(IntPtr name);
 
         private static int MmapFlagsToSystemFlags(MmapFlags flags)
         {

Ryujinx.Memory/WindowsShared/WindowsApi.cs

@@ -3,20 +3,20 @@ using System.Runtime.InteropServices;
 
 namespace Ryujinx.Memory.WindowsShared
 {
-    static class WindowsApi
+    static partial class WindowsApi
     {
         public static readonly IntPtr InvalidHandleValue = new IntPtr(-1);
         public static readonly IntPtr CurrentProcessHandle = new IntPtr(-1);
 
-        [DllImport("kernel32.dll", SetLastError = true)]
+        [LibraryImport("kernel32.dll", SetLastError = true)]
-        public static extern IntPtr VirtualAlloc(
+        public static partial IntPtr VirtualAlloc(
             IntPtr lpAddress,
             IntPtr dwSize,
             AllocationType flAllocationType,
             MemoryProtection flProtect);
 
-        [DllImport("KernelBase.dll", SetLastError = true)]
+        [LibraryImport("KernelBase.dll", SetLastError = true)]
-        public static extern IntPtr VirtualAlloc2(
+        public static partial IntPtr VirtualAlloc2(
             IntPtr process,
             IntPtr lpAddress,
             IntPtr dwSize,
@@ -25,18 +25,20 @@ namespace Ryujinx.Memory.WindowsShared
             IntPtr extendedParameters,
             ulong parameterCount);
 
-        [DllImport("kernel32.dll", SetLastError = true)]
+        [LibraryImport("kernel32.dll", SetLastError = true)]
-        public static extern bool VirtualProtect(
+        [return: MarshalAs(UnmanagedType.Bool)]
+        public static partial bool VirtualProtect(
             IntPtr lpAddress,
             IntPtr dwSize,
             MemoryProtection flNewProtect,
             out MemoryProtection lpflOldProtect);
 
-        [DllImport("kernel32.dll", SetLastError = true)]
+        [LibraryImport("kernel32.dll", SetLastError = true)]
-        public static extern bool VirtualFree(IntPtr lpAddress, IntPtr dwSize, AllocationType dwFreeType);
+        [return: MarshalAs(UnmanagedType.Bool)]
+        public static partial bool VirtualFree(IntPtr lpAddress, IntPtr dwSize, AllocationType dwFreeType);
 
-        [DllImport("kernel32.dll", SetLastError = true)]
+        [LibraryImport("kernel32.dll", SetLastError = true, EntryPoint = "CreateFileMappingW")]
-        public static extern IntPtr CreateFileMapping(
+        public static partial IntPtr CreateFileMapping(
             IntPtr hFile,
             IntPtr lpFileMappingAttributes,
             FileMapProtection flProtect,
@@ -44,19 +46,20 @@ namespace Ryujinx.Memory.WindowsShared
             uint dwMaximumSizeLow,
             [MarshalAs(UnmanagedType.LPWStr)] string lpName);
 
-        [DllImport("kernel32.dll", SetLastError = true)]
+        [LibraryImport("kernel32.dll", SetLastError = true)]
-        public static extern bool CloseHandle(IntPtr hObject);
+        [return: MarshalAs(UnmanagedType.Bool)]
+        public static partial bool CloseHandle(IntPtr hObject);
 
-        [DllImport("kernel32.dll", SetLastError = true)]
+        [LibraryImport("kernel32.dll", SetLastError = true)]
-        public static extern IntPtr MapViewOfFile(
+        public static partial IntPtr MapViewOfFile(
             IntPtr hFileMappingObject,
             uint dwDesiredAccess,
             uint dwFileOffsetHigh,
             uint dwFileOffsetLow,
             IntPtr dwNumberOfBytesToMap);
 
-        [DllImport("KernelBase.dll", SetLastError = true)]
+        [LibraryImport("KernelBase.dll", SetLastError = true)]
-        public static extern IntPtr MapViewOfFile3(
+        public static partial IntPtr MapViewOfFile3(
             IntPtr hFileMappingObject,
             IntPtr process,
             IntPtr baseAddress,
@@ -67,17 +70,19 @@ namespace Ryujinx.Memory.WindowsShared
             IntPtr extendedParameters,
             ulong parameterCount);
 
-        [DllImport("kernel32.dll", SetLastError = true)]
+        [LibraryImport("kernel32.dll", SetLastError = true)]
-        public static extern bool UnmapViewOfFile(IntPtr lpBaseAddress);
+        [return: MarshalAs(UnmanagedType.Bool)]
+        public static partial bool UnmapViewOfFile(IntPtr lpBaseAddress);
 
-        [DllImport("KernelBase.dll", SetLastError = true)]
+        [LibraryImport("KernelBase.dll", SetLastError = true)]
-        public static extern bool UnmapViewOfFile2(IntPtr process, IntPtr lpBaseAddress, ulong unmapFlags);
+        [return: MarshalAs(UnmanagedType.Bool)]
+        public static partial bool UnmapViewOfFile2(IntPtr process, IntPtr lpBaseAddress, ulong unmapFlags);
 
-        [DllImport("kernel32.dll")]
+        [LibraryImport("kernel32.dll")]
-        public static extern uint GetLastError();
+        public static partial uint GetLastError();
 
-        [DllImport("kernel32.dll")]
+        [LibraryImport("kernel32.dll")]
-        public static extern int GetCurrentThreadId();
+        public static partial int GetCurrentThreadId();
 
         public static MemoryProtection GetProtection(MemoryPermission permission)
         {

Ryujinx.Tests.Unicorn/Native/Interface.cs

@@ -3,11 +3,12 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 namespace Ryujinx.Tests.Unicorn.Native
 {
-    public static class Interface
+    public static partial class Interface
     {
         public static bool IsUnicornAvailable { get; private set; } = true;
 
@@ -58,43 +59,43 @@ namespace Ryujinx.Tests.Unicorn.Native
             }
         }
 
-        [DllImport("unicorn", CallingConvention = CallingConvention.Cdecl)]
+        [LibraryImport("unicorn")]
-        public static extern uint uc_version(out uint major, out uint minor);
+        public static partial uint uc_version(out uint major, out uint minor);
 
-        [DllImport("unicorn", CallingConvention = CallingConvention.Cdecl)]
+        [LibraryImport("unicorn")]
-        public static extern Error uc_open(Arch arch, Mode mode, out IntPtr uc);
+        public static partial Error uc_open(Arch arch, Mode mode, out IntPtr uc);
 
-        [DllImport("unicorn", CallingConvention = CallingConvention.Cdecl)]
+        [LibraryImport("unicorn")]
-        public static extern Error uc_close(IntPtr uc);
+        public static partial Error uc_close(IntPtr uc);
 
-        [DllImport("unicorn", CallingConvention = CallingConvention.Cdecl)]
+        [LibraryImport("unicorn")]
-        public static extern IntPtr uc_strerror(Error err);
+        public static partial IntPtr uc_strerror(Error err);
 
-        [DllImport("unicorn", CallingConvention = CallingConvention.Cdecl)]
+        [LibraryImport("unicorn")]
-        public static extern Error uc_reg_write(IntPtr uc, int regid, byte[] value);
+        public static partial Error uc_reg_write(IntPtr uc, int regid, byte[] value);
 
-        [DllImport("unicorn", CallingConvention = CallingConvention.Cdecl)]
+        [LibraryImport("unicorn")]
-        public static extern Error uc_reg_read(IntPtr uc, int regid, byte[] value);
+        public static partial Error uc_reg_read(IntPtr uc, int regid, byte[] value);
 
-        [DllImport("unicorn", CallingConvention = CallingConvention.Cdecl)]
+        [LibraryImport("unicorn")]
-        public static extern Error uc_mem_write(IntPtr uc, ulong address, byte[] bytes, ulong size);
+        public static partial Error uc_mem_write(IntPtr uc, ulong address, byte[] bytes, ulong size);
 
-        [DllImport("unicorn", CallingConvention = CallingConvention.Cdecl)]
+        [LibraryImport("unicorn")]
-        public static extern Error uc_mem_read(IntPtr uc, ulong address, byte[] bytes, ulong size);
+        public static partial Error uc_mem_read(IntPtr uc, ulong address, byte[] bytes, ulong size);
 
-        [DllImport("unicorn", CallingConvention = CallingConvention.Cdecl)]
+        [LibraryImport("unicorn")]
-        public static extern Error uc_emu_start(IntPtr uc, ulong begin, ulong until, ulong timeout, ulong count);
+        public static partial Error uc_emu_start(IntPtr uc, ulong begin, ulong until, ulong timeout, ulong count);
 
-        [DllImport("unicorn", CallingConvention = CallingConvention.Cdecl)]
+        [LibraryImport("unicorn")]
-        public static extern Error uc_mem_map(IntPtr uc, ulong address, ulong size, uint perms);
+        public static partial Error uc_mem_map(IntPtr uc, ulong address, ulong size, uint perms);
 
-        [DllImport("unicorn", CallingConvention = CallingConvention.Cdecl)]
+        [LibraryImport("unicorn")]
-        public static extern Error uc_mem_unmap(IntPtr uc, ulong address, ulong size);
+        public static partial Error uc_mem_unmap(IntPtr uc, ulong address, ulong size);
 
-        [DllImport("unicorn", CallingConvention = CallingConvention.Cdecl)]
+        [LibraryImport("unicorn")]
-        public static extern Error uc_mem_protect(IntPtr uc, ulong address, ulong size, uint perms);
+        public static partial Error uc_mem_protect(IntPtr uc, ulong address, ulong size, uint perms);
 
-        [DllImport("unicorn", CallingConvention = CallingConvention.Cdecl)]
+        [LibraryImport("unicorn")]
-        public static extern Error uc_mem_regions(IntPtr uc, out IntPtr regions, out uint count);
+        public static partial Error uc_mem_regions(IntPtr uc, out IntPtr regions, out uint count);
     }
 }

Ryujinx.Ui.Common/Helper/ConsoleHelper.cs

@@ -5,7 +5,7 @@ using System.Runtime.Versioning;
 
 namespace Ryujinx.Ui.Common.Helper
 {
-    public static class ConsoleHelper
+    public static partial class ConsoleHelper
     {
         public static bool SetConsoleWindowStateSupported => OperatingSystem.IsWindows();
 
@@ -39,11 +39,12 @@ namespace Ryujinx.Ui.Common.Helper
         }
 
         [SupportedOSPlatform("windows")]
-        [DllImport("kernel32")]
+        [LibraryImport("kernel32")]
-        static extern IntPtr GetConsoleWindow();
+        private static partial IntPtr GetConsoleWindow();
 
         [SupportedOSPlatform("windows")]
-        [DllImport("user32")]
+        [LibraryImport("user32")]
-        static extern bool ShowWindow(IntPtr hWnd, int nCmdShow);
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static partial bool ShowWindow(IntPtr hWnd, int nCmdShow);
     }
 }

Ryujinx.Ui.Common/Ryujinx.Ui.Common.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
   <ItemGroup>

Ryujinx/Program.cs

@@ -4,7 +4,7 @@ using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.GraphicsDriver;
 using Ryujinx.Common.Logging;
-using Ryujinx.Common.System;
+using Ryujinx.Common.SystemInterop;
 using Ryujinx.Common.SystemInfo;
 using Ryujinx.Modules;
 using Ryujinx.SDL2.Common;
@@ -23,7 +23,7 @@ using System.Threading.Tasks;
 
 namespace Ryujinx
 {
-    class Program
+    partial class Program
     {
         public static double WindowScaleFactor { get; private set; }
 
@@ -35,17 +35,17 @@ namespace Ryujinx
 
         private const string X11LibraryName = "libX11";
 
-        [DllImport(X11LibraryName)]
+        [LibraryImport(X11LibraryName)]
-        private extern static int XInitThreads();
+        private static partial int XInitThreads();
 
-        [DllImport("user32.dll", SetLastError = true)]
+        [LibraryImport("user32.dll", SetLastError = true)]
-        public static extern int MessageBoxA(IntPtr hWnd, string text, string caption, uint type);
+        public static partial int MessageBoxA(IntPtr hWnd, [MarshalAs(UnmanagedType.LPStr)] string text, [MarshalAs(UnmanagedType.LPStr)] string caption, uint type);
 
-        [DllImport("libc", SetLastError = true)]
+        [LibraryImport("libc", SetLastError = true)]
-        static extern int setenv(string name, string value, int overwrite);
+        private static partial int setenv([MarshalAs(UnmanagedType.LPStr)] string name, [MarshalAs(UnmanagedType.LPStr)] string value, int overwrite);
 
-        [DllImport("libc")]
+        [LibraryImport("libc")]
-        static extern IntPtr getenv(string name);
+        private static partial IntPtr getenv([MarshalAs(UnmanagedType.LPStr)] string name);
 
         private const uint MB_ICONWARNING = 0x30;
 

Ryujinx/Ui/GLRenderer.cs

@@ -13,7 +13,7 @@ using System.Runtime.InteropServices;
 
 namespace Ryujinx.Ui
 {
-    public class GlRenderer : RendererWidgetBase
+    public partial class GlRenderer : RendererWidgetBase
     {
         private GraphicsDebugLevel _glLogLevel;
 
@@ -74,14 +74,14 @@ namespace Ryujinx.Ui
             throw new NotImplementedException();
         }
 
-        [DllImport("libgdk-3-0.dll")]
+        [LibraryImport("libgdk-3-0.dll")]
-        private static extern IntPtr gdk_win32_window_get_handle(IntPtr d);
+        private static partial IntPtr gdk_win32_window_get_handle(IntPtr d);
 
-        [DllImport("libgdk-3.so.0")]
+        [LibraryImport("libgdk-3.so.0")]
-        private static extern IntPtr gdk_x11_display_get_xdisplay(IntPtr gdkDisplay);
+        private static partial IntPtr gdk_x11_display_get_xdisplay(IntPtr gdkDisplay);
 
-        [DllImport("libgdk-3.so.0")]
+        [LibraryImport("libgdk-3.so.0")]
-        private static extern IntPtr gdk_x11_window_get_xid(IntPtr gdkWindow);
+        private static partial IntPtr gdk_x11_window_get_xid(IntPtr gdkWindow);
 
         private static FramebufferFormat GetGraphicsMode()
         {

Ryujinx/Ui/Helper/MetalHelper.cs

@@ -8,7 +8,7 @@ namespace Ryujinx.Ui.Helper
     public delegate void UpdateBoundsCallbackDelegate(Window window);
 
     [SupportedOSPlatform("macos")]
-    static class MetalHelper
+    static partial class MetalHelper
     {
         private const string LibObjCImport = "/usr/lib/libobjc.A.dylib";
 
@@ -104,31 +104,31 @@ namespace Ryujinx.Ui.Helper
             return metalLayer;
         }
 
-        [DllImport(LibObjCImport)]
+        [LibraryImport(LibObjCImport)]
-        private static unsafe extern IntPtr sel_registerName(byte* data);
+        private static unsafe partial IntPtr sel_registerName(byte* data);
 
-        [DllImport(LibObjCImport)]
+        [LibraryImport(LibObjCImport)]
-        private static unsafe extern IntPtr objc_getClass(byte* data);
+        private static unsafe partial IntPtr objc_getClass(byte* data);
 
-        [DllImport(LibObjCImport)]
+        [LibraryImport(LibObjCImport)]
-        private static extern void objc_msgSend(IntPtr receiver, Selector selector);
+        private static partial void objc_msgSend(IntPtr receiver, Selector selector);
 
-        [DllImport(LibObjCImport)]
+        [LibraryImport(LibObjCImport)]
-        private static extern void objc_msgSend(IntPtr receiver, Selector selector, byte value);
+        private static partial void objc_msgSend(IntPtr receiver, Selector selector, byte value);
 
-        [DllImport(LibObjCImport)]
+        [LibraryImport(LibObjCImport)]
-        private static extern void objc_msgSend(IntPtr receiver, Selector selector, IntPtr value);
+        private static partial void objc_msgSend(IntPtr receiver, Selector selector, IntPtr value);
 
-        [DllImport(LibObjCImport)]
+        [LibraryImport(LibObjCImport)]
-        private static extern void objc_msgSend(IntPtr receiver, Selector selector, NSRect point);
+        private static partial void objc_msgSend(IntPtr receiver, Selector selector, NSRect point);
 
-        [DllImport(LibObjCImport)]
+        [LibraryImport(LibObjCImport)]
-        private static extern void objc_msgSend(IntPtr receiver, Selector selector, double value);
+        private static partial void objc_msgSend(IntPtr receiver, Selector selector, double value);
 
-        [DllImport(LibObjCImport, EntryPoint = "objc_msgSend")]
+        [LibraryImport(LibObjCImport, EntryPoint = "objc_msgSend")]
-        private static extern IntPtr IntPtr_objc_msgSend(IntPtr receiver, Selector selector);
+        private static partial IntPtr IntPtr_objc_msgSend(IntPtr receiver, Selector selector);
 
-        [DllImport("libgdk-3.0.dylib")]
+        [LibraryImport("libgdk-3.0.dylib")]
-        private static extern IntPtr gdk_quartz_window_get_nsview(IntPtr gdkWindow);
+        private static partial IntPtr gdk_quartz_window_get_nsview(IntPtr gdkWindow);
     }
 }

Ryujinx/Ui/MainWindow.cs

@@ -15,7 +15,7 @@ using Ryujinx.Audio.Integration;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
-using Ryujinx.Common.System;
+using Ryujinx.Common.SystemInterop;
 using Ryujinx.Graphics.GAL;
 using Ryujinx.Graphics.GAL.Multithreading;
 using Ryujinx.Graphics.OpenGL;

Ryujinx/Ui/VKRenderer.cs

@@ -12,7 +12,7 @@ using System.Runtime.InteropServices;
 
 namespace Ryujinx.Ui
 {
-    public class VKRenderer : RendererWidgetBase
+    public partial class VKRenderer : RendererWidgetBase
     {
         public NativeWindowBase NativeWindow { get; private set; }
         private UpdateBoundsCallbackDelegate _updateBoundsCallback;
@@ -44,14 +44,14 @@ namespace Ryujinx.Ui
             throw new NotImplementedException();
         }
 
-        [DllImport("libgdk-3-0.dll")]
+        [LibraryImport("libgdk-3-0.dll")]
-        private static extern IntPtr gdk_win32_window_get_handle(IntPtr d);
+        private static partial IntPtr gdk_win32_window_get_handle(IntPtr d);
 
-        [DllImport("libgdk-3.so.0")]
+        [LibraryImport("libgdk-3.so.0")]
-        private static extern IntPtr gdk_x11_display_get_xdisplay(IntPtr gdkDisplay);
+        private static partial IntPtr gdk_x11_display_get_xdisplay(IntPtr gdkDisplay);
 
-        [DllImport("libgdk-3.so.0")]
+        [LibraryImport("libgdk-3.so.0")]
-        private static extern IntPtr gdk_x11_window_get_xid(IntPtr gdkWindow);
+        private static partial IntPtr gdk_x11_window_get_xid(IntPtr gdkWindow);
 
         protected override bool OnConfigureEvent(EventConfigure evnt)
         {