Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Version 2: Handle wine_dlsym() errors in a better way. --- dlls/winex11.drv/vulkan.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 148908b5117d..a72be33be341 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -86,21 +86,17 @@ static inline struct wine_vk_surface *surface_from_handle(VkSurfaceKHR handle) return (struct wine_vk_surface *)(uintptr_t)handle; } -static BOOL wine_vk_init(void) -{ - static BOOL init_done = FALSE; - static void *vulkan_handle; - - if (init_done) return (vulkan_handle != NULL); - init_done = TRUE; +static void *vulkan_handle; +static BOOL WINAPI wine_vk_init(INIT_ONCE *once, void *param, void **context) +{ if (!(vulkan_handle = wine_dlopen(SONAME_LIBVULKAN, RTLD_NOW, NULL, 0))) { ERR("Failed to load %s\n", SONAME_LIBVULKAN); - return FALSE; + return TRUE; } -#define LOAD_FUNCPTR(f) if ((p##f = wine_dlsym(vulkan_handle, #f, NULL, 0)) == NULL) return FALSE; +#define LOAD_FUNCPTR(f) if ((p##f = wine_dlsym(vulkan_handle, #f, NULL, 0)) == NULL) goto fail; LOAD_FUNCPTR(vkAcquireNextImageKHR) LOAD_FUNCPTR(vkCreateInstance) LOAD_FUNCPTR(vkCreateSwapchainKHR) @@ -121,6 +117,11 @@ static BOOL wine_vk_init(void) #undef LOAD_FUNCPTR return TRUE; + +fail: + wine_dlclose(vulkan_handle, NULL, 0); + vulkan_handle = NULL; + return TRUE; } /* Helper function for converting between win32 and X11 compatible VkInstanceCreateInfo. @@ -558,13 +559,16 @@ static void *X11DRV_get_vk_instance_proc_addr(VkInstance instance, const char *n const struct vulkan_funcs *get_vulkan_driver(UINT version) { + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + if (version != WINE_VULKAN_DRIVER_VERSION) { ERR("version mismatch, vulkan wants %u but driver has %u\n", version, WINE_VULKAN_DRIVER_VERSION); return NULL; } - if (wine_vk_init()) + InitOnceExecuteOnce(&init_once, wine_vk_init, NULL, NULL); + if (vulkan_handle) return &vulkan_funcs; return NULL; -- 2.16.1