fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-06-12 09:38:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mesa: don't need to free textures, VBOs, etc. in _mesa_meta_free()

Browse source 
They're freed by the normal context deallocation code.
Fixes Blender crash, bug 24185.
This commit is contained in:
Brian Paul 2009-10-07 14:07:49 -06:00
parent 9fde81bb20
commit 7dd2c0afd6
1 changed files with 4 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/mesa/drivers/common/meta.c
View file

@ -238,34 +238,10 @@ _mesa_meta_init(GLcontext *ctx)
void
_mesa_meta_free(GLcontext *ctx)
{
struct gl_meta_state *meta = ctx->Meta;
if (_mesa_get_current_context()) {
/* if there's no current context, these textures, buffers, etc should
* still get freed by _mesa_free_context_data().
*/
_mesa_DeleteTextures(1, &meta->TempTex.TexObj);
/* glBlitFramebuffer */
_mesa_DeleteBuffersARB(1, & meta->Blit.VBO);
_mesa_DeleteVertexArraysAPPLE(1, &meta->Blit.ArrayObj);
_mesa_DeletePrograms(1, &meta->Blit.DepthFP);
/* glClear */
_mesa_DeleteBuffersARB(1, & meta->Clear.VBO);
_mesa_DeleteVertexArraysAPPLE(1, &meta->Clear.ArrayObj);
/* glCopyPixels */
_mesa_DeleteBuffersARB(1, & meta->CopyPix.VBO);
_mesa_DeleteVertexArraysAPPLE(1, &meta->CopyPix.ArrayObj);
/* glDrawPixels */
_mesa_DeleteVertexArraysAPPLE(1, &meta->DrawPix.ArrayObj);
_mesa_DeletePrograms(1, &meta->DrawPix.DepthFP);
_mesa_DeletePrograms(1, &meta->DrawPix.StencilFP);
}
/* Note: Any textures, VBOs, etc, that we allocate should get
* freed by the normal context destruction code. But this would be
* the place to free other meta data someday.
*/
_mesa_free(ctx->Meta);
ctx->Meta = NULL;
}