From: Ian Romanick <ian.d.romanick@intel.com>
Date: Sat, 20 Aug 2011 23:06:34 +0000 (-0700)
Subject: mesa: Simplify destroy_shader_program_variants_cb after previous refactors
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=77d67a44cc9788072090e3f1000cfe1cec0a6807;p=mesa.git

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>
---

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: