zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-26 11:40:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Switch palookup memory allocation to Xalligned_alloc and fix what looks like a botched preprocessor condition

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6438 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2017-09-19 19:10:19 +00:00
parent c7d2f0b869
commit 29fc836bb1
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/build/src/engine.cpp
View file

@ -7806,7 +7806,7 @@ void uninitengine(void)
if (i==0 || palookup[i] != palookup[0]) if (i==0 || palookup[i] != palookup[0])
{ {
// Take care of handling aliased ^^^ cases! // Take care of handling aliased ^^^ cases!
Bfree(palookup[i]); Baligned_free(palookup[i]);
} }
Bmemset(palookup, 0, sizeof(palookup)); Bmemset(palookup, 0, sizeof(palookup));

11
source/build/src/palette.cpp
View file

@ -87,14 +87,11 @@ void setup_blend(int32_t blend, int32_t doreverse)
static void alloc_palookup(int32_t pal) static void alloc_palookup(int32_t pal)
{ {
#if defined ENGINE_USING_A_C || (defined CLASSIC_NONPOW2_YSIZE_WALLS && defined CLASSIC_NONPOW2_YSIZE_SPRITES)
palookup[pal] = (char *) Xmalloc(numshades*256);
#else
// The asm functions vlineasm1, mvlineasm1 (maybe others?) access the next // The asm functions vlineasm1, mvlineasm1 (maybe others?) access the next
// palookup[...] shade entry for tilesizy==512 tiles. // palookup[...] shade entry for tilesizy==512 tiles.
// See DEBUG_TILESIZY_512 and the comment in a.nasm: vlineasm1. // See DEBUG_TILESIZY_512 and the comment in a.nasm: vlineasm1.
palookup[pal] = (char *) Xcalloc(numshades+1, 256); palookup[pal] = (char *) Xaligned_alloc(16, (numshades + 1) * 256);
#endif memset(palookup[pal], 0, (numshades + 1) * 256);
} }
static void maybe_alloc_palookup(int32_t palnum); static void maybe_alloc_palookup(int32_t palnum);
@ -518,12 +515,12 @@ void removepalookup(int32_t const palnum)
if (palookup[i] == palookup[palnum]) if (palookup[i] == palookup[palnum])
palookup[i] = NULL; palookup[i] = NULL;
DO_FREE_AND_NULL(palookup[palnum]); ALIGNED_FREE_AND_NULL(palookup[palnum]);
} }
else if (palookup[palnum] == palookup[0]) else if (palookup[palnum] == palookup[0])
palookup[palnum] = NULL; palookup[palnum] = NULL;
else else
DO_FREE_AND_NULL(palookup[palnum]); ALIGNED_FREE_AND_NULL(palookup[palnum]);
} }
// //