summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2011-08-20 16:06:34 -0700
committerIan Romanick <ian.d.romanick@intel.com>2011-10-07 16:39:51 -0700
commit77d67a44cc9788072090e3f1000cfe1cec0a6807 (patch)
tree7747ad83dda54f7191d1f13d550f5180d63da8ce
parent5a4279f80d80fd30452ee6cc7cdfaffb12b1d605 (diff)
mesa: Simplify destroy_shader_program_variants_cb after previous refactors
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
-rw-r--r--src/mesa/state_tracker/st_program.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c
index 4162bb99abf..acd3b56b905 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: