Merge branch 'master' into v55

RELEASE_NOTES.md

@@ -13,6 +13,11 @@
 - [Vulkan] Removed unused `Pipeline` type
 - [Vulkan] Removed `TextureFormat.ofGLSLType`
 
+### 5.4.12
+- [GL] Fixed potential memory leak after ContextHandle is disposed
+- Optimized generic dispatch
+- Fixed potential leaks with ConcurrentDictionary.GetOrAdd
+
 ### 5.4.11
 - [Application.WPF.GL] SharingRenderControl implementation now uses Silk.NET.Direct3D9 instead of SharpDX
 - Removed SharpDX dependency

src/Aardvark.Rendering.GL/Core/ContextHandles.fs

@@ -86,6 +86,7 @@ type ContextHandle(handle : IGraphicsContext, window : IWindowInfo) =
         (handle |> unbox<IGraphicsContextInternal>).GetAddress(name)
 
     member x.OnMakeCurrent(f : unit -> unit) =
+        if isDisposed then failwith "Failed to register OnMakeCurrent callback, the context is already disposed!"
         Interlocked.CompareExchange(&onMakeCurrent, ConcurrentHashSet(), null) |> ignore
         onMakeCurrent.Add f |> ignore
 
@@ -214,6 +215,15 @@ type ContextHandle(handle : IGraphicsContext, window : IWindowInfo) =
 
             if lockTaken then
                 if not isDisposed then
+
+                    // release potentially pending UnsharedObjects
+                    let actions = Interlocked.Exchange(&onMakeCurrent, null)
+                    if actions <> null then
+                        x.Use(fun () -> 
+                                for a in actions do
+                                    a()            
+                            )
+
                     isDisposed <- true
                     debugOutput |> Option.iter (fun dbg -> dbg.Dispose())
                     onDisposed.Trigger()