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

winex11: Simplify X11DRV_vkEnumerateInstanceExtensionProperties(). 

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:18 +01:00 committed by Alexandre Julliard
parent 78447f8d10
commit eefc444f9f
1 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
dlls/winex11.drv/vulkan.c
View File

@ -368,8 +368,7 @@ static void X11DRV_vkDestroySwapchainKHR(VkDevice device, VkSwapchainKHR swapcha
static VkResult X11DRV_vkEnumerateInstanceExtensionProperties(const char *layer_name, static VkResult X11DRV_vkEnumerateInstanceExtensionProperties(const char *layer_name,
uint32_t *count, VkExtensionProperties* properties) uint32_t *count, VkExtensionProperties* properties)
{ {
VkResult res; unsigned int i;
unsigned int i, num_copies;
TRACE("layer_name %p, count %p, properties %p\n", debugstr_a(layer_name), count, properties); TRACE("layer_name %p, count %p, properties %p\n", debugstr_a(layer_name), count, properties);
@ -382,37 +381,18 @@ static VkResult X11DRV_vkEnumerateInstanceExtensionProperties(const char *layer_
if (!properties) if (!properties)
{ {
/* When properties is NULL, we need to return the number of extensions
* supported. For now report 0 until we add some e.g.
* VK_KHR_win32_surface. Long-term this needs to be an intersection
* between what the native library supports and what thunks we have.
*/
*count = winex11_vk_instance_extensions_count; *count = winex11_vk_instance_extensions_count;
return VK_SUCCESS; return VK_SUCCESS;
} }
if (*count < winex11_vk_instance_extensions_count) *count = min(*count, winex11_vk_instance_extensions_count);
for (i = 0; i < *count; i++)
{ {
/* Incomplete is a type of success used to signal the application properties[i] = winex11_vk_instance_extensions[i];
* that not all devices got copied.
*/
num_copies = *count;
res = VK_INCOMPLETE;
}
else
{
num_copies = winex11_vk_instance_extensions_count;
res = VK_SUCCESS;
} }
for (i = 0; i < num_copies; i++) TRACE("Returning %u extensions.\n", *count);
{ return *count < winex11_vk_instance_extensions_count ? VK_INCOMPLETE : VK_SUCCESS;
memcpy(&properties[i], &winex11_vk_instance_extensions[i], sizeof(*properties));
}
*count = num_copies;
TRACE("Result %d, extensions copied %u\n", res, num_copies);
return res;
} }
static void * X11DRV_vkGetDeviceProcAddr(VkDevice device, const char *name) static void * X11DRV_vkGetDeviceProcAddr(VkDevice device, const char *name)