KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "vulkan: Detect pNext chain loops in vk_foreach_struct()" 

This reverts commit 4c56b535f5.
This commit is contained in:
Jason Ekstrand 2022-07-18 23:48:59 -05:00
parent 2bfcd29155
commit 669daa37b1
1 changed files with 2 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/vulkan/util/vk_util.h
View File

@ -37,50 +37,13 @@ extern "C" {
#include <vulkan/vulkan.h>
#ifdef NDEBUG
#define vk_foreach_struct(__iter, __start) \
for (VkBaseOutStructure *__iter = (VkBaseOutStructure *)(__start); \
for (struct VkBaseOutStructure *__iter = (struct VkBaseOutStructure *)(__start); \
__iter; __iter = __iter->pNext)
#define vk_foreach_struct_const(__iter, __start) \
for (const VkBaseInStructure *__iter = (const VkBaseInStructure *)(__start); \
for (const struct VkBaseInStructure *__iter = (const struct VkBaseInStructure *)(__start); \
__iter; __iter = __iter->pNext)
#else
static inline void
__vk_foreach_debug_next(VkBaseOutStructure **iter,
VkBaseOutStructure *chaser)
{
assert(*iter);
*iter = (*iter)->pNext;
if ((int)chaser->sType & 1) {
/** This the "tortoise and the hare" algorithm. We increment
* chaser->pNext every other time *iter gets incremented. Because *iter
* is incrementing twice as fast as chaser->pNext, the distance between
* them in the list increases by one for each time we get here. If we
* have a loop, eventually, both iterators will be inside the loop and
* this distance will be an integer multiple of the loop length, at
* which point the two pointers will be equal.
*/
chaser->pNext = chaser->pNext->pNext;
if (chaser->pNext == *iter)
assert(!"Vulkan input pNext chain has a loop!");
}
chaser->sType = (VkStructureType)((int)chaser->sType + 1);
}
#define vk_foreach_struct(__iter, __start) \
for (VkBaseOutStructure *__iter = (VkBaseOutStructure *)(__start), \
__chaser = { (VkStructureType)0, (VkBaseOutStructure *)(__start) }; \
__iter; __vk_foreach_debug_next(&__iter, &__chaser))
#define vk_foreach_struct_const(__iter, __start) \
for (const VkBaseInStructure *__iter = (const VkBaseInStructure *)(__start), \
__chaser = { (VkStructureType)0, (const VkBaseInStructure *)(__start) }; \
__iter; __vk_foreach_debug_next((VkBaseOutStructure **)&__iter, \
(VkBaseOutStructure *)&__chaser))
#endif
/**
* A wrapper for a Vulkan output array. A Vulkan output array is one that