TheSpydog
/
MoonWorks
forked from MoonsideGames/MoonWorks
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

clean up graphics resource code

remotes/1734711610904720328/main
cosmonaut 2023-11-20 17:09:22 -08:00
parent b2a0ca3515
commit a736ed031d
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Graphics/GraphicsDevice.cs
View File

@ -380,8 +380,7 @@ namespace MoonWorks.Graphics
{
foreach (var resource in resources)
{
var target = resource.Target;
if (target is IDisposable disposable)
if (resource.Target is IDisposable disposable)
{
disposable.Dispose();
}

20
src/Graphics/GraphicsResource.cs
View File

@ -11,18 +11,18 @@ namespace MoonWorks.Graphics
public bool IsDisposed { get; private set; }
protected abstract Action<IntPtr, IntPtr> QueueDestroyFunction { get; }
internal GCHandle selfReference;
private GCHandle SelfReference;
public GraphicsResource(GraphicsDevice device, bool trackResource = true)
protected GraphicsResource(GraphicsDevice device)
{
Device = device;
selfReference = GCHandle.Alloc(this, GCHandleType.Weak);
Device.AddResourceReference(selfReference);
SelfReference = GCHandle.Alloc(this, GCHandleType.Weak);
Device.AddResourceReference(SelfReference);
}
internal GraphicsResourceDisposalHandle CreateDisposalHandle()
{
private GraphicsResourceDisposalHandle CreateDisposalHandle()
{
return new GraphicsResourceDisposalHandle
{
QueueDestroyAction = QueueDestroyFunction,
@ -30,15 +30,15 @@ namespace MoonWorks.Graphics
};
}
protected virtual void Dispose(bool disposing)
protected void Dispose(bool disposing)
{
if (!IsDisposed)
{
if (Handle != IntPtr.Zero)
{
QueueDestroyFunction(Device.Handle, Handle);
Device.RemoveResourceReference(selfReference);
selfReference.Free();
Device.RemoveResourceReference(SelfReference);
SelfReference.Free();
Handle = IntPtr.Zero;
}
@ -50,6 +50,8 @@ namespace MoonWorks.Graphics
~GraphicsResource()
{
#if DEBUG
// If the graphics device associated with this resource was already disposed, we assume
// that your game is in the middle of shutting down.
if (!IsDisposed && Device != null && !Device.IsDisposed)
{
// If you see this log message, you leaked a graphics resource without disposing it!