X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frenderer.cpp;h=ee845e08b12d18d66c864cf936b3b48a8eae935f;hb=ac11296dca7c7a594ff1b20bead87e1e161b4bef;hp=03042e67c12f80ac95904ca4c66e8f4e80e6baee;hpb=2e7f19b895424c3a77940e648639f8df2b395d0f;p=libs%2Fgl.git

diff --git a/source/renderer.cpp b/source/renderer.cpp
index 03042e67..ee845e08 100644
--- a/source/renderer.cpp
+++ b/source/renderer.cpp
@@ -75,6 +75,7 @@ void Renderer::set_shader(const Program *p, const ProgramData *d)
 		state->shdata.assign(1, d);
 	else
 		state->shdata.clear();
+	shdata_changed = true;
 }
 
 void Renderer::add_shader_data(const ProgramData *d)
@@ -83,6 +84,7 @@ void Renderer::add_shader_data(const ProgramData *d)
 		throw invalid_operation("Renderer::add_shader_data");
 
 	state->shdata.push_back(d);
+	shdata_changed = true;
 }
 
 void Renderer::set_vertex_array(const VertexArray *a)
@@ -117,6 +119,7 @@ void Renderer::pop_state()
 	state = &state_stack.back();
 	mtx_stack.pop();
 	mtx_changed = true;
+	shdata_changed = true;
 }
 
 void Renderer::escape()
@@ -170,8 +173,12 @@ void Renderer::apply_state()
 	if(state->shprog)
 	{
 		state->shprog->bind();
-		for(vector<const ProgramData *>::const_iterator i=state->shdata.begin(); i!=state->shdata.end(); ++i)
-			(*i)->apply();
+		if(shdata_changed)
+		{
+			for(vector<const ProgramData *>::const_iterator i=state->shdata.begin(); i!=state->shdata.end(); ++i)
+				(*i)->apply();
+			shdata_changed = false;
+		}
 	}
 	else
 		Program::unbind();