commit b44304efdee562b294e542ea0e47d6c758816ee8
author Brian Paul <brianp@vmware.com> Tue Oct 27 20:09:33 2009 -0600
committer Brian Paul <brianp@vmware.com> Tue Oct 27 20:10:59 2009 -0600
tree 95ce53a5322eaf28c154d05bdb0e7a05db2ae267
parent 2947d1420270476730711892909c3683bb6c5bff

glsl: avoid redundant state changes in _mesa_use_program()

src/mesa/shader/shader_api.c

diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index 30fa58e..453cd39 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -1547,8 +1547,6 @@
       return;
    }
 
-   FLUSH_VERTICES(ctx, _NEW_PROGRAM | _NEW_PROGRAM_CONSTANTS);
-
    if (program) {
       shProg = _mesa_lookup_shader_program_err(ctx, program, "glUseProgram");
       if (!shProg) {
@@ -1569,7 +1567,10 @@
       shProg = NULL;
    }
 
-   _mesa_reference_shader_program(ctx, &ctx->Shader.CurrentProgram, shProg);
+   if (ctx->Shader.CurrentProgram != shProg) {
+      FLUSH_VERTICES(ctx, _NEW_PROGRAM | _NEW_PROGRAM_CONSTANTS);
+      _mesa_reference_shader_program(ctx, &ctx->Shader.CurrentProgram, shProg);
+   }
 }