From 3e9a2e01da169007b6fc16492f812055645f6d5f Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 21 Nov 2020 17:48:19 +0100 Subject: 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. --- src/mac_vulkan.m | 6 +++--- src/win_vulkan.c | 6 +++--- src/x11_vulkan.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src') 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, -- cgit v1.2.1