Mesa (master): mesa: Simplify destroy_shader_program_variants_cb after previous refactors

Ian Romanick idr at kemper.freedesktop.org
Fri Oct 7 16:41:06 PDT 2011


Module: Mesa
Branch: master
Commit: 77d67a44cc9788072090e3f1000cfe1cec0a6807
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=77d67a44cc9788072090e3f1000cfe1cec0a6807

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Sat Aug 20 16:06:34 2011 -0700

mesa: Simplify destroy_shader_program_variants_cb after previous refactors

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Brian Paul <brianp at vmware.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

 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:



More information about the mesa-commit mailing list