diff --git a/Ryujinx.sln b/Ryujinx.sln
index 24def42a3..b89d5da0a 100644
--- a/Ryujinx.sln
+++ b/Ryujinx.sln
@@ -21,6 +21,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.GAL", "src
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.OpenGL", "src\Ryujinx.Graphics.OpenGL\Ryujinx.Graphics.OpenGL.csproj", "{9558FB96-075D-4219-8FFF-401979DC0B69}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryujinx.Graphics.RenderDoc", "src\Ryujinx.Graphics.RenderDocApi\Ryujinx.Graphics.RenderDocApi.csproj", "{D58FA894-27D5-4EAA-9042-AD422AD82931}"
+EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Texture", "src\Ryujinx.Graphics.Texture\Ryujinx.Graphics.Texture.csproj", "{E1B1AD28-289D-47B7-A106-326972240207}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Shader", "src\Ryujinx.Graphics.Shader\Ryujinx.Graphics.Shader.csproj", "{03B955CD-AD84-4B93-AAA7-BF17923BBAA5}"
@@ -555,6 +557,18 @@ Global
{988E6191-82E1-4E13-9DDB-CB9FA2FDAF29}.Release|x64.Build.0 = Release|Any CPU
{988E6191-82E1-4E13-9DDB-CB9FA2FDAF29}.Release|x86.ActiveCfg = Release|Any CPU
{988E6191-82E1-4E13-9DDB-CB9FA2FDAF29}.Release|x86.Build.0 = Release|Any CPU
+ {D58FA894-27D5-4EAA-9042-AD422AD82931}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D58FA894-27D5-4EAA-9042-AD422AD82931}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D58FA894-27D5-4EAA-9042-AD422AD82931}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {D58FA894-27D5-4EAA-9042-AD422AD82931}.Debug|x64.Build.0 = Debug|Any CPU
+ {D58FA894-27D5-4EAA-9042-AD422AD82931}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {D58FA894-27D5-4EAA-9042-AD422AD82931}.Debug|x86.Build.0 = Debug|Any CPU
+ {D58FA894-27D5-4EAA-9042-AD422AD82931}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D58FA894-27D5-4EAA-9042-AD422AD82931}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D58FA894-27D5-4EAA-9042-AD422AD82931}.Release|x64.ActiveCfg = Release|Any CPU
+ {D58FA894-27D5-4EAA-9042-AD422AD82931}.Release|x64.Build.0 = Release|Any CPU
+ {D58FA894-27D5-4EAA-9042-AD422AD82931}.Release|x86.ActiveCfg = Release|Any CPU
+ {D58FA894-27D5-4EAA-9042-AD422AD82931}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/assets/Locales/RenderDoc.json b/assets/Locales/RenderDoc.json
new file mode 100644
index 000000000..132e24067
--- /dev/null
+++ b/assets/Locales/RenderDoc.json
@@ -0,0 +1,104 @@
+{
+ "Locales": [
+ {
+ "ID": "MenuBarActions_StartCapture",
+ "Translations": {
+ "ar_SA": "",
+ "de_DE": "",
+ "el_GR": "",
+ "en_US": "Start RenderDoc Frame Capture",
+ "es_ES": "",
+ "fr_FR": "",
+ "he_IL": "",
+ "it_IT": "",
+ "ja_JP": "",
+ "ko_KR": "",
+ "no_NO": "",
+ "pl_PL": "",
+ "pt_BR": "",
+ "ru_RU": "",
+ "sv_SE": "",
+ "th_TH": "",
+ "tr_TR": "",
+ "uk_UA": "",
+ "zh_CN": "",
+ "zh_TW": ""
+ }
+ },
+ {
+ "ID": "MenuBarActions_EndCapture",
+ "Translations": {
+ "ar_SA": "",
+ "de_DE": "",
+ "el_GR": "",
+ "en_US": "End RenderDoc Frame Capture",
+ "es_ES": "",
+ "fr_FR": "",
+ "he_IL": "",
+ "it_IT": "",
+ "ja_JP": "",
+ "ko_KR": "",
+ "no_NO": "",
+ "pl_PL": "",
+ "pt_BR": "",
+ "ru_RU": "",
+ "sv_SE": "",
+ "th_TH": "",
+ "tr_TR": "",
+ "uk_UA": "",
+ "zh_CN": "",
+ "zh_TW": ""
+ }
+ },
+ {
+ "ID": "MenuBarActions_DiscardCapture",
+ "Translations": {
+ "ar_SA": "",
+ "de_DE": "",
+ "el_GR": "",
+ "en_US": "Discard RenderDoc Frame Capture",
+ "es_ES": "",
+ "fr_FR": "",
+ "he_IL": "",
+ "it_IT": "",
+ "ja_JP": "",
+ "ko_KR": "",
+ "no_NO": "",
+ "pl_PL": "",
+ "pt_BR": "",
+ "ru_RU": "",
+ "sv_SE": "",
+ "th_TH": "",
+ "tr_TR": "",
+ "uk_UA": "",
+ "zh_CN": "",
+ "zh_TW": ""
+ }
+ },
+ {
+ "ID": "MenuBarActions_DiscardCapture_ToolTip",
+ "Translations": {
+ "ar_SA": "",
+ "de_DE": "",
+ "el_GR": "",
+ "en_US": "Ends the currently active RenderDoc Frame Capture, immediately discarding its result.",
+ "es_ES": "",
+ "fr_FR": "",
+ "he_IL": "",
+ "it_IT": "",
+ "ja_JP": "",
+ "ko_KR": "",
+ "no_NO": "",
+ "pl_PL": "",
+ "pt_BR": "",
+ "ru_RU": "",
+ "sv_SE": "",
+ "th_TH": "",
+ "tr_TR": "",
+ "uk_UA": "",
+ "zh_CN": "",
+ "zh_TW": ""
+ }
+ }
+ ]
+}
diff --git a/src/Ryujinx.Graphics.RenderDocApi/Capture.cs b/src/Ryujinx.Graphics.RenderDocApi/Capture.cs
new file mode 100644
index 000000000..dd75bc120
--- /dev/null
+++ b/src/Ryujinx.Graphics.RenderDocApi/Capture.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace Ryujinx.Graphics.RenderDocApi
+{
+ public readonly record struct Capture(int Index, string FileName, DateTime Timestamp)
+ {
+ public void SetComments(string comments)
+ {
+ RenderDoc.SetCaptureFileComments(FileName, comments);
+ }
+ }
+}
diff --git a/src/Ryujinx.Graphics.RenderDocApi/CaptureOption.cs b/src/Ryujinx.Graphics.RenderDocApi/CaptureOption.cs
new file mode 100644
index 000000000..cd3f860d2
--- /dev/null
+++ b/src/Ryujinx.Graphics.RenderDocApi/CaptureOption.cs
@@ -0,0 +1,100 @@
+// ReSharper disable UnusedMember.Global
+
+namespace Ryujinx.Graphics.RenderDocApi
+{
+ public enum CaptureOption
+ {
+ ///
+ /// specifies whether the application is allowed to enable vsync. Default is on.
+ ///
+ AllowVsync = 0,
+ ///
+ /// specifies whether the application is allowed to enter exclusive fullscreen. Default is on.
+ ///
+ AllowFullscreen = 1,
+ ///
+ /// specifies whether (where possible) API-specific debugging is enabled. Default is off.
+ ///
+ ApiValidation = 2,
+ ///
+ /// specifies whether each API call should save a callstack. Default is off.
+ ///
+ CaptureCallstacks = 3,
+ ///
+ /// specifies whether, if is enabled, callstacks are only saved on actions. Default is off.
+ ///
+ CaptureCallstacksOnlyDraws = 4,
+ ///
+ /// specifies a delay in seconds after launching a process to pause, to allow debuggers to attach.
+ /// This will only apply to child processes since the delay happens at process startup. Default is 0.
+ ///
+ DelayForDebugger = 5,
+ ///
+ /// specifies whether any mapped memory updates should be bounds-checked for overruns,
+ /// and uninitialised buffers are initialized to 0xDDDDDDDD to catch use of uninitialised data.
+ /// Only supported on D3D11 and OpenGL. Default is off.
+ ///
+ ///
+ /// This option is only valid for OpenGL and D3D11. Explicit APIs such as D3D12 and Vulkan do
+ /// not do the same kind of interception & checking, and undefined contents are really undefined.
+ ///
+ VerifyBufferAccess = 6,
+ ///
+ /// Hooks any system API calls that create child processes, and injects
+ /// RenderDoc into them recursively with the same options.
+ ///
+ HookIntoChildren = 7,
+ ///
+ /// specifies whether all live resources at the time of capture should be included in the capture,
+ /// even if they are not referenced by the frame. Default is off.
+ ///
+ RefAllSources = 8,
+ ///
+ /// By default, RenderDoc skips saving initial states for resources where the
+ /// previous contents don't appear to be used, assuming that writes before
+ /// reads indicate previous contents aren't used.
+ ///
+ ///
+ /// **NOTE**: As of RenderDoc v1.1 this option has been deprecated. Setting or
+ /// getting it will be ignored, to allow compatibility with older versions.
+ /// In v1.1 the option acts as if it's always enabled.
+ ///
+ SaveAllInitials = 9,
+ ///
+ /// In APIs that allow for the recording of command lists to be replayed later,
+ /// RenderDoc may choose to not capture command lists before a frame capture is
+ /// triggered, to reduce overheads. This means any command lists recorded once
+ /// and replayed many times will not be available and may cause a failure to
+ /// capture.
+ ///
+ ///
+ /// NOTE: This is only true for APIs where multithreading is difficult or
+ /// discouraged. Newer APIs like Vulkan and D3D12 will ignore this option
+ /// and always capture all command lists since the API is heavily oriented
+ /// around it and the overheads have been reduced by API design.
+ ///
+ CaptureAllCmdLists = 10,
+ ///
+ /// Mute API debugging output when the option is enabled.
+ ///
+ DebugOutputMute = 11,
+ ///
+ /// Allow vendor extensions to be used even when they may be
+ /// incompatible with RenderDoc and cause corrupted replays or crashes.
+ ///
+ AllowUnsupportedVendorExtensions = 12,
+ ///
+ /// Define a soft memory limit which some APIs may aim to keep overhead under where
+ /// possible. Anything above this limit will where possible be saved directly to disk during
+ /// capture.
+ /// This will cause increased disk space use (which may cause a capture to fail if disk space is
+ /// exhausted) as well as slower capture times.
+ ///
+ /// Not all memory allocations may be deferred like this so it is not a guarantee of a memory
+ /// limit.
+ ///
+ /// Units are in MBs, suggested values would range from 200MB to 1000MB.
+ ///
+ SoftMemoryLimit = 13,
+ }
+}
diff --git a/src/Ryujinx.Graphics.RenderDocApi/InputButton.cs b/src/Ryujinx.Graphics.RenderDocApi/InputButton.cs
new file mode 100644
index 000000000..adef8e8e7
--- /dev/null
+++ b/src/Ryujinx.Graphics.RenderDocApi/InputButton.cs
@@ -0,0 +1,83 @@
+
+// ReSharper disable UnusedMember.Global
+namespace Ryujinx.Graphics.RenderDocApi
+{
+ public enum InputButton
+ {
+ // '0' - '9' matches ASCII values
+ Key0 = 0x30,
+ Key1 = 0x31,
+ Key2 = 0x32,
+ Key3 = 0x33,
+ Key4 = 0x34,
+ Key5 = 0x35,
+ Key6 = 0x36,
+ Key7 = 0x37,
+ Key8 = 0x38,
+ Key9 = 0x39,
+
+ // 'A' - 'Z' matches ASCII values
+ A = 0x41,
+ B = 0x42,
+ C = 0x43,
+ D = 0x44,
+ E = 0x45,
+ F = 0x46,
+ G = 0x47,
+ H = 0x48,
+ I = 0x49,
+ J = 0x4A,
+ K = 0x4B,
+ L = 0x4C,
+ M = 0x4D,
+ N = 0x4E,
+ O = 0x4F,
+ P = 0x50,
+ Q = 0x51,
+ R = 0x52,
+ S = 0x53,
+ T = 0x54,
+ U = 0x55,
+ V = 0x56,
+ W = 0x57,
+ X = 0x58,
+ Y = 0x59,
+ Z = 0x5A,
+
+ // leave the rest of the ASCII range free
+ // in case we want to use it later
+ NonPrintable = 0x100,
+
+ Divide,
+ Multiply,
+ Subtract,
+ Plus,
+
+ F1,
+ F2,
+ F3,
+ F4,
+ F5,
+ F6,
+ F7,
+ F8,
+ F9,
+ F10,
+ F11,
+ F12,
+
+ Home,
+ End,
+ Insert,
+ Delete,
+ PageUp,
+ PageDn,
+
+ Backspace,
+ Tab,
+ PrtScrn,
+ Pause,
+
+ Max,
+ }
+}
diff --git a/src/Ryujinx.Graphics.RenderDocApi/OverlayBits.cs b/src/Ryujinx.Graphics.RenderDocApi/OverlayBits.cs
new file mode 100644
index 000000000..e973e403c
--- /dev/null
+++ b/src/Ryujinx.Graphics.RenderDocApi/OverlayBits.cs
@@ -0,0 +1,39 @@
+// ReSharper disable UnusedMember.Global
+
+using System;
+
+namespace Ryujinx.Graphics.RenderDocApi
+{
+ [Flags]
+ public enum OverlayBits
+ {
+ ///
+ /// This single bit controls whether the overlay is enabled or disabled globally
+ ///
+ Enabled = 1 << 0,
+ ///
+ /// Show the average framerate over several seconds as well as min/max
+ ///
+ FrameRate = 1 << 1,
+ ///
+ /// Show the current frame number
+ ///
+ FrameNumber = 1 << 2,
+ ///
+ /// Show a list of recent captures, and how many captures have been made
+ ///
+ CaptureList = 1 << 3,
+ ///
+ /// Default values for the overlay mask
+ ///
+ Default = Enabled | FrameRate | FrameNumber | CaptureList,
+ ///
+ /// Enable all bits
+ ///
+ All = ~0,
+ ///
+ /// Disable all bits
+ ///
+ None = 0
+ }
+}
diff --git a/src/Ryujinx.Graphics.RenderDocApi/README.md b/src/Ryujinx.Graphics.RenderDocApi/README.md
new file mode 100644
index 000000000..51f568b28
--- /dev/null
+++ b/src/Ryujinx.Graphics.RenderDocApi/README.md
@@ -0,0 +1,5 @@
+# Ryujinx.Graphics.RenderDocApi
+
+This is a C# binding for RenderDoc's application API.
+This is a source-inclusion of https://github.com/utkumaden/RenderdocSharp.
+I didn't use the NuGet package as I had a few minor changes I wanted to make, and I want to learn from it as well via hands-on experience.
diff --git a/src/Ryujinx.Graphics.RenderDocApi/RenderDoc.cs b/src/Ryujinx.Graphics.RenderDocApi/RenderDoc.cs
new file mode 100644
index 000000000..9d1f53957
--- /dev/null
+++ b/src/Ryujinx.Graphics.RenderDocApi/RenderDoc.cs
@@ -0,0 +1,639 @@
+using System;
+using System.Collections.Immutable;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Text.RegularExpressions;
+
+namespace Ryujinx.Graphics.RenderDocApi
+{
+ public static unsafe partial class RenderDoc
+ {
+ ///
+ /// True if the API is available.
+ ///
+ public static bool IsAvailable => Api != null;
+
+ ///
+ /// Set the minimum version of the API you require.
+ ///
+ /// Set this before you do anything else with the RenderDoc API, including .
+ public static RenderDocVersion MinimumRequired { get; set; } = RenderDocVersion.Version_1_0_0;
+
+ ///
+ /// Set to true to assert versions.
+ ///
+ public static bool AssertVersionEnabled { get; set; } = true;
+
+ ///
+ /// Version of the API available.
+ ///
+ [MemberNotNullWhen(true, nameof(IsAvailable))]
+ public static Version? Version
+ {
+ get
+ {
+ if (!IsAvailable)
+ return null;
+
+ int major, minor, build;
+ Api->GetApiVersion(&major, &minor, &build);
+ return new Version(major, minor, build);
+ }
+ }
+
+ ///
+ /// The current mask which determines what sections of the overlay render on each window.
+ ///
+ [RenderDocApiVersion(1, 0)]
+ public static OverlayBits OverlayBits
+ {
+ get => Api->GetOverlayBits();
+ set
+ {
+ Api->MaskOverlayBits(~value, value);
+ }
+ }
+
+ ///
+ /// The template for new captures.
+ /// The template can either be a relative or absolute path, which determines where captures will be saved and how they will be named.
+ /// If the path template is 'my_captures/example', then captures saved will be e.g.
+ /// 'my_captures/example_frame123.rdc' and 'my_captures/example_frame456.rdc'.
+ /// Relative paths will be saved relative to the process’s current working directory.
+ ///
+ /// The default template is in a folder controlled by the UI - initially the system temporary folder, and the filename is the executable’s filename.
+ [RenderDocApiVersion(1, 0)]
+ public static string CaptureFilePathTemplate
+ {
+ get
+ {
+ byte* ptr = Api->GetCaptureFilePathTemplate();
+ return Marshal.PtrToStringUTF8((nint)ptr)!;
+ }
+ set
+ {
+ fixed (byte* ptr = value.ToNullTerminatedByteArray())
+ {
+ Api->SetCaptureFilePathTemplate(ptr);
+ }
+ }
+ }
+
+ ///
+ /// The amount of frame captures that have been made.
+ ///
+ [RenderDocApiVersion(1, 0)]
+ public static int CaptureCount => Api->GetNumCaptures();
+
+ ///
+ /// Checks if the RenderDoc UI is currently connected to this process.
+ ///
+ [RenderDocApiVersion(1, 0)]
+ public static bool IsTargetControlConnected => Api is not null && Api->IsTargetControlConnected() != 0;
+
+ ///
+ /// Checks if the current frame is capturing.
+ ///
+ [RenderDocApiVersion(1, 0)]
+ public static bool IsFrameCapturing => Api is not null && Api->IsFrameCapturing() != 0;
+
+ ///
+ /// Set one of the options for tweaking some behaviors of capturing.
+ ///
+ /// specifies which capture option should be set.
+ /// the unsigned integer value to set for the option.
+ /// Note that each option only takes effect from after it is set - so it is advised to set these options as early as possible, ideally before any graphics API has been initialized.
+ ///
+ /// true, if the is valid, and the value set on the option is within valid ranges.
+ /// false, if the option is not a , or the value is not valid for the option.
+ ///
+ [RenderDocApiVersion(1, 0)]
+ public static bool SetCaptureOption(CaptureOption option, uint integer)
+ {
+ return Api is not null && Api->SetCaptureOptionU32(option, integer) != 0;
+ }
+
+ ///
+ /// Set one of the options for tweaking some behaviors of capturing.
+ ///
+ /// specifies which capture option should be set.
+ /// the value to set for the option, converted to a 0 or 1 before setting.
+ /// Note that each option only takes effect from after it is set - so it is advised to set these options as early as possible, ideally before any graphics API has been initialized.
+ ///
+ /// true, if the is valid, and the value set on the option is within valid ranges.
+ /// false, if the option is not a , or the value is not valid for the option.
+ ///
+ [RenderDocApiVersion(1, 0)]
+ public static bool SetCaptureOption(CaptureOption option, bool boolean)
+ => SetCaptureOption(option, boolean ? 1 : 0);
+
+ ///
+ /// Set one of the options for tweaking some behaviors of capturing.
+ ///
+ /// specifies which capture option should be set.
+ /// the floating point value to set for the option.
+ /// Note that each option only takes effect from after it is set - so it is advised to set these options as early as possible, ideally before any graphics API has been initialized.
+ ///
+ /// true, if the is valid, and the value set on the option is within valid ranges.
+ /// false, if the option is not a , or the value is not valid for the option.
+ ///
+ [RenderDocApiVersion(1, 0)]
+ public static bool SetCaptureOption(CaptureOption option, float single)
+ {
+ return Api is not null && Api->SetCaptureOptionF32(option, single) != 0;
+ }
+
+ ///
+ /// Gets the current value of one of the different options in , writing it to an out parameter.
+ ///
+ /// specifies which capture option should be retrieved.
+ /// the value of the capture option, if the option is a valid enum. Otherwise, .
+ [RenderDocApiVersion(1, 0)]
+ public static void GetCaptureOption(CaptureOption option, out uint integer)
+ {
+ integer = Api->GetCaptureOptionU32(option);
+ }
+
+ ///
+ /// Gets the current value of one of the different options in , writing it to an out parameter.
+ ///
+ /// specifies which capture option should be retrieved.
+ /// the value of the capture option, if the option is a valid enum. Otherwise, -.
+ [RenderDocApiVersion(1, 0)]
+ public static void GetCaptureOption(CaptureOption option, out float single)
+ {
+ single = Api->GetCaptureOptionF32(option);
+ }
+
+ ///
+ /// Gets the current value of one of the different options in ,
+ /// converted to a boolean.
+ ///
+ /// specifies which capture option should be retrieved.
+ ///
+ /// the value of the capture option, converted to bool, if the option is a valid enum.
+ /// Otherwise, returns null.
+ ///
+ [RenderDocApiVersion(1, 0)]
+ public static bool? GetCaptureOptionBool(CaptureOption option)
+ {
+ if (Api is null) return false;
+
+ uint returnVal = GetCaptureOptionU32(option);
+ if (returnVal == uint.MaxValue)
+ return null;
+
+ return returnVal is not 0;
+ }
+
+ ///
+ /// Gets the current value of one of the different options in .
+ ///
+ /// specifies which capture option should be retrieved.
+ ///
+ /// the value of the capture option, if the option is a valid enum.
+ /// Otherwise, returns .
+ ///
+ [RenderDocApiVersion(1, 0)]
+ public static uint GetCaptureOptionU32(CaptureOption option) => Api->GetCaptureOptionU32(option);
+
+ ///
+ /// Gets the current value of one of the different options in .
+ ///
+ /// specifies which capture option should be retrieved.
+ ///
+ /// the value of the capture option, if the option is a valid enum.
+ /// Otherwise, returns -.
+ ///
+ [RenderDocApiVersion(1, 0)]
+ public static float GetCaptureOptionF32(CaptureOption option) => Api->GetCaptureOptionF32(option);
+
+ ///
+ /// Changes the key bindings in-application for changing the focussed window.
+ ///
+ /// lists the keys to bind.
+ [RenderDocApiVersion(1, 0)]
+ public static void SetFocusToggleKeys(ReadOnlySpan buttons)
+ {
+ if (Api is null) return;
+
+ fixed (InputButton* ptr = buttons)
+ {
+ Api->SetFocusToggleKeys(ptr, buttons.Length);
+ }
+ }
+
+ ///
+ /// Changes the key bindings in-application for triggering a capture on the current window.
+ ///
+ /// lists the keys to bind.
+ [RenderDocApiVersion(1, 0)]
+ public static void SetCaptureKeys(ReadOnlySpan buttons)
+ {
+ if (Api is null) return;
+
+ fixed (InputButton* ptr = buttons)
+ {
+ Api->SetCaptureKeys(ptr, buttons.Length);
+ }
+ }
+
+ ///
+ /// Attempts to remove RenderDoc and its hooks from the target process.
+ /// It must be called as early as possible in the process, and will have undefined results
+ /// if any graphics API functions have been called.
+ ///
+ [RenderDocApiVersion(1, 0)]
+ public static void RemoveHooks()
+ {
+ if (Api is null) return;
+
+ Api->RemoveHooks();
+ }
+
+ ///
+ /// Remove RenderDoc’s crash handler from the target process.
+ /// If you have your own crash handler that you want to handle any exceptions,
+ /// RenderDoc’s handler could interfere; so it can be disabled.
+ ///
+ [RenderDocApiVersion(1, 0)]
+ public static void UnloadCrashHandler()
+ {
+ if (Api is null) return;
+
+ Api->UnloadCrashHandler();
+ }
+
+ ///
+ /// Trigger a capture as if the user had pressed one of the capture hotkeys.
+ /// The capture will be taken from the next frame presented to whichever window is considered current.
+ ///
+ [RenderDocApiVersion(1, 0)]
+ public static void TriggerCapture()
+ {
+ if (Api is null) return;
+
+ Api->TriggerCapture();
+ }
+
+
+ ///
+ /// Gets the details of all frame capture in the current session.
+ /// This simply calls for each index available as specified by .
+ ///
+ /// An immutable array of structs representing RenderDoc Captures.
+ public static ImmutableArray GetCaptures()
+ {
+ if (Api is null) return [];
+ int captureCount = CaptureCount;
+ if (captureCount is 0) return [];
+
+ ImmutableArray.Builder captures = ImmutableArray.CreateBuilder(captureCount);
+
+ for (int captureIndex = 0; captureIndex < captureCount; captureIndex++)
+ {
+ if (GetCapture(captureIndex) is { } capture)
+ captures.Add(capture);
+ }
+
+ return captures.DrainToImmutable();
+ }
+
+ ///
+ /// Gets the details of a particular frame capture, as specified by an index from 0 to - 1.
+ ///
+ /// specifies which capture to return the details of. Must be less than the value returned by .
+ /// A struct representing a RenderDoc Capture.
+ [RenderDocApiVersion(1, 0)]
+ public static Capture? GetCapture(int index)
+ {
+ if (Api is null) return null;
+
+ int length = 0;
+ if (Api->GetCapture(index, null, &length, null) == 0)
+ {
+ return null;
+ }
+
+ Span bytes = stackalloc byte[length + 1];
+ long timestamp;
+
+ fixed (byte* ptr = bytes)
+ Api->GetCapture(index, ptr, &length, ×tamp);
+
+ string fileName = Encoding.UTF8.GetString(bytes[length..]);
+ return new Capture(index, fileName, DateTimeOffset.FromUnixTimeSeconds(timestamp).DateTime);
+ }
+
+ ///
+ /// Determine the closest matching replay UI executable for the current RenderDoc module, and launch it.
+ ///
+ /// if the UI should immediately connect to the application.
+ /// string to be appended to the command line, e.g. a capture filename. If this parameter is null, the command line will be unmodified.
+ /// true if the UI was successfully launched; false otherwise.
+ [RenderDocApiVersion(1, 0)]
+ public static bool LaunchReplayUI(bool connectTargetControl, string? commandLine = null)
+ {
+ if (Api is null) return false;
+
+ if (commandLine == null)
+ {
+ return Api->LaunchReplayUI(connectTargetControl ? 1u : 0u, null) != 0;
+ }
+
+ fixed (byte* ptr = commandLine.ToNullTerminatedByteArray())
+ {
+ return Api->LaunchReplayUI(connectTargetControl ? 1u : 0u, ptr) != 0;
+ }
+ }
+
+ ///
+ /// Explicitly sets which window is considered active.
+ /// The active window is the one that will be captured when the keybind to trigger a capture is pressed.
+ ///
+ /// a handle to the API ‘device’ object that will be set active. Must be valid.
+ /// a handle to the platform window handle that will be set active. Must be valid.
+ [RenderDocApiVersion(1, 0)]
+ public static void SetActiveWindow(nint hDevice, nint hWindow)
+ {
+ if (Api is null) return;
+
+ Api->SetActiveWindow((void*)hDevice, (void*)hWindow);
+ }
+
+ ///
+ /// Immediately begin a capture for the specified device/window combination.
+ ///
+ /// a handle to the API ‘device’ object that will be set active. May be to wildcard match.
+ /// a handle to the platform window handle that will be set active. May be to wildcard match.
+ [RenderDocApiVersion(1, 0)]
+ public static void StartFrameCapture(nint hDevice, nint hWindow)
+ {
+ if (Api is null) return;
+
+ Api->StartFrameCapture((void*)hDevice, (void*)hWindow);
+ }
+
+ ///
+ /// Immediately end an active capture for the specified device/window combination.
+ ///
+ /// a handle to the API ‘device’ object that will be set active. May be to wildcard match.
+ /// a handle to the platform window handle that will be set active. May be to wildcard match.
+ /// true if the capture succeeded; false otherwise.
+ [RenderDocApiVersion(1, 0)]
+ public static bool EndFrameCapture(nint hDevice, nint hWindow)
+ {
+ if (Api is null) return false;
+
+ return Api->EndFrameCapture((void*)hDevice, (void*)hWindow) != 0;
+ }
+
+ ///
+ /// Trigger multiple sequential frame captures as if the user had pressed one of the capture hotkeys before each frame.
+ /// The captures will be taken from the next frames presented to whichever window is considered current.
+ /// Each capture will be taken independently and saved to a separate file, with no reference to the other frames.
+ ///
+ /// the number of frames to capture.
+ /// Requires RenderDoc API version 1.1
+ [RenderDocApiVersion(1, 1)]
+ public static void TriggerMultiFrameCapture(uint numFrames)
+ {
+ if (Api is null) return;
+
+ AssertAtLeast(1, 1);
+ Api->TriggerMultiFrameCapture(numFrames);
+ }
+
+ ///
+ /// Adds an arbitrary comments field to the most recent capture,
+ /// which will then be displayed in the UI to anyone opening the capture.
+ ///
+ /// This is equivalent to calling with a null first (fileName) parameter.
+ ///
+ /// the comments to set in the capture file.
+ /// Requires RenderDoc API version 1.2
+ public static void SetMostRecentCaptureFileComments(string comments)
+ {
+ if (Api is null) return;
+
+ AssertAtLeast(1, 2);
+
+ byte[] commentBytes = comments.ToNullTerminatedByteArray();
+
+ fixed (byte* pcomment = commentBytes)
+ {
+ Api->SetCaptureFileComments((byte*)nint.Zero, pcomment);
+ }
+ }
+
+ ///
+ /// Adds an arbitrary comments field to an existing capture on disk,
+ /// which will then be displayed in the UI to anyone opening the capture.
+ ///
+ /// the path to the capture file to set comments in. If this path is null or an empty string, the most recent capture file that has been created will be used.
+ /// the comments to set in the capture file.
+ /// Requires RenderDoc API version 1.2
+ [RenderDocApiVersion(1, 2)]
+ public static void SetCaptureFileComments(string? fileName, string comments)
+ {
+ if (Api is null) return;
+
+ AssertAtLeast(1, 2);
+
+ byte[] commentBytes = comments.ToNullTerminatedByteArray();
+
+ fixed (byte* pcomment = commentBytes)
+ {
+ if (fileName is null)
+ {
+ Api->SetCaptureFileComments((byte*)nint.Zero, pcomment);
+ }
+ else
+ {
+ byte[] fileBytes = fileName.ToNullTerminatedByteArray();
+
+ fixed (byte* pfile = fileBytes)
+ {
+ Api->SetCaptureFileComments(pfile, pcomment);
+ }
+ }
+ }
+ }
+
+ ///
+ /// Similar to , but the capture contents will be discarded immediately, and not processed and written to disk.
+ /// This will be more efficient than if the frame capture is not needed.
+ ///
+ /// a handle to the API ‘device’ object that will be set active. May be to wildcard match.
+ /// a handle to the platform window handle that will be set active. May be to wildcard match.
+ /// true if the capture was discarded; false if there was an error or no capture was in progress.
+ /// Requires RenderDoc API version 1.4
+ [RenderDocApiVersion(1, 4)]
+ public static bool DiscardFrameCapture(nint hDevice, nint hWindow)
+ {
+ if (Api is null) return false;
+
+ AssertAtLeast(1, 4);
+ return Api->DiscardFrameCapture((void*)hDevice, (void*)hWindow) != 0;
+ }
+
+
+ ///
+ /// Requests that the currently connected replay UI raise its window to the top.
+ /// This is only possible if an instance of the replay UI is currently connected, otherwise this method does nothing.
+ /// This can be used in conjunction with and ,
to intelligently handle showing the UI after making a capture.
+ /// Given OS differences, it is not guaranteed that the UI will be successfully raised even if the request is passed on.
+ /// On some systems it may only be highlighted or otherwise indicated to the user.
+ ///
+ /// true if the request was passed onto the UI successfully; false if there is no UI connected or some other error occurred.
+ /// Requires RenderDoc API version 1.5
+ [RenderDocApiVersion(1, 5)]
+ public static bool ShowReplayUI()
+ {
+ if (Api is null) return false;
+
+ AssertAtLeast(1, 5);
+ return Api->ShowReplayUI() != 0;
+ }
+
+ ///
+ /// Sets a given title for the currently in-progress capture, which will be displayed in the UI.
+ /// This can be used either with a user-defined capture using a manual start and end,
+ /// or an automatic capture triggered by or a keypress.
+ /// If multiple captures are ongoing at once, the title will be applied to the first capture to end only.
+ /// Any subsequent captures will not get any title unless the function is called again.
+ /// This function can only be called while a capture is in-progress,
+ /// after and before .
+ /// If it is called elsewhere it will have no effect.
+ /// If it is called multiple times within a capture, only the last title will have any effect.
+ ///
+ /// The title to set for the in-progress capture.
+ /// Requires RenderDoc API version 1.6
+ [RenderDocApiVersion(1, 6)]
+ public static void SetCaptureTitle(string title)
+ {
+ if (Api is null) return;
+
+ AssertAtLeast(1, 6);
+ fixed (byte* ptr = title.ToNullTerminatedByteArray())
+ Api->SetCaptureTitle(ptr);
+ }
+
+ #region Dynamic Library loading
+
+ ///
+ /// Reload the internal RenderDoc API structure. Useful for manually refreshing while using process injection.
+ ///
+ /// Ignores the existing API function structure and overwrites it with a re-request.
+ /// The version of the RenderDoc API required by your application.
+ public static void ReloadApi(bool ignoreAlreadyLoaded = false, RenderDocVersion? requiredVersion = null)
+ {
+ if (_loaded && !ignoreAlreadyLoaded)
+ return;
+
+ lock (typeof(RenderDoc))
+ {
+ // Prevent double loads.
+ if (_loaded && !ignoreAlreadyLoaded)
+ return;
+
+ if (requiredVersion.HasValue)
+ MinimumRequired = requiredVersion.Value;
+
+ _loaded = true;
+ _api = GetApi(MinimumRequired);
+
+ if (_api != null)
+ AssertAtLeast(MinimumRequired);
+ }
+ }
+
+ private static RenderDocApi* _api = null;
+ private static bool _loaded;
+
+ private static RenderDocApi* Api
+ {
+ get
+ {
+ ReloadApi();
+ return _api;
+ }
+ }
+
+ private static readonly Regex _dynamicLibraryPattern = RenderDocApiDynamicLibraryRegex();
+
+ private static RenderDocApi* GetApi(RenderDocVersion minimumRequired = RenderDocVersion.Version_1_0_0)
+ {
+ foreach (ProcessModule module in Process.GetCurrentProcess().Modules)
+ {
+ string moduleName = module.FileName ?? string.Empty;
+
+ if (!_dynamicLibraryPattern.IsMatch(moduleName))
+ continue;
+
+ if (!NativeLibrary.TryLoad(moduleName, out nint moduleHandle))
+ return null;
+
+ if (!NativeLibrary.TryGetExport(moduleHandle, "RENDERDOC_GetAPI", out nint procAddress))
+ return null;
+
+ var RENDERDOC_GetApi = (delegate* unmanaged[Cdecl])procAddress;
+
+ RenderDocApi* api;
+ return RENDERDOC_GetApi(minimumRequired, &api) != 0 ? api : null;
+ }
+
+ return null;
+ }
+
+ private static void AssertAtLeast(RenderDocVersion rdv, [CallerMemberName] string callee = "")
+ {
+ Version ver = rdv.SystemVersion;
+ AssertAtLeast(ver.Major, ver.Minor, ver.Build, callee);
+ }
+
+ private static void AssertAtLeast(int major, int minor, int patch = 0, [CallerMemberName] string callee = "")
+ {
+ if (!AssertVersionEnabled)
+ return;
+
+ if (Version!.Major < major)
+ goto fail;
+
+ if (Version.Major > major)
+ goto success;
+ if (Version.Minor < minor)
+ goto fail;
+ if (Version.Minor > minor)
+ goto success;
+ if (Version.Build < patch)
+ goto fail;
+
+ success:
+ return;
+
+ fail:
+ Version minVersion =
+ typeof(RenderDoc).GetMethod(callee)!.GetCustomAttribute()!.MinVersion;
+ throw new NotSupportedException(
+ $"This API was introduced in RenderDoc API {minVersion}. Current API version is {Version}.");
+ }
+
+ private static byte[] ToNullTerminatedByteArray(this string str, Encoding? encoding = null)
+ {
+ encoding ??= Encoding.UTF8;
+
+ return encoding.GetBytes(str + '\0');
+ }
+
+ [GeneratedRegex(@"(lib)?renderdoc(\.dll|\.so|\.dylib)(\.\d+)?",
+ RegexOptions.IgnoreCase | RegexOptions.CultureInvariant)]
+ private static partial Regex RenderDocApiDynamicLibraryRegex();
+
+ #endregion
+ }
+}
diff --git a/src/Ryujinx.Graphics.RenderDocApi/RenderDocApi.cs b/src/Ryujinx.Graphics.RenderDocApi/RenderDocApi.cs
new file mode 100644
index 000000000..70565b55a
--- /dev/null
+++ b/src/Ryujinx.Graphics.RenderDocApi/RenderDocApi.cs
@@ -0,0 +1,51 @@
+namespace Ryujinx.Graphics.RenderDocApi
+{
+#pragma warning disable CS0649
+ internal unsafe struct RenderDocApi
+ {
+ public delegate* unmanaged[Cdecl] GetApiVersion;
+
+ public delegate* unmanaged[Cdecl] SetCaptureOptionU32;
+ public delegate* unmanaged[Cdecl] SetCaptureOptionF32;
+ public delegate* unmanaged[Cdecl] GetCaptureOptionU32;
+ public delegate* unmanaged[Cdecl] GetCaptureOptionF32;
+
+ public delegate* unmanaged[Cdecl] SetFocusToggleKeys;
+ public delegate* unmanaged[Cdecl] SetCaptureKeys;
+
+ public delegate* unmanaged[Cdecl] GetOverlayBits;
+ public delegate* unmanaged[Cdecl] MaskOverlayBits;
+
+ public delegate* unmanaged[Cdecl] RemoveHooks;
+ public delegate* unmanaged[Cdecl] UnloadCrashHandler;
+ public delegate* unmanaged[Cdecl] SetCaptureFilePathTemplate;
+ public delegate* unmanaged[Cdecl] GetCaptureFilePathTemplate;
+
+ public delegate* unmanaged[Cdecl] GetNumCaptures;
+ public delegate* unmanaged[Cdecl] GetCapture;
+ public delegate* unmanaged[Cdecl] TriggerCapture;
+ public delegate* unmanaged[Cdecl] IsTargetControlConnected;
+ public delegate* unmanaged[Cdecl] LaunchReplayUI;
+
+ public delegate* unmanaged[Cdecl] SetActiveWindow;
+ public delegate* unmanaged[Cdecl] StartFrameCapture;
+ public delegate* unmanaged[Cdecl] IsFrameCapturing;
+ public delegate* unmanaged[Cdecl] EndFrameCapture;
+
+ // 1.1
+ public delegate* unmanaged[Cdecl] TriggerMultiFrameCapture;
+
+ // 1.2
+ public delegate* unmanaged[Cdecl] SetCaptureFileComments;
+
+ // 1.3
+ public delegate* unmanaged[Cdecl] DiscardFrameCapture;
+
+ // 1.5
+ public delegate* unmanaged[Cdecl] ShowReplayUI;
+
+ // 1.6
+ public delegate* unmanaged[Cdecl] SetCaptureTitle;
+ }
+#pragma warning restore CS0649
+}
diff --git a/src/Ryujinx.Graphics.RenderDocApi/RenderDocApiVersionAttribute.cs b/src/Ryujinx.Graphics.RenderDocApi/RenderDocApiVersionAttribute.cs
new file mode 100644
index 000000000..ffbe3701e
--- /dev/null
+++ b/src/Ryujinx.Graphics.RenderDocApi/RenderDocApiVersionAttribute.cs
@@ -0,0 +1,16 @@
+
+using System;
+
+namespace Ryujinx.Graphics.RenderDocApi
+{
+ [AttributeUsage(AttributeTargets.Method | AttributeTargets.Property)]
+ public sealed class RenderDocApiVersionAttribute : Attribute
+ {
+ public Version MinVersion { get; }
+
+ public RenderDocApiVersionAttribute(int major, int minor, int patch = 0)
+ {
+ MinVersion = new Version(major, minor, patch);
+ }
+ }
+}
diff --git a/src/Ryujinx.Graphics.RenderDocApi/RenderDocVersion.cs b/src/Ryujinx.Graphics.RenderDocApi/RenderDocVersion.cs
new file mode 100644
index 000000000..1b386c435
--- /dev/null
+++ b/src/Ryujinx.Graphics.RenderDocApi/RenderDocVersion.cs
@@ -0,0 +1,47 @@
+using System;
+
+namespace Ryujinx.Graphics.RenderDocApi
+{
+ public enum RenderDocVersion
+ {
+ Version_1_0_0 = 10000,
+ Version_1_0_1 = 10001,
+ Version_1_0_2 = 10002,
+ Version_1_1_0 = 10100,
+ Version_1_1_1 = 10101,
+ Version_1_1_2 = 10102,
+ Version_1_2_0 = 10200,
+ Version_1_3_0 = 10300,
+ Version_1_4_0 = 10400,
+ Version_1_4_1 = 10401,
+ Version_1_4_2 = 10402,
+ Version_1_5_0 = 10500,
+ Version_1_6_0 = 10600,
+ }
+
+ public static partial class Helpers
+ {
+ extension(RenderDocVersion rdv)
+ {
+ public Version SystemVersion
+ {
+ get
+ {
+ int i = (int)rdv;
+ return new (i / 10000, (i % 10000) / 100, i % 100);
+ }
+ }
+ }
+
+ extension(Version sv)
+ {
+ public RenderDocVersion RenderDocVersion
+ {
+ get
+ {
+ return (RenderDocVersion)(sv.Major * 10000 + sv.Minor * 100 + sv.Build);
+ }
+ }
+ }
+ }
+}
diff --git a/src/Ryujinx.Graphics.RenderDocApi/Ryujinx.Graphics.RenderDocApi.csproj b/src/Ryujinx.Graphics.RenderDocApi/Ryujinx.Graphics.RenderDocApi.csproj
new file mode 100644
index 000000000..29c1d818a
--- /dev/null
+++ b/src/Ryujinx.Graphics.RenderDocApi/Ryujinx.Graphics.RenderDocApi.csproj
@@ -0,0 +1,9 @@
+
+
+
+ net10.0
+ disable
+ enable
+ true
+
+
diff --git a/src/Ryujinx.Graphics.Vulkan/Helpers.cs b/src/Ryujinx.Graphics.Vulkan/Helpers.cs
new file mode 100644
index 000000000..d29ac3440
--- /dev/null
+++ b/src/Ryujinx.Graphics.Vulkan/Helpers.cs
@@ -0,0 +1,32 @@
+using Silk.NET.Vulkan;
+using System.Runtime.CompilerServices;
+
+namespace Ryujinx.Graphics.Vulkan
+{
+ public static class Helpers
+ {
+ extension(Vk api)
+ {
+ ///
+ /// C# implementation of the RENDERDOC_DEVICEPOINTER_FROM_VKINSTANCE macro from the RenderDoc API header, since we cannot use macros from C#.
+ ///
+ /// The dispatch table pointer, which sits as the first pointer-sized object in the memory pointed to by the 's pointer.
+ [MethodImpl(MethodImplOptions.AggressiveInlining)]
+ public unsafe void* GetRenderDocDevicePointer() =>
+ api.CurrentInstance is not null
+ ? api.CurrentInstance.Value.GetRenderDocDevicePointer()
+ : null;
+ }
+
+ extension(Instance instance)
+ {
+ ///
+ /// C# implementation of the RENDERDOC_DEVICEPOINTER_FROM_VKINSTANCE macro from the RenderDoc API header, since we cannot use macros from C#.
+ ///
+ /// The dispatch table pointer, which sits as the first pointer-sized object in the memory pointed to by the 's pointer.
+ [MethodImpl(MethodImplOptions.AggressiveInlining)]
+ public unsafe void* GetRenderDocDevicePointer()
+ => (*((void**)(instance.Handle)));
+ }
+ }
+}
diff --git a/src/Ryujinx/Program.cs b/src/Ryujinx/Program.cs
index d77e79756..8d03f81da 100644
--- a/src/Ryujinx/Program.cs
+++ b/src/Ryujinx/Program.cs
@@ -18,6 +18,7 @@ using Ryujinx.Common.GraphicsDriver;
using Ryujinx.Common.Logging;
using Ryujinx.Common.SystemInterop;
using Ryujinx.Common.Utilities;
+using Ryujinx.Graphics.RenderDocApi;
using Ryujinx.Graphics.Vulkan.MoltenVK;
using Ryujinx.Headless;
using Ryujinx.SDL3.Common;
diff --git a/src/Ryujinx/Ryujinx.csproj b/src/Ryujinx/Ryujinx.csproj
index ddb013412..28aec175b 100644
--- a/src/Ryujinx/Ryujinx.csproj
+++ b/src/Ryujinx/Ryujinx.csproj
@@ -78,7 +78,9 @@
-
+
+
+
@@ -86,7 +88,6 @@
-
diff --git a/src/Ryujinx/UI/Renderer/EmbeddedWindow.cs b/src/Ryujinx/UI/Renderer/EmbeddedWindow.cs
index e360d42f7..687047672 100644
--- a/src/Ryujinx/UI/Renderer/EmbeddedWindow.cs
+++ b/src/Ryujinx/UI/Renderer/EmbeddedWindow.cs
@@ -2,8 +2,12 @@ using Avalonia;
using Avalonia.Controls;
using Avalonia.Platform;
using Ryujinx.Ava.Systems.Configuration;
+using Ryujinx.Ava.Utilities;
using Ryujinx.Common.Configuration;
using Ryujinx.Common.Helper;
+using Ryujinx.Common.Logging;
+using Ryujinx.Graphics.RenderDocApi;
+using Ryujinx.HLE;
using SPB.Graphics;
using SPB.Platform;
using SPB.Platform.GLX;
@@ -30,6 +34,7 @@ namespace Ryujinx.Ava.UI.Renderer
protected nint MetalLayer { get; set; }
public delegate void UpdateBoundsCallbackDelegate(Rect rect);
+
private UpdateBoundsCallbackDelegate _updateBoundsCallback;
public event EventHandler WindowCreated;
@@ -46,6 +51,55 @@ namespace Ryujinx.Ava.UI.Renderer
protected virtual void OnWindowDestroyed() { }
+ public bool ToggleRenderDocCapture(Switch device)
+ {
+ if (!RenderDoc.IsAvailable) return false;
+
+ if (RenderDoc.IsFrameCapturing)
+ {
+ if (EndRenderDocCapture())
+ {
+ Logger.Info?.Print(LogClass.Application, "Ended RenderDoc capture.");
+ return true;
+ }
+ }
+ else if (StartRenderDocCapture(device))
+ {
+ Logger.Info?.Print(LogClass.Application, "Starting RenderDoc capture.");
+ return true;
+ }
+
+ return false;
+ }
+
+ public bool StartRenderDocCapture(Switch device)
+ {
+ if (!RenderDoc.IsAvailable) return false;
+
+ if (RenderDoc.IsFrameCapturing) return false;
+
+ RenderDoc.StartFrameCapture(nint.Zero, WindowHandle);
+ RenderDoc.SetCaptureTitle(TitleHelper.FormatRenderDocCaptureTitle(device.Processes.ActiveApplication, Program.Version));
+
+ return true;
+ }
+
+ public bool EndRenderDocCapture()
+ {
+ if (!RenderDoc.IsAvailable) return false;
+ if (!RenderDoc.IsFrameCapturing) return false;
+
+ return RenderDoc.IsFrameCapturing && RenderDoc.EndFrameCapture(nint.Zero, WindowHandle);
+ }
+
+ public bool DiscardRenderDocCapture()
+ {
+ if (!RenderDoc.IsAvailable) return false;
+ if (!RenderDoc.IsFrameCapturing) return false;
+
+ return RenderDoc.IsFrameCapturing && RenderDoc.DiscardFrameCapture(nint.Zero, WindowHandle);
+ }
+
protected virtual void OnWindowDestroying()
{
WindowHandle = nint.Zero;
@@ -124,7 +178,9 @@ namespace Ryujinx.Ava.UI.Renderer
}
else
{
- X11Window = PlatformHelper.CreateOpenGLWindow(new FramebufferFormat(new ColorFormat(8, 8, 8, 0), 16, 0, ColorFormat.Zero, 0, 2, false), 0, 0, 100, 100) as GLXWindow;
+ X11Window = PlatformHelper.CreateOpenGLWindow(
+ new FramebufferFormat(new ColorFormat(8, 8, 8, 0), 16, 0, ColorFormat.Zero, 0, 2, false), 0, 0, 100,
+ 100) as GLXWindow;
}
WindowHandle = X11Window.WindowHandle.RawHandle;
@@ -138,7 +194,7 @@ namespace Ryujinx.Ava.UI.Renderer
{
_className = "NativeWindow-" + Guid.NewGuid();
- _wndProcDelegate = delegate (nint hWnd, WindowsMessages msg, nint wParam, nint lParam)
+ _wndProcDelegate = delegate(nint hWnd, WindowsMessages msg, nint wParam, nint lParam)
{
switch (msg)
{
@@ -161,7 +217,8 @@ namespace Ryujinx.Ava.UI.Renderer
RegisterClassEx(ref wndClassEx);
- WindowHandle = CreateWindowEx(0, _className, "NativeWindow", WindowStyles.WsChild, 0, 0, 640, 480, control.Handle, nint.Zero, nint.Zero, nint.Zero);
+ WindowHandle = CreateWindowEx(0, _className, "NativeWindow", WindowStyles.WsChild, 0, 0, 640, 480,
+ control.Handle, nint.Zero, nint.Zero, nint.Zero);
SetWindowLongPtrW(control.Handle, GWLP_WNDPROC, wndClassEx.lpfnWndProc);
diff --git a/src/Ryujinx/UI/RyujinxApp.axaml.cs b/src/Ryujinx/UI/RyujinxApp.axaml.cs
index efe67d6a7..c778f27fb 100644
--- a/src/Ryujinx/UI/RyujinxApp.axaml.cs
+++ b/src/Ryujinx/UI/RyujinxApp.axaml.cs
@@ -15,6 +15,7 @@ using Ryujinx.Ava.UI.Windows;
using Ryujinx.Ava.Utilities;
using Ryujinx.Common;
using Ryujinx.Common.Logging;
+using Ryujinx.Graphics.RenderDocApi;
using System;
using System.Diagnostics;
diff --git a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
index 651dc901c..96159a1ea 100644
--- a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
@@ -38,6 +38,7 @@ using Ryujinx.Common.Logging;
using Ryujinx.Common.UI;
using Ryujinx.Common.Utilities;
using Ryujinx.Cpu;
+using Ryujinx.Graphics.RenderDocApi;
using Ryujinx.HLE;
using Ryujinx.HLE.FileSystem;
using Ryujinx.HLE.HOS;
@@ -104,7 +105,7 @@ namespace Ryujinx.Ava.UI.ViewModels
[ObservableProperty] public partial Brush ProgressBarForegroundColor { get; set; }
[ObservableProperty] public partial Brush ProgressBarBackgroundColor { get; set; }
-
+
#pragma warning disable MVVMTK0042 // Must stay a normal observable field declaration since this is used as an out parameter target
[ObservableProperty] private ReadOnlyObservableCollection _appsObservableList;
#pragma warning restore MVVMTK0042
@@ -129,8 +130,7 @@ namespace Ryujinx.Ava.UI.ViewModels
[ObservableProperty] public partial string LastScannedAmiiboId { get; set; }
- [ObservableProperty]
- public partial long LastFullscreenToggle { get; set; } = Environment.TickCount64;
+ [ObservableProperty] public partial long LastFullscreenToggle { get; set; } = Environment.TickCount64;
[ObservableProperty] public partial bool ShowContent { get; set; } = true;
[ObservableProperty] public partial float VolumeBeforeMute { get; set; }
@@ -1865,6 +1865,29 @@ namespace Ryujinx.Ava.UI.ViewModels
}
}
+ public void ReloadRenderDocApi()
+ {
+ RenderDoc.ReloadApi(ignoreAlreadyLoaded: true);
+
+ OnPropertiesChanged(nameof(ShowStartCaptureButton), nameof(ShowEndCaptureButton), nameof(RenderDocIsAvailable));
+
+ if (RenderDoc.IsAvailable)
+ RenderDocIsCapturing = RenderDoc.IsFrameCapturing;
+
+ NotificationHelper.ShowInformation(
+ "RenderDoc API reloaded",
+ RenderDoc.IsAvailable ? "RenderDoc is now available." : "RenderDoc is no longer available."
+ );
+ }
+
+ public void ToggleCapture()
+ {
+ if (ShowLoadProgress) return;
+
+ AppHost.RendererHost.EmbeddedWindow.ToggleRenderDocCapture(AppHost.Device);
+ RenderDocIsCapturing = RenderDoc.IsFrameCapturing;
+ }
+
public void ToggleFullscreen()
{
if (Environment.TickCount64 - LastFullscreenToggle < HotKeyPressDelayMs)
@@ -1955,7 +1978,8 @@ namespace Ryujinx.Ava.UI.ViewModels
if (ConfigurationState.Instance.Debug.EnableGdbStub)
{
NotificationHelper.ShowInformation(
- LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.NotificationLaunchCheckGdbStubTitle, ConfigurationState.Instance.Debug.GdbStubPort.Value),
+ LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.NotificationLaunchCheckGdbStubTitle,
+ ConfigurationState.Instance.Debug.GdbStubPort.Value),
LocaleManager.Instance[LocaleKeys.NotificationLaunchCheckGdbStubMessage]);
}
@@ -1964,10 +1988,12 @@ namespace Ryujinx.Ava.UI.ViewModels
var memoryConfigurationLocaleKey = ConfigurationState.Instance.System.DramSize.Value switch
{
MemoryConfiguration.MemoryConfiguration4GiB or
- MemoryConfiguration.MemoryConfiguration4GiBAppletDev or
- MemoryConfiguration.MemoryConfiguration4GiBSystemDev => LocaleKeys.SettingsTabSystemDramSize4GiB,
+ MemoryConfiguration.MemoryConfiguration4GiBAppletDev or
+ MemoryConfiguration.MemoryConfiguration4GiBSystemDev =>
+ LocaleKeys.SettingsTabSystemDramSize4GiB,
MemoryConfiguration.MemoryConfiguration6GiB or
- MemoryConfiguration.MemoryConfiguration6GiBAppletDev => LocaleKeys.SettingsTabSystemDramSize6GiB,
+ MemoryConfiguration.MemoryConfiguration6GiBAppletDev =>
+ LocaleKeys.SettingsTabSystemDramSize6GiB,
MemoryConfiguration.MemoryConfiguration8GiB => LocaleKeys.SettingsTabSystemDramSize8GiB,
MemoryConfiguration.MemoryConfiguration12GiB => LocaleKeys.SettingsTabSystemDramSize12GiB,
_ => LocaleKeys.SettingsTabSystemDramSize4GiB,
@@ -1975,9 +2001,9 @@ namespace Ryujinx.Ava.UI.ViewModels
NotificationHelper.ShowWarning(
LocaleManager.Instance.UpdateAndGetDynamicValue(
- LocaleKeys.NotificationLaunchCheckDramSizeTitle,
+ LocaleKeys.NotificationLaunchCheckDramSizeTitle,
LocaleManager.Instance[memoryConfigurationLocaleKey]
- ),
+ ),
LocaleManager.Instance[LocaleKeys.NotificationLaunchCheckDramSizeMessage]);
}
}
@@ -2462,6 +2488,67 @@ namespace Ryujinx.Ava.UI.ViewModels
png.SaveTo(fileStream);
});
+ public bool ShowStartCaptureButton => !RenderDocIsCapturing && RenderDoc.IsAvailable;
+ public bool ShowEndCaptureButton => RenderDocIsCapturing && RenderDoc.IsAvailable;
+ public static bool RenderDocIsAvailable => RenderDoc.IsAvailable;
+
+ public bool RenderDocIsCapturing
+ {
+ get;
+ set
+ {
+ field = value;
+ OnPropertyChanged();
+ OnPropertiesChanged(nameof(ShowStartCaptureButton), nameof(ShowEndCaptureButton));
+ }
+ }
+
+ public static RelayCommand StartRenderDocCapture { get; } =
+ Commands.CreateConditional(vm => RenderDoc.IsAvailable && !vm.ShowLoadProgress,
+ viewModel =>
+ {
+ if (!RenderDoc.IsFrameCapturing)
+ {
+ if (viewModel.AppHost.RendererHost
+ .EmbeddedWindow.StartRenderDocCapture(viewModel.AppHost.Device))
+ {
+ Logger.Info?.Print(LogClass.Application, "Starting RenderDoc capture.");
+ }
+ }
+
+ viewModel.RenderDocIsCapturing = RenderDoc.IsFrameCapturing;
+ });
+
+ public static RelayCommand EndRenderDocCapture { get; } =
+ Commands.CreateConditional(vm => RenderDoc.IsAvailable && !vm.ShowLoadProgress,
+ viewModel =>
+ {
+ if (RenderDoc.IsFrameCapturing)
+ {
+ if (viewModel.AppHost.RendererHost.EmbeddedWindow.EndRenderDocCapture())
+ {
+ Logger.Info?.Print(LogClass.Application, "Ended RenderDoc capture.");
+ }
+ }
+
+ viewModel.RenderDocIsCapturing = RenderDoc.IsFrameCapturing;
+ });
+
+ public static RelayCommand DiscardRenderDocCapture { get; } =
+ Commands.CreateConditional(vm => RenderDoc.IsAvailable && !vm.ShowLoadProgress,
+ viewModel =>
+ {
+ if (RenderDoc.IsFrameCapturing)
+ {
+ if (viewModel.AppHost.RendererHost.EmbeddedWindow.DiscardRenderDocCapture())
+ {
+ Logger.Info?.Print(LogClass.Application, "Discarded RenderDoc capture.");
+ }
+ }
+
+ viewModel.RenderDocIsCapturing = RenderDoc.IsFrameCapturing;
+ });
+
#endregion
}
}
diff --git a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml
index 47f79725c..13a5d4a40 100755
--- a/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml
+++ b/src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml
@@ -8,6 +8,7 @@
xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
xmlns:common="clr-namespace:Ryujinx.Common;assembly=Ryujinx.Common"
+ xmlns:renderDocApi="clr-namespace:Ryujinx.Graphics.RenderDocApi;assembly=Ryujinx.Graphics.RenderDocApi"
x:DataType="viewModels:MainWindowViewModel"
x:Class="Ryujinx.Ava.UI.Views.Main.MainMenuBarView">
@@ -200,6 +201,29 @@
Header="{ext:Locale GameListContextMenuManageCheat}"
Icon="{ext:Icon fa-solid fa-code}"
IsEnabled="{Binding IsGameRunning}" />
+
+
+
+