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

Don't include platform.h from aligned_vector.h

Browse Source
This commit is contained in:
Luke Benstead 2021-09-18 17:40:10 +01:00
parent e26fae6d2e
commit 6184208598
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
containers/aligned_vector.h
View File

@ -3,7 +3,6 @@
#include <assert.h> #include <assert.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "../GL/platform.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -18,6 +17,13 @@ static inline void* memalign(size_t alignment, size_t size) {
#include <malloc.h> #include <malloc.h>
#endif #endif
#ifdef __DREAMCAST__
#include <kos/string.h>
#define AV_MEMCPY4 memcpy4
#else
#define AV_MEMCPY4 memcpy
#endif
typedef struct { typedef struct {
unsigned int size; unsigned int size;
unsigned int capacity; unsigned int capacity;
@ -58,7 +64,7 @@ AV_FORCE_INLINE void* aligned_vector_reserve(AlignedVector* vector, unsigned int
assert(vector->data); assert(vector->data);
if(original_data) { if(original_data) {
FASTCPY(vector->data, original_data, original_byte_size); AV_MEMCPY4(vector->data, original_data, original_byte_size);
free(original_data); free(original_data);
} }
@ -106,7 +112,7 @@ AV_FORCE_INLINE void* aligned_vector_push_back(AlignedVector* vector, const void
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 */
FASTCPY(dest, objs, vector->element_size * count); AV_MEMCPY4(dest, objs, vector->element_size * count);
return dest; return dest;
} }