ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winevulkan: Don't initialize the Vulkan driver in DllMain(). 

Fixes an issue where winevulkan would not be registered if no Vulkan
driver was present during prefix creation (such as in a build VM).

Signed-off-by: Brendan Shanks <bshanks@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Brendan Shanks 2020-06-26 16:21:54 -07:00 committed by Alexandre Julliard
parent 7be64a8d3e
commit aec1968788
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dlls/winevulkan/vulkan.c
View File

@ -306,7 +306,7 @@ static void wine_vk_device_free(struct VkDevice_T *device)
heap_free(device); heap_free(device);
} }
static BOOL wine_vk_init(void) static BOOL WINAPI wine_vk_init(INIT_ONCE *once, void *param, void **context)
{ {
HDC hdc; HDC hdc;
@ -314,16 +314,20 @@ static BOOL wine_vk_init(void)
vk_funcs = __wine_get_vulkan_driver(hdc, WINE_VULKAN_DRIVER_VERSION); vk_funcs = __wine_get_vulkan_driver(hdc, WINE_VULKAN_DRIVER_VERSION);
ReleaseDC(0, hdc); ReleaseDC(0, hdc);
if (!vk_funcs) if (!vk_funcs)
{
ERR("Failed to load Wine graphics driver supporting Vulkan.\n"); ERR("Failed to load Wine graphics driver supporting Vulkan.\n");
return FALSE; else
}
p_vkEnumerateInstanceVersion = vk_funcs->p_vkGetInstanceProcAddr(NULL, "vkEnumerateInstanceVersion"); p_vkEnumerateInstanceVersion = vk_funcs->p_vkGetInstanceProcAddr(NULL, "vkEnumerateInstanceVersion");
return TRUE; return TRUE;
} }
static void wine_vk_init_once(void)
{
static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT;
InitOnceExecuteOnce(&init_once, wine_vk_init, NULL, NULL);
}
/* Helper function for converting between win32 and host compatible VkInstanceCreateInfo. /* Helper function for converting between win32 and host compatible VkInstanceCreateInfo.
* This function takes care of extensions handled at winevulkan layer, a Wine graphics * This function takes care of extensions handled at winevulkan layer, a Wine graphics
* driver is responsible for handling e.g. surface extensions. * driver is responsible for handling e.g. surface extensions.
@ -653,6 +657,10 @@ VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_info,
TRACE("create_info %p, allocator %p, instance %p\n", create_info, allocator, instance); TRACE("create_info %p, allocator %p, instance %p\n", create_info, allocator, instance);
wine_vk_init_once();
if (!vk_funcs)
return VK_ERROR_INITIALIZATION_FAILED;
if (allocator) if (allocator)
FIXME("Support for allocation callbacks not implemented yet\n"); FIXME("Support for allocation callbacks not implemented yet\n");
@ -779,6 +787,10 @@ VkResult WINAPI wine_vkEnumerateInstanceExtensionProperties(const char *layer_na
return VK_ERROR_LAYER_NOT_PRESENT; return VK_ERROR_LAYER_NOT_PRESENT;
} }
wine_vk_init_once();
if (!vk_funcs)
return VK_ERROR_INITIALIZATION_FAILED;
res = vk_funcs->p_vkEnumerateInstanceExtensionProperties(NULL, &num_host_properties, NULL); res = vk_funcs->p_vkEnumerateInstanceExtensionProperties(NULL, &num_host_properties, NULL);
if (res != VK_SUCCESS) if (res != VK_SUCCESS)
return res; return res;
@ -847,6 +859,8 @@ VkResult WINAPI wine_vkEnumerateInstanceVersion(uint32_t *version)
TRACE("%p\n", version); TRACE("%p\n", version);
wine_vk_init_once();
if (p_vkEnumerateInstanceVersion) if (p_vkEnumerateInstanceVersion)
{ {
res = p_vkEnumerateInstanceVersion(version); res = p_vkEnumerateInstanceVersion(version);
@ -1367,13 +1381,14 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved)
case DLL_PROCESS_ATTACH: case DLL_PROCESS_ATTACH:
hinstance = hinst; hinstance = hinst;
DisableThreadLibraryCalls(hinst); DisableThreadLibraryCalls(hinst);
return wine_vk_init(); break;
} }
return TRUE; return TRUE;
} }
static const struct vulkan_func vk_global_dispatch_table[] = static const struct vulkan_func vk_global_dispatch_table[] =
{ {
/* These functions must call wine_vk_init_once() before accessing vk_funcs. */
{"vkCreateInstance", &wine_vkCreateInstance}, {"vkCreateInstance", &wine_vkCreateInstance},
{"vkEnumerateInstanceExtensionProperties", &wine_vkEnumerateInstanceExtensionProperties}, {"vkEnumerateInstanceExtensionProperties", &wine_vkEnumerateInstanceExtensionProperties},
{"vkEnumerateInstanceLayerProperties", &wine_vkEnumerateInstanceLayerProperties}, {"vkEnumerateInstanceLayerProperties", &wine_vkEnumerateInstanceLayerProperties},