diff options
| author | David Robillard <d@drobilla.net> | 2020-11-21 17:48:19 +0100 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2020-11-25 14:18:04 +0100 |
| commit | 3e9a2e01da169007b6fc16492f812055645f6d5f (patch) | |
| tree | e761ca334ee9b0e3bd91b3a6f83ab1373dd7aa7f /src | |
| parent | 6426b03476fb91efbd90acd599472010f5474390 (diff) | |
| download | pugl-3e9a2e01da169007b6fc16492f812055645f6d5f.tar.gz pugl-3e9a2e01da169007b6fc16492f812055645f6d5f.tar.bz2 pugl-3e9a2e01da169007b6fc16492f812055645f6d5f.zip | |
Pass vkGetInstanceProcAddr to puglCreateSurface instead of a loader
This allows puglCreateSurface() to be used with some other loader, or when
linking to Vulkan at compile time.
Diffstat (limited to 'src')
| -rw-r--r-- | src/mac_vulkan.m | 6 | ||||
| -rw-r--r-- | src/win_vulkan.c | 6 | ||||
| -rw-r--r-- | src/x11_vulkan.c | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/mac_vulkan.m b/src/mac_vulkan.m index 39c7f29..2d01fd4 100644 --- a/src/mac_vulkan.m +++ b/src/mac_vulkan.m @@ -194,7 +194,7 @@ puglGetInstanceExtensions(uint32_t* const count) } VkResult -puglCreateSurface(const PuglVulkanLoader* const loader, +puglCreateSurface(PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr, PuglView* const view, VkInstance instance, const VkAllocationCallbacks* const allocator, @@ -203,8 +203,8 @@ puglCreateSurface(const PuglVulkanLoader* const loader, PuglInternals* const impl = view->impl; PFN_vkCreateMacOSSurfaceMVK vkCreateMacOSSurfaceMVK = - (PFN_vkCreateMacOSSurfaceMVK)puglGetInstanceProcAddrFunc( - loader)(instance, "vkCreateMacOSSurfaceMVK"); + (PFN_vkCreateMacOSSurfaceMVK) + vkGetInstanceProcAddr(instance, "vkCreateMacOSSurfaceMVK"); const VkMacOSSurfaceCreateInfoMVK info = { VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK, diff --git a/src/win_vulkan.c b/src/win_vulkan.c index eb20698..3d6934a 100644 --- a/src/win_vulkan.c +++ b/src/win_vulkan.c @@ -107,7 +107,7 @@ puglGetInstanceExtensions(uint32_t* const count) } VkResult -puglCreateSurface(const PuglVulkanLoader* const loader, +puglCreateSurface(PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr, PuglView* const view, VkInstance instance, const VkAllocationCallbacks* const pAllocator, @@ -116,8 +116,8 @@ puglCreateSurface(const PuglVulkanLoader* const loader, PuglInternals* const impl = view->impl; PFN_vkCreateWin32SurfaceKHR vkCreateWin32SurfaceKHR = - (PFN_vkCreateWin32SurfaceKHR)puglGetInstanceProcAddrFunc(loader)( - instance, "vkCreateWin32SurfaceKHR"); + (PFN_vkCreateWin32SurfaceKHR) + vkGetInstanceProcAddr(instance, "vkCreateWin32SurfaceKHR"); const VkWin32SurfaceCreateInfoKHR createInfo = { VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR, diff --git a/src/x11_vulkan.c b/src/x11_vulkan.c index 7004fd8..c7ae1b0 100644 --- a/src/x11_vulkan.c +++ b/src/x11_vulkan.c @@ -110,7 +110,7 @@ puglGetInstanceExtensions(uint32_t* const count) } VkResult -puglCreateSurface(const PuglVulkanLoader* const loader, +puglCreateSurface(PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr, PuglView* const view, VkInstance instance, const VkAllocationCallbacks* const allocator, @@ -120,8 +120,8 @@ puglCreateSurface(const PuglVulkanLoader* const loader, PuglWorldInternals* world_impl = view->world->impl; PFN_vkCreateXlibSurfaceKHR vkCreateXlibSurfaceKHR = - (PFN_vkCreateXlibSurfaceKHR)puglGetInstanceProcAddrFunc(loader)( - instance, "vkCreateXlibSurfaceKHR"); + (PFN_vkCreateXlibSurfaceKHR) + vkGetInstanceProcAddr(instance, "vkCreateXlibSurfaceKHR"); const VkXlibSurfaceCreateInfoKHR info = { VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR, |