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

replace WeakReference with weak GCHandle

cosmonaut 2023-11-20 15:18:06 -08:00
parent 36a88afe52
commit b2a0ca3515
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Graphics/GraphicsDevice.cs
View File

@ -2,6 +2,7 @@
using System.Collections.Concurrent; using System.Collections.Concurrent;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Runtime.InteropServices;
using RefreshCS; using RefreshCS;
namespace MoonWorks.Graphics namespace MoonWorks.Graphics
@ -22,7 +23,7 @@ namespace MoonWorks.Graphics
public bool IsDisposed { get; private set; } public bool IsDisposed { get; private set; }
private readonly HashSet<WeakReference<GraphicsResource>> resources = new HashSet<WeakReference<GraphicsResource>>(); private readonly HashSet<GCHandle> resources = new HashSet<GCHandle>();
private FencePool FencePool; private FencePool FencePool;
internal GraphicsDevice( internal GraphicsDevice(
@ -338,7 +339,7 @@ namespace MoonWorks.Graphics
return (TextureFormat) Refresh.Refresh_GetSwapchainFormat(Handle, window.Handle); return (TextureFormat) Refresh.Refresh_GetSwapchainFormat(Handle, window.Handle);
} }
internal void AddResourceReference(WeakReference<GraphicsResource> resourceReference) internal void AddResourceReference(GCHandle resourceReference)
{ {
lock (resources) lock (resources)
{ {
@ -346,7 +347,7 @@ namespace MoonWorks.Graphics
} }
} }
internal void RemoveResourceReference(WeakReference<GraphicsResource> resourceReference) internal void RemoveResourceReference(GCHandle resourceReference)
{ {
lock (resources) lock (resources)
{ {
@ -377,11 +378,12 @@ namespace MoonWorks.Graphics
{ {
lock (resources) lock (resources)
{ {
foreach (var weakReference in resources) foreach (var resource in resources)
{ {
if (weakReference.TryGetTarget(out var target)) var target = resource.Target;
if (target is IDisposable disposable)
{ {
target.Dispose(); disposable.Dispose();
} }
} }
resources.Clear(); resources.Clear();

12
src/Graphics/GraphicsResource.cs
View File

@ -1,4 +1,5 @@
using System; using System;
using System.Runtime.InteropServices;
namespace MoonWorks.Graphics namespace MoonWorks.Graphics
{ {
@ -10,14 +11,14 @@ namespace MoonWorks.Graphics
public bool IsDisposed { get; private set; } public bool IsDisposed { get; private set; }
protected abstract Action<IntPtr, IntPtr> QueueDestroyFunction { get; } protected abstract Action<IntPtr, IntPtr> QueueDestroyFunction { get; }
internal WeakReference<GraphicsResource> weakReference; internal GCHandle selfReference;
public GraphicsResource(GraphicsDevice device, bool trackResource = true) public GraphicsResource(GraphicsDevice device, bool trackResource = true)
{ {
Device = device; Device = device;
weakReference = new WeakReference<GraphicsResource>(this); selfReference = GCHandle.Alloc(this, GCHandleType.Weak);
Device.AddResourceReference(weakReference); Device.AddResourceReference(selfReference);
} }
internal GraphicsResourceDisposalHandle CreateDisposalHandle() internal GraphicsResourceDisposalHandle CreateDisposalHandle()
@ -36,10 +37,9 @@ namespace MoonWorks.Graphics
if (Handle != IntPtr.Zero) if (Handle != IntPtr.Zero)
{ {
QueueDestroyFunction(Device.Handle, Handle); QueueDestroyFunction(Device.Handle, Handle);
Device.RemoveResourceReference(weakReference); Device.RemoveResourceReference(selfReference);
weakReference.SetTarget(null); selfReference.Free();
weakReference = null;
Handle = IntPtr.Zero; Handle = IntPtr.Zero;
} }