UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Review custom allocators

Browse source
This commit is contained in:
raysan5 2020-01-19 11:23:38 +01:00
parent fe0d04c879
commit bec467705e
4 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/raylib.h
View file

@ -106,6 +106,9 @@
#ifndef RL_CALLOC #ifndef RL_CALLOC
#define RL_CALLOC(n,sz) calloc(n,sz) #define RL_CALLOC(n,sz) calloc(n,sz)
#endif #endif
#ifndef RL_REALLOC
#define RL_REALLOC(n,sz) realloc(n,sz)
#endif
#ifndef RL_FREE #ifndef RL_FREE
#define RL_FREE(p) free(p) #define RL_FREE(p) free(p)
#endif #endif

5
src/rlgl.h
View file

@ -82,6 +82,9 @@
#ifndef RL_CALLOC #ifndef RL_CALLOC
#define RL_CALLOC(n,sz) calloc(n,sz) #define RL_CALLOC(n,sz) calloc(n,sz)
#endif #endif
#ifndef RL_REALLOC
#define RL_REALLOC(n,sz) realloc(n,sz)
#endif
#ifndef RL_FREE #ifndef RL_FREE
#define RL_FREE(p) free(p) #define RL_FREE(p) free(p)
#endif #endif
@ -4482,7 +4485,7 @@ static int GenerateMipmaps(unsigned char *data, int baseWidth, int baseHeight)
TraceLog(LOG_DEBUG, "Total mipmaps required: %i", mipmapCount); TraceLog(LOG_DEBUG, "Total mipmaps required: %i", mipmapCount);
TraceLog(LOG_DEBUG, "Total size of data required: %i", size); TraceLog(LOG_DEBUG, "Total size of data required: %i", size);
unsigned char *temp = realloc(data, size); unsigned char *temp = RL_REALLOC(data, size);
if (temp != NULL) data = temp; if (temp != NULL) data = temp;
else TraceLog(LOG_WARNING, "Mipmaps required memory could not be allocated"); else TraceLog(LOG_WARNING, "Mipmaps required memory could not be allocated");

2
src/text.c
View file

@ -1431,7 +1431,7 @@ char *TextToUtf8(int *codepoints, int length)
} }
// Resize memory to text length + string NULL terminator // Resize memory to text length + string NULL terminator
text = realloc(text, size + 1); text = RL_REALLOC(text, size + 1);
return text; return text;
} }

4
src/textures.c
View file

@ -115,7 +115,7 @@
#define STBI_MALLOC RL_MALLOC #define STBI_MALLOC RL_MALLOC
#define STBI_FREE RL_FREE #define STBI_FREE RL_FREE
#define STBI_REALLOC(p,newsz) realloc(p,newsz) #define STBI_REALLOC RL_REALLOC
#define STB_IMAGE_IMPLEMENTATION #define STB_IMAGE_IMPLEMENTATION
#include "external/stb_image.h" // Required for: stbi_load_from_file() #include "external/stb_image.h" // Required for: stbi_load_from_file()
@ -1604,7 +1604,7 @@ void ImageMipmaps(Image *image)
if (image->mipmaps < mipCount) if (image->mipmaps < mipCount)
{ {
void *temp = realloc(image->data, mipSize); void *temp = RL_REALLOC(image->data, mipSize);
if (temp != NULL) if (temp != NULL)
{ {