lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

something something memory leaks

This commit is contained in:
Jaime Passos 2019-06-28 19:43:37 -03:00
parent 8362710e50
commit afa6afa593
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/r_data.c
View File

@ -1916,7 +1916,7 @@ static UINT8 *PNG_RawConvert(UINT8 *png, UINT16 *w, UINT16 *h, size_t size)
return NULL; return NULL;
// Convert the image to 8bpp // Convert the image to 8bpp
flat = Z_Malloc(width * height, PU_STATIC, NULL); flat = Z_Malloc(width * height, PU_LEVEL, NULL);
memset(flat, TRANSPARENTPIXEL, width * height); memset(flat, TRANSPARENTPIXEL, width * height);
for (y = 0; y < height; y++) for (y = 0; y < height; y++)
{ {
@ -1944,7 +1944,7 @@ static UINT8 *PNG_GetAlphaMask(UINT8 *png, size_t size)
return NULL; return NULL;
// Convert the image to 8bpp // Convert the image to 8bpp
mask = Z_Malloc(width * height, PU_STATIC, NULL); mask = Z_Malloc(width * height, PU_LEVEL, NULL);
memset(mask, 0, width * height); memset(mask, 0, width * height);
for (y = 0; y < height; y++) for (y = 0; y < height; y++)
{ {

35
src/r_plane.c
View File

@ -714,8 +714,9 @@ void R_CheckFlatLength(size_t size)
} }
} }
static void R_GetPatchFlat(levelflat_t *levelflat, boolean leveltexture, boolean ispng) static UINT8 *R_GetPatchFlat(levelflat_t *levelflat, boolean leveltexture, boolean ispng)
{ {
UINT8 *flat;
textureflat_t *texflat = &texflats[levelflat->texturenum]; textureflat_t *texflat = &texflats[levelflat->texturenum];
patch_t *patch = NULL; patch_t *patch = NULL;
boolean texturechanged = (leveltexture ? (levelflat->texturenum != levelflat->lasttexturenum) : false); boolean texturechanged = (leveltexture ? (levelflat->texturenum != levelflat->lasttexturenum) : false);
@ -725,7 +726,7 @@ static void R_GetPatchFlat(levelflat_t *levelflat, boolean leveltexture, boolean
{ {
if (texflat != NULL && texflat->flat) if (texflat != NULL && texflat->flat)
{ {
ds_source = texflat->flat; flat = texflat->flat;
ds_flatwidth = texflat->width; ds_flatwidth = texflat->width;
ds_flatheight = texflat->height; ds_flatheight = texflat->height;
texturechanged = false; texturechanged = false;
@ -746,8 +747,11 @@ static void R_GetPatchFlat(levelflat_t *levelflat, boolean leveltexture, boolean
texflat->flat = Z_Malloc(ds_flatwidth * ds_flatheight, PU_LEVEL, NULL); texflat->flat = Z_Malloc(ds_flatwidth * ds_flatheight, PU_LEVEL, NULL);
memset(texflat->flat, TRANSPARENTPIXEL, ds_flatwidth * ds_flatheight); memset(texflat->flat, TRANSPARENTPIXEL, ds_flatwidth * ds_flatheight);
R_TextureToFlat(levelflat->texturenum, texflat->flat); R_TextureToFlat(levelflat->texturenum, texflat->flat);
flat = texflat->flat;
ds_source = texflat->flat; levelflat->flatpatch = flat;
levelflat->width = ds_flatwidth;
levelflat->height = ds_flatheight;
} }
else else
{ {
@ -761,7 +765,7 @@ static void R_GetPatchFlat(levelflat_t *levelflat, boolean leveltexture, boolean
if (levelflat->flatpatch == NULL) if (levelflat->flatpatch == NULL)
{ {
lumpnum_t redflr = W_CheckNumForName("REDFLR"); lumpnum_t redflr = W_CheckNumForName("REDFLR");
levelflat->flatpatch = (UINT8 *)W_CacheLumpNum(redflr, PU_STATIC); levelflat->flatpatch = (UINT8 *)W_CacheLumpNum(redflr, PU_CACHE);
R_CheckFlatLength(W_LumpLength(redflr)); R_CheckFlatLength(W_LumpLength(redflr));
R_CheckPowersOfTwo(); R_CheckPowersOfTwo();
} }
@ -785,12 +789,12 @@ static void R_GetPatchFlat(levelflat_t *levelflat, boolean leveltexture, boolean
memset(levelflat->flatpatch, TRANSPARENTPIXEL, ds_flatwidth * ds_flatheight); memset(levelflat->flatpatch, TRANSPARENTPIXEL, ds_flatwidth * ds_flatheight);
R_PatchToFlat(patch, levelflat->flatpatch); R_PatchToFlat(patch, levelflat->flatpatch);
} }
ds_source = levelflat->flatpatch; flat = levelflat->flatpatch;
} }
} }
else else
{ {
ds_source = levelflat->flatpatch; flat = levelflat->flatpatch;
ds_flatwidth = levelflat->width; ds_flatwidth = levelflat->width;
ds_flatheight = levelflat->height; ds_flatheight = levelflat->height;
@ -799,10 +803,12 @@ static void R_GetPatchFlat(levelflat_t *levelflat, boolean leveltexture, boolean
} }
levelflat->lasttexturenum = levelflat->texturenum; levelflat->lasttexturenum = levelflat->texturenum;
return flat;
} }
void R_DrawSinglePlane(visplane_t *pl) void R_DrawSinglePlane(visplane_t *pl)
{ {
UINT8 *flat;
INT32 light = 0; INT32 light = 0;
INT32 x; INT32 x;
INT32 stop, angle; INT32 stop, angle;
@ -960,16 +966,25 @@ void R_DrawSinglePlane(visplane_t *pl)
// Check if the flat is actually a wall texture. // Check if the flat is actually a wall texture.
if (levelflat->texturenum != 0 && levelflat->texturenum != -1) if (levelflat->texturenum != 0 && levelflat->texturenum != -1)
R_GetPatchFlat(levelflat, true, false); flat = R_GetPatchFlat(levelflat, true, false);
// Maybe it's just a patch, then? // Maybe it's just a patch, then?
else if (R_CheckIfPatch(levelflat->lumpnum)) else if (R_CheckIfPatch(levelflat->lumpnum))
R_GetPatchFlat(levelflat, false, false); flat = R_GetPatchFlat(levelflat, false, false);
// Maybe it's a PNG?! // Maybe it's a PNG?!
else if (R_IsLumpPNG(ds_source, size)) else if (R_IsLumpPNG(ds_source, size))
R_GetPatchFlat(levelflat, false, true); flat = R_GetPatchFlat(levelflat, false, true);
// It's a raw flat. // It's a raw flat.
else else
{
R_CheckFlatLength(size); R_CheckFlatLength(size);
flat = ds_source;
}
Z_ChangeTag(ds_source, PU_CACHE);
ds_source = flat;
if (ds_source == NULL)
return;
// Check if the flat has dimensions that are powers-of-two numbers. // Check if the flat has dimensions that are powers-of-two numbers.
if (R_CheckPowersOfTwo()) if (R_CheckPowersOfTwo())
@ -1202,8 +1217,6 @@ using the palette colors.
} }
} }
#endif #endif
Z_ChangeTag(ds_source, PU_CACHE);
} }
void R_PlaneBounds(visplane_t *plane) void R_PlaneBounds(visplane_t *plane)