Module: Mesa Branch: master Commit: bfbb36260152ef37329a12f0b9f64a7a01d3191d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bfbb36260152ef37329a12f0b9f64a7a01d3191d
Author: Jason Ekstrand <[email protected]> Date: Tue Feb 14 14:29:19 2017 -0800 anv: Use vk_foreach_struct for handling extension structs Reviewed-by: Dave Airlie <[email protected]> --- src/intel/vulkan/anv_device.c | 27 +++++++++++++-------------- src/intel/vulkan/anv_formats.c | 16 ++++++++-------- src/intel/vulkan/anv_private.h | 5 ----- 3 files changed, 21 insertions(+), 27 deletions(-) diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c index 57d70b6..d1a6cc8 100644 --- a/src/intel/vulkan/anv_device.c +++ b/src/intel/vulkan/anv_device.c @@ -33,6 +33,7 @@ #include "anv_private.h" #include "util/strtod.h" #include "util/debug.h" +#include "util/vk_util.h" #include "genxml/gen7_pack.h" @@ -511,10 +512,10 @@ void anv_GetPhysicalDeviceFeatures2KHR( { anv_GetPhysicalDeviceFeatures(physicalDevice, &pFeatures->features); - for (struct anv_common *c = pFeatures->pNext; c != NULL; c = c->pNext) { - switch (c->sType) { + vk_foreach_struct(ext, pFeatures->pNext) { + switch (ext->sType) { default: - anv_debug_ignored_stype(c->sType); + anv_debug_ignored_stype(ext->sType); break; } } @@ -669,10 +670,10 @@ void anv_GetPhysicalDeviceProperties2KHR( { anv_GetPhysicalDeviceProperties(physicalDevice, &pProperties->properties); - for (struct anv_common *c = pProperties->pNext; c != NULL; c = c->pNext) { - switch (c->sType) { + vk_foreach_struct(ext, pProperties->pNext) { + switch (ext->sType) { default: - anv_debug_ignored_stype(c->sType); + anv_debug_ignored_stype(ext->sType); break; } } @@ -746,11 +747,10 @@ void anv_GetPhysicalDeviceQueueFamilyProperties2KHR( anv_get_queue_family_properties(phys_dev, &pQueueFamilyProperties->queueFamilyProperties); - for (struct anv_common *c = pQueueFamilyProperties->pNext; - c != NULL; c = c->pNext) { - switch (c->sType) { + vk_foreach_struct(ext, pQueueFamilyProperties->pNext) { + switch (ext->sType) { default: - anv_debug_ignored_stype(c->sType); + anv_debug_ignored_stype(ext->sType); break; } } @@ -815,11 +815,10 @@ void anv_GetPhysicalDeviceMemoryProperties2KHR( anv_GetPhysicalDeviceMemoryProperties(physicalDevice, &pMemoryProperties->memoryProperties); - for (struct anv_common *c = pMemoryProperties->pNext; - c != NULL; c = c->pNext) { - switch (c->sType) { + vk_foreach_struct(ext, pMemoryProperties->pNext) { + switch (ext->sType) { default: - anv_debug_ignored_stype(c->sType); + anv_debug_ignored_stype(ext->sType); break; } } diff --git a/src/intel/vulkan/anv_formats.c b/src/intel/vulkan/anv_formats.c index 0e84960..6005791 100644 --- a/src/intel/vulkan/anv_formats.c +++ b/src/intel/vulkan/anv_formats.c @@ -24,6 +24,8 @@ #include "anv_private.h" #include "vk_format_info.h" +#include "util/vk_util.h" + /* * gcc-4 and earlier don't allow compound literals where a constant * is required in -std=c99/gnu99 mode, so we can't use ISL_SWIZZLE() @@ -470,11 +472,10 @@ void anv_GetPhysicalDeviceFormatProperties2KHR( anv_GetPhysicalDeviceFormatProperties(physicalDevice, format, &pFormatProperties->formatProperties); - for (struct anv_common *c = pFormatProperties->pNext; - c != NULL; c = c->pNext) { - switch (c->sType) { + vk_foreach_struct(ext, pFormatProperties->pNext) { + switch (ext->sType) { default: - anv_debug_ignored_stype(c->sType); + anv_debug_ignored_stype(ext->sType); break; } } @@ -668,11 +669,10 @@ VkResult anv_GetPhysicalDeviceImageFormatProperties2KHR( if (result != VK_SUCCESS) return result; - for (struct anv_common *c = pImageFormatProperties->pNext; - c != NULL; c = c->pNext) { - switch (c->sType) { + vk_foreach_struct(ext, pImageFormatProperties->pNext) { + switch (ext->sType) { default: - anv_debug_ignored_stype(c->sType); + anv_debug_ignored_stype(ext->sType); break; } } diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h index b5c5b23..da1ca29 100644 --- a/src/intel/vulkan/anv_private.h +++ b/src/intel/vulkan/anv_private.h @@ -1895,11 +1895,6 @@ void anv_dump_finish(void); void anv_dump_add_framebuffer(struct anv_cmd_buffer *cmd_buffer, struct anv_framebuffer *fb); -struct anv_common { - VkStructureType sType; - struct anv_common *pNext; -}; - #define ANV_DEFINE_HANDLE_CASTS(__anv_type, __VkType) \ \ static inline struct __anv_type * \ _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
