stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-24 13:21:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Prevent a memory leak

Browse source
This commit is contained in:
Lactozilla 2024-06-03 13:29:49 -03:00
parent 16560653a0
commit d0b420c760
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/hardware/hw_cache.c
View file

@ -675,25 +675,24 @@ void HWR_InitMapTextures(void)
gl_maptexturesloaded = false; gl_maptexturesloaded = false;
} }
static void DeleteTextureMipmap(GLMipmap_t *grMipmap) static void DeleteTextureMipmap(GLMipmap_t *grMipmap, boolean delete_mipmap)
{ {
HWD.pfnDeleteTexture(grMipmap); HWD.pfnDeleteTexture(grMipmap);
// Chroma-keyed textures do not own their texture data, so do not free it if (delete_mipmap)
if (!(grMipmap->flags & TF_CHROMAKEYED))
Z_Free(grMipmap->data); Z_Free(grMipmap->data);
} }
static void FreeMapTexture(GLMapTexture_t *tex) static void FreeMapTexture(GLMapTexture_t *tex, boolean delete_chromakeys)
{ {
if (tex->mipmap.nextcolormap) if (tex->mipmap.nextcolormap)
{ {
DeleteTextureMipmap(tex->mipmap.nextcolormap); DeleteTextureMipmap(tex->mipmap.nextcolormap, delete_chromakeys);
free(tex->mipmap.nextcolormap); free(tex->mipmap.nextcolormap);
tex->mipmap.nextcolormap = NULL; tex->mipmap.nextcolormap = NULL;
} }
DeleteTextureMipmap(&tex->mipmap); DeleteTextureMipmap(&tex->mipmap, true);
} }
void HWR_FreeMapTextures(void) void HWR_FreeMapTextures(void)
@ -702,8 +701,8 @@ void HWR_FreeMapTextures(void)
for (i = 0; i < gl_numtextures; i++) for (i = 0; i < gl_numtextures; i++)
{ {
FreeMapTexture(&gl_textures[i]); FreeMapTexture(&gl_textures[i], true);
FreeMapTexture(&gl_flats[i]); FreeMapTexture(&gl_flats[i], false);
} }
// now the heap don't have any 'user' pointing to our // now the heap don't have any 'user' pointing to our
@ -777,7 +776,7 @@ GLMapTexture_t *HWR_GetTexture(INT32 tex, boolean chromakeyed)
originalMipmap->nextcolormap = newMipmap; originalMipmap->nextcolormap = newMipmap;
} }
// Upload and bind the variant texture instead of the original one // Generate, upload and bind the variant texture instead of the original one
grMipmap = originalMipmap->nextcolormap; grMipmap = originalMipmap->nextcolormap;
} }