Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

BLI_stack, add clear function.

Browse Source
This commit is contained in:
Campbell Barton
2015-06-03 18:06:47 +10:00
parent ebebc4ded1
commit 1dbcccf5f9
2 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenlib/BLI_stack.h
View File

@@ -48,6 +48,7 @@ void BLI_stack_pop(BLI_Stack *stack, void *dst) ATTR_NONNULL();
void *BLI_stack_peek(BLI_Stack *stack) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); void *BLI_stack_peek(BLI_Stack *stack) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
void BLI_stack_discard(BLI_Stack *stack) ATTR_NONNULL(); void BLI_stack_discard(BLI_Stack *stack) ATTR_NONNULL();
void BLI_stack_clear(BLI_Stack *stack) ATTR_NONNULL();
size_t BLI_stack_count(const BLI_Stack *stack) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(); size_t BLI_stack_count(const BLI_Stack *stack) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();

35
source/blender/blenlib/intern/stack.c
View File

@@ -216,6 +216,41 @@ void BLI_stack_discard(BLI_Stack *stack)
} }
} }
/**
* Discards all elements without freeing.
*/
void BLI_stack_clear(BLI_Stack *stack)
{
#ifdef USE_TOTELEM
if (UNLIKELY(stack->totelem == 0)) {
return;
}
stack->totelem = 0;
#else
if (UNLIKELY(stack->chunk_curr == NULL)) {
return;
}
#endif
stack->chunk_index = stack->chunk_elem_max - 1;
if (stack->chunk_free) {
if (stack->chunk_curr) {
/* move all used chunks into tail of free list */
struct StackChunk *chunk_free_last = stack->chunk_free;
while (chunk_free_last->next) {
chunk_free_last = chunk_free_last->next;
}
chunk_free_last->next = stack->chunk_curr;
stack->chunk_curr = NULL;
}
}
else {
stack->chunk_free = stack->chunk_curr;
stack->chunk_curr = NULL;
}
}
size_t BLI_stack_count(const BLI_Stack *stack) size_t BLI_stack_count(const BLI_Stack *stack)
{ {
#ifdef USE_TOTELEM #ifdef USE_TOTELEM