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

mesa: free shader program data before deleting shader objects.

Browse source 
Picked from master.
Fixes mem corruption seen when glean/api2 test exits.
This commit is contained in:
Brian Paul 2008-05-07 08:56:08 -06:00
parent a56a59ce74
commit 3e1a4c2869
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/mesa/main/context.c
View file

@ -630,6 +630,21 @@ delete_arrayobj_cb(GLuint id, void *data, void *userData)
_mesa_delete_array_object(ctx, arrayObj);
}
/**
* Callback for freeing shader program data. Call it before delete_shader_cb
* to avoid memory access error.
*/
static void
free_shader_program_data_cb(GLuint id, void *data, void *userData)
{
GLcontext *ctx = (GLcontext *) userData;
struct gl_shader_program *shProg = (struct gl_shader_program *) data;
if (shProg->Type == GL_SHADER_PROGRAM_MESA) {
_mesa_free_shader_program_data(ctx, shProg);
}
}
/**
* Callback for deleting shader and shader programs objects.
* Called by _mesa_HashDeleteAll().
@ -714,6 +729,7 @@ free_shared_state( GLcontext *ctx, struct gl_shared_state *ss )
_mesa_DeleteHashTable(ss->ArrayObjects);
#if FEATURE_ARB_shader_objects
_mesa_HashWalk(ss->ShaderObjects, free_shader_program_data_cb, ctx);
_mesa_HashDeleteAll(ss->ShaderObjects, delete_shader_cb, ctx);
_mesa_DeleteHashTable(ss->ShaderObjects);
#endif