mrq/GLdc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add some assertions to aligned_vector

Browse Source
This commit is contained in:
Luke Benstead 2019-03-28 13:08:23 +00:00
parent 8982444406
commit 093b1af056
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
containers/aligned_vector.c
View File

@ -2,6 +2,7 @@
#include <string.h> #include <string.h>
#include <math.h> #include <math.h>
#include <assert.h> #include <assert.h>
#include <stdio.h>
#if defined(__APPLE__) || defined(__WIN32__) #if defined(__APPLE__) || defined(__WIN32__)
/* Linux + Kos define this, OSX does not, so just use malloc there */ /* Linux + Kos define this, OSX does not, so just use malloc there */
@ -33,6 +34,10 @@ static inline unsigned int round_to_chunk_size(unsigned int val) {
void aligned_vector_reserve(AlignedVector* vector, unsigned int element_count) { void aligned_vector_reserve(AlignedVector* vector, unsigned int element_count) {
if(element_count == 0) {
return;
}
if(element_count <= vector->capacity) { if(element_count <= vector->capacity) {
return; return;
} }
@ -44,7 +49,9 @@ void aligned_vector_reserve(AlignedVector* vector, unsigned int element_count) {
unsigned int new_byte_size = element_count * vector->element_size; unsigned int new_byte_size = element_count * vector->element_size;
unsigned char* original_data = vector->data; unsigned char* original_data = vector->data;
vector->data = (unsigned char*) memalign(0x20, new_byte_size); vector->data = (unsigned char*) memalign(0x20, new_byte_size);
assert(vector->data);
if(original_data) { if(original_data) {
memcpy(vector->data, original_data, original_byte_size); memcpy(vector->data, original_data, original_byte_size);
@ -56,10 +63,14 @@ void aligned_vector_reserve(AlignedVector* vector, unsigned int element_count) {
void* aligned_vector_push_back(AlignedVector* vector, const void* objs, unsigned int count) { void* aligned_vector_push_back(AlignedVector* vector, const void* objs, unsigned int count) {
/* Resize enough room */ /* Resize enough room */
assert(count);
assert(vector->element_size);
unsigned int initial_size = vector->size; unsigned int initial_size = vector->size;
aligned_vector_resize(vector, vector->size + count); aligned_vector_resize(vector, vector->size + count);
assert(vector->size == initial_size + count);
unsigned char* dest = vector->data + (vector->element_size * initial_size); unsigned char* dest = vector->data + (vector->element_size * initial_size);
/* Copy the objects in */ /* Copy the objects in */