From 5ddf473450aab4eceb4707c7fdfea3b5babff24d Mon Sep 17 00:00:00 2001 From: goaaats Date: Sun, 6 Apr 2025 21:50:55 +0200 Subject: [PATCH] Fix nothing rendering, oops --- .../ImGuiBackend/Dx11Win32Backend.cs | 50 ------------------- .../ImGuiBackend/Renderers/Dx11Renderer.cs | 2 +- 2 files changed, 1 insertion(+), 51 deletions(-) diff --git a/Dalamud/Interface/ImGuiBackend/Dx11Win32Backend.cs b/Dalamud/Interface/ImGuiBackend/Dx11Win32Backend.cs index 1331b6cfe..a74c26858 100644 --- a/Dalamud/Interface/ImGuiBackend/Dx11Win32Backend.cs +++ b/Dalamud/Interface/ImGuiBackend/Dx11Win32Backend.cs @@ -71,57 +71,7 @@ internal sealed unsafe class Dx11Win32Backend : IWin32Backend this.WindowHandle = desc.OutputWindow; var ctx = ImGui.CreateContext(); - Debug.Assert(!ctx.IsNull); - var windowOff = Marshal.OffsetOf("CurrentWindow"); - //Debug.Assert(windowOff == 16368); - - /* - void ShowOffset(string name) - { - // var off = Marshal.OffsetOf(name); - var fieldInfo = typeof(T).GetField(name, BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic); - var off = fieldInfo?.GetFieldOffset(); - - Log.Information($"{name} {typeof(T).Name} {off}"); - } - - //Util.Fatal($"{Marshal.SizeOf()} - {sizeof(Test)}", "", false); - - ShowOffset("ClipboardUserData"); - ShowOffset("MouseDrawCursor"); - - ShowOffset("MouseDelta"); - ShowOffset("KeysDown_0"); - ShowOffset("MousePos"); - - ShowOffset("KeyMods"); - */ - - void ShowAllFields() - { - var fields = typeof(T).GetFields(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic); - foreach (var field in fields) - { - var off = field.GetFieldOffset(); - Log.Information($"{field.Name} {typeof(T).Name} {off}"); - } - } - - ShowAllFields(); - - var contextSize = Unsafe.SizeOf(); - var ioSize = Unsafe.SizeOf(); - var platformIoSize = Unsafe.SizeOf(); - - //Debug.Assert(contextSize == 22688); - //Debug.Assert(ioSize == 14352); - //Debug.Assert(platformIoSize == 216); - - //var platformIoOff = Unsafe.OffsetOf("PlatformIO"); - //Debug.Assert(platformIoOff == 14360); - - Util.Fatal("bleh", "bleh", false); ImGuizmo.SetImGuiContext(ctx); ImPlot.SetImGuiContext(ctx); diff --git a/Dalamud/Interface/ImGuiBackend/Renderers/Dx11Renderer.cs b/Dalamud/Interface/ImGuiBackend/Renderers/Dx11Renderer.cs index 34bda8b12..faa4a945b 100644 --- a/Dalamud/Interface/ImGuiBackend/Renderers/Dx11Renderer.cs +++ b/Dalamud/Interface/ImGuiBackend/Renderers/Dx11Renderer.cs @@ -359,7 +359,7 @@ internal unsafe partial class Dx11Renderer : IImGuiRenderer this.context.Get()->RSSetScissorRects(1, &clipRect); - if (cmd.UserCallback != null) + if (cmd.UserCallback == null) { // Bind texture and draw var srv = (ID3D11ShaderResourceView*)cmd.TextureId.Handle;