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

fix: correctly enqueue textures for destroy if they're GC'd

Browse source
This commit is contained in:
goat 2023-03-26 00:22:09 +01:00
parent 70d5cb5856
commit 14ce85627d
No known key found for this signature in database
GPG key ID: 49E2AA8C6A76498B
2 changed files with 26 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Dalamud/Interface/Internal/DalamudTextureWrap.cs
View file

@ -21,6 +21,14 @@ public class DalamudTextureWrap : TextureWrap
this.wrappedWrap = wrappingWrap; this.wrappedWrap = wrappingWrap;
} }
/// <summary>
/// Finalizes an instance of the <see cref="DalamudTextureWrap"/> class.
/// </summary>
~DalamudTextureWrap()
{
this.Dispose(false);
}
/// <summary> /// <summary>
/// Gets the ImGui handle of the texture. /// Gets the ImGui handle of the texture.
/// </summary> /// </summary>
@ -41,7 +49,8 @@ public class DalamudTextureWrap : TextureWrap
/// </summary> /// </summary>
public void Dispose() public void Dispose()
{ {
Service<InterfaceManager>.Get().EnqueueDeferredDispose(this); this.Dispose(true);
GC.SuppressFinalize(this);
} }
/// <summary> /// <summary>
@ -51,4 +60,12 @@ public class DalamudTextureWrap : TextureWrap
{ {
this.wrappedWrap.Dispose(); this.wrappedWrap.Dispose();
} }
private void Dispose(bool disposing)
{
if (disposing)
{
Service<InterfaceManager>.GetNullable()?.EnqueueDeferredDispose(this);
}
}
} }

12
Dalamud/Interface/Internal/InterfaceManager.cs
View file

@ -606,12 +606,16 @@ internal class InterfaceManager : IDisposable, IServiceType
this.RenderImGui(); this.RenderImGui();
foreach (var texture in this.deferredDisposeTextures) if (this.deferredDisposeTextures.Count > 0)
{ {
texture.RealDispose(); Log.Verbose("[IM] Disposing {Count} textures", this.deferredDisposeTextures.Count);
} foreach (var texture in this.deferredDisposeTextures)
{
texture.RealDispose();
}
this.deferredDisposeTextures.Clear(); this.deferredDisposeTextures.Clear();
}
return this.presentHook.Original(swapChain, syncInterval, presentFlags); return this.presentHook.Original(swapChain, syncInterval, presentFlags);
} }