diff options
Diffstat (limited to 'src/mesa/main/context.c')
| -rw-r--r-- | src/mesa/main/context.c | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index e3096b5f96..69c361f63e 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -444,6 +444,7 @@ alloc_shared_state( GLcontext *ctx ) ss->ArrayObjects = _mesa_NewHashTable(); #if FEATURE_ARB_shader_objects + ss->ShaderProgramObjects = _mesa_NewHashTable(); ss->ShaderObjects = _mesa_NewHashTable(); #endif @@ -523,6 +524,8 @@ cleanup: _mesa_DeleteHashTable (ss->ArrayObjects); #if FEATURE_ARB_shader_objects + if (ss->ShaderProgramObjects) + _mesa_DeleteHashTable (ss->ShaderProgramObjects); if (ss->ShaderObjects) _mesa_DeleteHashTable (ss->ShaderObjects); #endif @@ -631,14 +634,17 @@ delete_shader_cb(GLuint id, void *data, void *userData) { GLcontext *ctx = (GLcontext *) userData; struct gl_shader *sh = (struct gl_shader *) data; - if (sh->Type == GL_FRAGMENT_SHADER || sh->Type == GL_VERTEX_SHADER) { - _mesa_free_shader(ctx, sh); - } - else { - struct gl_shader_program *shProg = (struct gl_shader_program *) data; - ASSERT(shProg->Type == GL_SHADER_PROGRAM_MESA); - _mesa_free_shader_program(ctx, shProg); - } + assert(sh->Type == GL_FRAGMENT_SHADER || sh->Type == GL_VERTEX_SHADER); + _mesa_free_shader(ctx, sh); +} + +static void +delete_shader_program_cb(GLuint id, void *data, void *userData) +{ + GLcontext *ctx = (GLcontext *) userData; + struct gl_shader_program *shProg = (struct gl_shader_program *) data; + assert(shProg->Type == GL_SHADER_PROGRAM_MESA); + _mesa_free_shader_program(ctx, shProg); } /** @@ -721,6 +727,8 @@ free_shared_state( GLcontext *ctx, struct gl_shared_state *ss ) _mesa_DeleteHashTable(ss->ArrayObjects); #if FEATURE_ARB_shader_objects + _mesa_HashDeleteAll(ss->ShaderProgramObjects, delete_shader_program_cb, ctx); + _mesa_DeleteHashTable(ss->ShaderProgramObjects); _mesa_HashDeleteAll(ss->ShaderObjects, delete_shader_cb, ctx); _mesa_DeleteHashTable(ss->ShaderObjects); #endif |