OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vulkan: Use typed outarray API

Browse Source 
MSVC cannot perform GCC __typeof__ for C code. (C++ has decltype.)

Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9208>
This commit is contained in:
James Park
2021-02-03 10:29:26 -08:00
committed by Dave Airlie
parent 054dd668a6
commit 9f30370654
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vulkan/util/vk_instance.c
View File

@@ -109,7 +109,7 @@ vk_enumerate_instance_extension_properties(
uint32_t *pPropertyCount, uint32_t *pPropertyCount,
VkExtensionProperties *pProperties) 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++) { for (int i = 0; i < VK_INSTANCE_EXTENSION_COUNT; i++) {
if (!supported_extensions->extensions[i]) if (!supported_extensions->extensions[i])
@@ -120,7 +120,7 @@ vk_enumerate_instance_extension_properties(
continue; continue;
#endif #endif
vk_outarray_append(&out, prop) { vk_outarray_append_typed(VkExtensionProperties, &out, prop) {
*prop = vk_instance_extensions[i]; *prop = vk_instance_extensions[i];
} }
} }

4
src/vulkan/util/vk_physical_device.c
View File

@@ -75,7 +75,7 @@ vk_common_EnumerateDeviceExtensionProperties(VkPhysicalDevice physicalDevice,
VkExtensionProperties *pProperties) VkExtensionProperties *pProperties)
{ {
VK_FROM_HANDLE(vk_physical_device, pdevice, physicalDevice); 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++) { for (int i = 0; i < VK_DEVICE_EXTENSION_COUNT; i++) {
if (!pdevice->supported_extensions.extensions[i]) if (!pdevice->supported_extensions.extensions[i])
@@ -86,7 +86,7 @@ vk_common_EnumerateDeviceExtensionProperties(VkPhysicalDevice physicalDevice,
continue; continue;
#endif #endif
vk_outarray_append(&out, prop) { vk_outarray_append_typed(VkExtensionProperties, &out, prop) {
*prop = vk_device_extensions[i]; *prop = vk_device_extensions[i];
} }
} }