Rebind GL uniforms only when the shader binding or uniforms change.

Author: slembcke

cocos2d/CCNoARC.m

@@ -200,14 +200,15 @@ -(void)transitionRenderer:(CCRenderer *)renderer FromState:(CCRenderState *)prev
 	}
 
 	// Bind the shader.
-	if(previous == nil || _shader != previous->_shader){
+	BOOL bindShader = (previous == nil || _shader != previous->_shader);
+	if(bindShader){
 		CCGL_DEBUG_INSERT_EVENT_MARKER("Shader");
 
 		glUseProgram(_shader->_program);
 	}
 
 	// Set the shader's uniform state.
-	if(previous == nil || _shaderUniforms != previous->_shaderUniforms){
+	if(bindShader || _shaderUniforms != previous->_shaderUniforms){
 		CCGL_DEBUG_INSERT_EVENT_MARKER("Uniforms");
 
 		NSDictionary *globalShaderUniforms = renderer->_globalShaderUniforms;