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

winevulkan: Simplify wine_vk_instance_convert_create_info() a bit. 

Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2018-03-23 14:46:16 +01:00 committed by Alexandre Julliard
parent ca2f3bae47
commit c6648a960b
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dlls/winevulkan/vulkan.c
View File

@ -191,14 +191,12 @@ static BOOL wine_vk_init(void)
* 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.
*/ */
static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo *src, static void wine_vk_instance_convert_create_info(const VkInstanceCreateInfo *src,
VkInstanceCreateInfo *dst) VkInstanceCreateInfo *dst)
{ {
unsigned int i; unsigned int i;
dst->sType = src->sType; *dst = *src;
dst->flags = src->flags;
dst->pApplicationInfo = src->pApplicationInfo;
if (dst->pApplicationInfo) if (dst->pApplicationInfo)
{ {
@ -231,7 +229,7 @@ static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo
break; break;
default: default:
FIXME("Application requested a linked structure of type %d\n", header->sType); FIXME("Application requested a linked structure of type %#x.\n", header->sType);
} }
} }
} }
@ -244,17 +242,11 @@ static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo
dst->enabledLayerCount = 0; dst->enabledLayerCount = 0;
dst->ppEnabledLayerNames = NULL; dst->ppEnabledLayerNames = NULL;
/* TODO: convert non-WSI win32 extensions here to host specific ones. */
dst->ppEnabledExtensionNames = src->ppEnabledExtensionNames;
dst->enabledExtensionCount = src->enabledExtensionCount;
TRACE("Enabled extensions: %u\n", dst->enabledExtensionCount); TRACE("Enabled extensions: %u\n", dst->enabledExtensionCount);
for (i = 0; i < dst->enabledExtensionCount; i++) for (i = 0; i < dst->enabledExtensionCount; i++)
{ {
TRACE("Extension %u: %s\n", i, debugstr_a(dst->ppEnabledExtensionNames[i])); TRACE("Extension %u: %s\n", i, debugstr_a(dst->ppEnabledExtensionNames[i]));
} }
return VK_SUCCESS;
} }
/* Helper function which stores wrapped physical devices in the instance object. */ /* Helper function which stores wrapped physical devices in the instance object. */
@ -633,12 +625,7 @@ static VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_
} }
object->base.loader_magic = VULKAN_ICD_MAGIC_VALUE; object->base.loader_magic = VULKAN_ICD_MAGIC_VALUE;
res = wine_vk_instance_convert_create_info(create_info, &create_info_host); wine_vk_instance_convert_create_info(create_info, &create_info_host);
if (res != VK_SUCCESS)
{
ERR("Failed to convert instance create info, res=%d\n", res);
goto err;
}
res = vk_funcs->p_vkCreateInstance(&create_info_host, NULL /* allocator */, &object->instance); res = vk_funcs->p_vkCreateInstance(&create_info_host, NULL /* allocator */, &object->instance);
if (res != VK_SUCCESS) if (res != VK_SUCCESS)