From 9f3037065420ec96d6573e4ea481d349e65efeec Mon Sep 17 00:00:00 2001 From: James Park Date: Wed, 3 Feb 2021 10:29:26 -0800 Subject: [PATCH] vulkan: Use typed outarray API MSVC cannot perform GCC __typeof__ for C code. (C++ has decltype.) Reviewed-by: Jesse Natalie Reviewed-by: Dave Airlie Part-of: --- src/vulkan/util/vk_instance.c | 4 ++-- src/vulkan/util/vk_physical_device.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/vulkan/util/vk_instance.c b/src/vulkan/util/vk_instance.c index 56da90ee14f..4acd867e6a8 100644 --- a/src/vulkan/util/vk_instance.c +++ b/src/vulkan/util/vk_instance.c @@ -109,7 +109,7 @@ vk_enumerate_instance_extension_properties( uint32_t *pPropertyCount, VkExtensionProperties *pProperties) { - VK_OUTARRAY_MAKE(out, pProperties, pPropertyCount); + VK_OUTARRAY_MAKE_TYPED(VkExtensionProperties, out, pProperties, pPropertyCount); for (int i = 0; i < VK_INSTANCE_EXTENSION_COUNT; i++) { if (!supported_extensions->extensions[i]) @@ -120,7 +120,7 @@ vk_enumerate_instance_extension_properties( continue; #endif - vk_outarray_append(&out, prop) { + vk_outarray_append_typed(VkExtensionProperties, &out, prop) { *prop = vk_instance_extensions[i]; } } diff --git a/src/vulkan/util/vk_physical_device.c b/src/vulkan/util/vk_physical_device.c index 4b9ece5331b..18cab2e8715 100644 --- a/src/vulkan/util/vk_physical_device.c +++ b/src/vulkan/util/vk_physical_device.c @@ -75,7 +75,7 @@ vk_common_EnumerateDeviceExtensionProperties(VkPhysicalDevice physicalDevice, VkExtensionProperties *pProperties) { VK_FROM_HANDLE(vk_physical_device, pdevice, physicalDevice); - VK_OUTARRAY_MAKE(out, pProperties, pPropertyCount); + VK_OUTARRAY_MAKE_TYPED(VkExtensionProperties, out, pProperties, pPropertyCount); for (int i = 0; i < VK_DEVICE_EXTENSION_COUNT; i++) { if (!pdevice->supported_extensions.extensions[i]) @@ -86,7 +86,7 @@ vk_common_EnumerateDeviceExtensionProperties(VkPhysicalDevice physicalDevice, continue; #endif - vk_outarray_append(&out, prop) { + vk_outarray_append_typed(VkExtensionProperties, &out, prop) { *prop = vk_device_extensions[i]; } }