ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-23 00:49:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix #38 - resizing the game window was causing swapchain ResizeBuffers() to fail, leading to corrupt render targets

Browse source
This commit is contained in:
meli 2020-02-27 23:01:43 -08:00
parent 6f5ac527a7
commit 803e69d1b7
5 changed files with 36 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Dalamud/Interface/InterfaceManager.cs
View file

@ -28,7 +28,11 @@ namespace Dalamud.Interface
[UnmanagedFunctionPointer(CallingConvention.ThisCall)]
private delegate IntPtr PresentDelegate(IntPtr swapChain, uint syncInterval, uint presentFlags);
[UnmanagedFunctionPointer(CallingConvention.ThisCall)]
private delegate IntPtr ResizeBuffersDelegate(IntPtr swapChain, uint bufferCount, uint width, uint height, uint newFormat, uint swapChainFlags);
private readonly Hook<PresentDelegate> presentHook;
private readonly Hook<ResizeBuffersDelegate> resizeBuffersHook;
private readonly Hook<SetCursorDelegate> setCursorHook;
@ -73,6 +77,7 @@ namespace Dalamud.Interface
Log.Verbose("===== S W A P C H A I N =====");
Log.Verbose("SetCursor address {SetCursor}", setCursorAddr);
Log.Verbose("Present address {Present}", Address.Present);
Log.Verbose("ResizeBuffers address {ResizeBuffers}", Address.ResizeBuffers);
this.setCursorHook = new Hook<SetCursorDelegate>(setCursorAddr, new SetCursorDelegate(SetCursorDetour), this);
@ -80,18 +85,25 @@ namespace Dalamud.Interface
new Hook<PresentDelegate>(Address.Present,
new PresentDelegate(PresentDetour),
this);
this.resizeBuffersHook =
new Hook<ResizeBuffersDelegate>(Address.ResizeBuffers,
new ResizeBuffersDelegate(ResizeBuffersDetour),
this);
}
public void Enable()
{
this.setCursorHook.Enable();
this.presentHook.Enable();
this.resizeBuffersHook.Enable();
}
private void Disable()
{
this.setCursorHook.Disable();
this.presentHook.Disable();
this.resizeBuffersHook.Disable();
}
public void Dispose()
@ -107,6 +119,7 @@ namespace Dalamud.Interface
this.scene.Dispose();
this.presentHook.Dispose();
this.resizeBuffersHook.Dispose();
}
public TextureWrap LoadImage(string filePath)
@ -182,6 +195,23 @@ namespace Dalamud.Interface
return this.presentHook.Original(swapChain, syncInterval, presentFlags);
}
private IntPtr ResizeBuffersDetour(IntPtr swapChain, uint bufferCount, uint width, uint height, uint newFormat, uint swapChainFlags)
{
Log.Verbose($"Calling resizebuffers {bufferCount} {width} {height} {newFormat} {swapChainFlags}");
this.scene?.OnPreResize();
var ret = this.resizeBuffersHook.Original(swapChain, bufferCount, width, height, newFormat, swapChainFlags);
if (ret.ToInt64() == 0x887A0001)
{
Log.Error("invalid call to resizeBuffers");
}
this.scene?.OnPostResize((int)width, (int)height);
return ret;
}
// can't access imgui IO before first present call
private bool lastWantCapture = false;