From face6f6ddcf49a4a891da2814d675ed56a4b0637 Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Wed, 23 Mar 2022 13:54:26 +0100 Subject: [PATCH] panvk: Stop using VK_OUTARRAY_MAKE() We're trying to replace VK_OUTARRAY_MAKE() by VK_OUTARRAY_MAKE_TYPED() so people don't get tempted to use it and make things incompatible with MSVC (which doesn't support typeof()). Suggested-by: Daniel Stone Reviewed-by: Jason Ekstrand Part-of: --- src/panfrost/vulkan/panvk_device.c | 18 +++++++++++------- src/panfrost/vulkan/panvk_formats.c | 7 ++++--- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/panfrost/vulkan/panvk_device.c b/src/panfrost/vulkan/panvk_device.c index 8fcab6124c2..706a8e68810 100644 --- a/src/panfrost/vulkan/panvk_device.c +++ b/src/panfrost/vulkan/panvk_device.c @@ -416,7 +416,8 @@ panvk_EnumeratePhysicalDevices(VkInstance _instance, VkPhysicalDevice *pPhysicalDevices) { VK_FROM_HANDLE(panvk_instance, instance, _instance); - VK_OUTARRAY_MAKE(out, pPhysicalDevices, pPhysicalDeviceCount); + VK_OUTARRAY_MAKE_TYPED(VkPhysicalDevice, out, + pPhysicalDevices, pPhysicalDeviceCount); VkResult result; @@ -427,7 +428,7 @@ panvk_EnumeratePhysicalDevices(VkInstance _instance, } for (uint32_t i = 0; i < instance->physical_device_count; ++i) { - vk_outarray_append(&out, p) + vk_outarray_append_typed(VkPhysicalDevice, &out, p) { *p = panvk_physical_device_to_handle(instance->physical_devices + i); } @@ -442,8 +443,9 @@ panvk_EnumeratePhysicalDeviceGroups(VkInstance _instance, VkPhysicalDeviceGroupProperties *pPhysicalDeviceGroupProperties) { VK_FROM_HANDLE(panvk_instance, instance, _instance); - VK_OUTARRAY_MAKE(out, pPhysicalDeviceGroupProperties, - pPhysicalDeviceGroupCount); + VK_OUTARRAY_MAKE_TYPED(VkPhysicalDeviceGroupProperties, out, + pPhysicalDeviceGroupProperties, + pPhysicalDeviceGroupCount); VkResult result; if (instance->physical_device_count < 0) { @@ -453,7 +455,7 @@ panvk_EnumeratePhysicalDeviceGroups(VkInstance _instance, } for (uint32_t i = 0; i < instance->physical_device_count; ++i) { - vk_outarray_append(&out, p) + vk_outarray_append_typed(VkPhysicalDeviceGroupProperties, &out, p) { p->physicalDeviceCount = 1; p->physicalDevices[0] = @@ -838,9 +840,11 @@ panvk_GetPhysicalDeviceQueueFamilyProperties2(VkPhysicalDevice physicalDevice, uint32_t *pQueueFamilyPropertyCount, VkQueueFamilyProperties2 *pQueueFamilyProperties) { - VK_OUTARRAY_MAKE(out, pQueueFamilyProperties, pQueueFamilyPropertyCount); + VK_OUTARRAY_MAKE_TYPED(VkQueueFamilyProperties2, out, + pQueueFamilyProperties, + pQueueFamilyPropertyCount); - vk_outarray_append(&out, p) + vk_outarray_append_typed(VkQueueFamilyProperties2, &out, p) { p->queueFamilyProperties = panvk_queue_family_properties; } diff --git a/src/panfrost/vulkan/panvk_formats.c b/src/panfrost/vulkan/panvk_formats.c index b834c43eb38..d36fd6657c4 100644 --- a/src/panfrost/vulkan/panvk_formats.c +++ b/src/panfrost/vulkan/panvk_formats.c @@ -125,10 +125,11 @@ panvk_GetPhysicalDeviceFormatProperties2(VkPhysicalDevice physicalDevice, VkDrmFormatModifierPropertiesListEXT *list = vk_find_struct(pFormatProperties->pNext, DRM_FORMAT_MODIFIER_PROPERTIES_LIST_EXT); if (list) { - VK_OUTARRAY_MAKE(out, list->pDrmFormatModifierProperties, - &list->drmFormatModifierCount); + VK_OUTARRAY_MAKE_TYPED(VkDrmFormatModifierPropertiesEXT, out, + list->pDrmFormatModifierProperties, + &list->drmFormatModifierCount); - vk_outarray_append(&out, mod_props) { + vk_outarray_append_typed(VkDrmFormatModifierProperties2EXT, &out, mod_props) { mod_props->drmFormatModifier = DRM_FORMAT_MOD_LINEAR; mod_props->drmFormatModifierPlaneCount = 1; }