diff --git a/src/hardware/hw_cache.c b/src/hardware/hw_cache.c index ee2f13459..90e666745 100644 --- a/src/hardware/hw_cache.c +++ b/src/hardware/hw_cache.c @@ -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; } diff --git a/src/hardware/r_opengl/r_opengl.c b/src/hardware/r_opengl/r_opengl.c index c69d8c1b1..341a1b9fc 100644 --- a/src/hardware/r_opengl/r_opengl.c +++ b/src/hardware/r_opengl/r_opengl.c @@ -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