From 77d67a44cc9788072090e3f1000cfe1cec0a6807 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Sat, 20 Aug 2011 16:06:34 -0700 Subject: [PATCH] mesa: Simplify destroy_shader_program_variants_cb after previous refactors Signed-off-by: Ian Romanick Reviewed-by: Brian Paul Reviewed-by: Kenneth Graunke --- src/mesa/state_tracker/st_program.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c index 4162bb9..acd3b56 100644 --- a/src/mesa/state_tracker/st_program.c +++ b/src/mesa/state_tracker/st_program.c @@ -1153,12 +1153,9 @@ destroy_shader_program_variants_cb(GLuint key, void *data, void *userData) destroy_program_variants(st, shProg->Shaders[i]->Program); } - destroy_program_variants(st, - shProg->_LinkedShaders[MESA_SHADER_VERTEX]->Program); - destroy_program_variants(st, - shProg->_LinkedShaders[MESA_SHADER_FRAGMENT]->Program); - destroy_program_variants(st, - shProg->_LinkedShaders[MESA_SHADER_GEOMETRY]->Program); + for (i = 0; i < Elements(shProg->_LinkedShaders); i++) { + destroy_program_variants(st, shProg->_LinkedShaders[i]->Program); + } } break; case GL_VERTEX_SHADER: -- 2.7.4