[GLFW] Make IWindowInterop inherit from IDisposable

aardvark-platform · Jun 13, 2024 · 09e8e5f · 09e8e5f
1 parent 199ed9a
commit 09e8e5f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/src/Application/Aardvark.Application.Slim.GL/Application.fs b/src/Application/Aardvark.Application.Slim.GL/Application.fs
@@ -343,8 +343,7 @@ module private OpenGL =
                 glfw.WindowHint(WindowHintBool.ScaleToMonitor, true)
                 glfw.WindowHint(WindowHintInt.Samples, if cfg.samples = 1 then 0 else cfg.samples)
 
-          interface IDisposable with
-            member x.Dispose() = cleanup()
+            override x.Dispose() = cleanup()
         }
 
 type OpenGlApplication private (runtime : Runtime, shaderCachePath : Option<string>, hideCocoaMenuBar : bool) as this =

diff --git a/src/Application/Aardvark.Application.Slim.Vulkan/Application.fs b/src/Application/Aardvark.Application.Slim.Vulkan/Application.fs
@@ -93,6 +93,9 @@ module private Vulkan =
 
             override __.WindowHints(cfg: WindowConfig, glfw: Glfw) = 
                 glfw.WindowHint(WindowHintClientApi.ClientApi, ClientApi.NoApi)
+
+            override __.Dispose() =
+                ()
         }
 
 type VulkanApplication private (app : HeadlessVulkanApplication, hideCocoaMenuBar : bool) =

diff --git a/src/Application/Aardvark.Application.Slim/GLFW.fs b/src/Application/Aardvark.Application.Slim/GLFW.fs
@@ -565,8 +565,8 @@ type IWindowSurface =
     abstract CreateSwapchain : V2i -> ISwapchain
     abstract Handle : obj
 
-// TODO: Inherit IDisposable (see Instance.Dispose())
 type IWindowInterop =
+    inherit IDisposable
     abstract Boot : Glfw -> unit
     abstract CreateSurface : IRuntime * WindowConfig * Glfw * nativeptr<WindowHandle> -> IWindowSurface
     abstract WindowHints : WindowConfig * Glfw -> unit
@@ -753,10 +753,7 @@ type Instance(runtime : Aardvark.Rendering.IRuntime, interop : IWindowInterop, h
                 if v then wait <- false
 
     member x.Dispose() =
-        match interop with
-        | :? IDisposable as d -> d.Dispose()
-        | _ -> ()
-
+        interop.Dispose()
         glfw.Terminate()
 
     interface IDisposable with