OpenGL: add a little more checks during texture free
prob not necessary but feels better
This commit is contained in:
1 parent
d2d3afc7f4
commit
310e64d8be
2 files changed
+13
-4
No files matched your search
+10
-2
@@ -580,6 +580,9 @@ void HWR_InitMapTextures(void)
|
||||
|
||||
static void FreeMapTexture(GLMapTexture_t *tex)
|
||||
{
|
||||
if (!tex)
|
||||
return;
|
||||
|
||||
GL_DeleteTexture(&tex->mipmap);
|
||||
Z_Free(tex->mipmap.data);
|
||||
tex->mipmap.data = NULL;
|
||||
@@ -589,6 +592,12 @@ void HWR_FreeMapTextures(void)
|
||||
{
|
||||
size_t i;
|
||||
|
||||
if (!gl_textures)
|
||||
{
|
||||
gl_numtextures = 0;
|
||||
return;
|
||||
}
|
||||
|
||||
for (i = 0; i < gl_numtextures; i++)
|
||||
{
|
||||
FreeMapTexture(&gl_textures[i].normal);
|
||||
@@ -599,8 +608,7 @@ void HWR_FreeMapTextures(void)
|
||||
|
||||
// now the heap don't have any 'user' pointing to our
|
||||
// texturecache info, we can free it
|
||||
if (gl_textures)
|
||||
free(gl_textures);
|
||||
free(gl_textures);
|
||||
gl_textures = NULL;
|
||||
gl_numtextures = 0;
|
||||
}
|
||||
|
||||
@@ -1361,7 +1361,8 @@ void GL_Flush(void)
|
||||
TexCacheTail = TexCacheHead = NULL; //Hurdler: well, TexCacheHead is already NULL
|
||||
tex_downloaded = 0;
|
||||
|
||||
free(textureBuffer);
|
||||
if (textureBuffer)
|
||||
free(textureBuffer);
|
||||
textureBuffer = NULL;
|
||||
textureBufferSize = 0;
|
||||
}
|
||||
@@ -3301,8 +3302,8 @@ void GL_Framebuffer_Disable(void)
|
||||
// delet our fbo
|
||||
if (framebufferobject.fboobj)
|
||||
pglDeleteFramebuffers(1, &framebufferobject.fboobj);
|
||||
|
||||
framebufferobject.fboobj = 0;
|
||||
|
||||
GL_Framebuffer_DeleteAttachments();
|
||||
}
|
||||
#endif
|
||||
|
||||
Reference in new issue
Block a user