[Mesa-dev] [PATCH 5/9] mesa: Simplify destroy_shader_program_variants_cb after previous refactors

Ian Romanick idr at freedesktop.org
Tue Oct 4 13:44:08 PDT 2011


From: Ian Romanick <ian.d.romanick at intel.com>

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
---
 src/mesa/state_tracker/st_program.c |    9 +++------
 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 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:
-- 
1.7.6



More information about the mesa-dev mailing list