[GLFW] Explicitly set address of vkGetInstanceProcAddr

Author: hyazinthh

src/Application/Aardvark.Application.Slim.GL/Application.fs

@@ -419,6 +419,7 @@ module private OpenGL =
                     getCurrentContextDelegate <- null
 
         { new IWindowInterop with
+            override _.Init(glfw) = ()
             override _.Boot(_, glfw) =
                 initVersion glfw
                 install glfw

src/Application/Aardvark.Application.Slim.Vulkan/Application.fs

@@ -14,7 +14,23 @@ open System.Runtime.InteropServices
 
 #nowarn "9"
 
-module private Vulkan =
+module internal Vulkan =
+
+    [<AutoOpen>]
+    module GlfwExtensions =
+        type private InitVulkanLoaderDel = delegate of pVkGetInstanceProcAddr: nativeint -> unit
+        let private initVulkanLoaderDict = System.Collections.Concurrent.ConcurrentDictionary<Glfw, InitVulkanLoaderDel>()
+
+        let private getInitVulkanLoaderDel (glfw : Glfw) =
+            initVulkanLoaderDict.GetOrAdd(glfw, fun (glfw: Glfw) ->
+                let m = glfw.Context.GetProcAddress "glfwInitVulkanLoader"
+                Marshal.GetDelegateForFunctionPointer(m, typeof<InitVulkanLoaderDel>) |> unbox<InitVulkanLoaderDel>
+            )
+
+        type Glfw with
+            member this.InitVulkanLoader(pVkGetInstanceProcAddr: nativeint) =
+                getInitVulkanLoaderDel(this).Invoke(pVkGetInstanceProcAddr)
+
     let getSupportedSamples (runtime : Runtime) =
         let limits = runtime.Device.PhysicalDevice.Limits.Framebuffer
 
@@ -87,6 +103,13 @@ module private Vulkan =
 
     let interop =
         { new IWindowInterop with
+            override _.Init(glfw) =
+                let pVkGetInstanceProcAddr = VulkanLoader.GetProcAddress("vkGetInstanceProcAddr")
+                if pVkGetInstanceProcAddr = 0n then
+                    failwith "[GLFW] Failed to retrieve address of Vulkan function 'vkGetInstanceProcAddr'."
+
+                glfw.InitVulkanLoader(pVkGetInstanceProcAddr)
+
             override _.Boot(runtime, glfw) =
                 let runtime = unbox<Runtime> runtime
                 let instance = runtime.Device.Instance

src/Application/Aardvark.Application.Slim/GLFW.fs

@@ -586,6 +586,7 @@ type IWindowSurface =
 
 type IWindowInterop =
     inherit IDisposable
+    abstract Init : Glfw -> unit
     abstract Boot : IRuntime * Glfw -> unit
     abstract CreateSurface : IRuntime * WindowConfig * Glfw * nativeptr<WindowHandle> -> IWindowSurface
     abstract WindowHints : WindowConfig * Glfw -> unit
@@ -597,6 +598,8 @@ type Instance(runtime : Aardvark.Rendering.IRuntime, interop : IWindowInterop, h
 
     let glfw = Glfw.GetApi()
     do
+        interop.Init(glfw)
+
         if hideCocoaMenuBar then
             Log.line "hiding cocoa menubar"
             glfw.InitHint(Silk.NET.GLFW.InitHint.CocoaMenubar, false) // glfwInitHint(GLFW_COCOA_MENUBAR, GLFW_FALSE);