X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Frenderer.cpp;h=94875084f65e2d7519be80e0bc76f5b06500f1b7;hb=1b7b75e3aaec35433cce81fc58e58e50e5a3f36e;hp=ee845e08b12d18d66c864cf936b3b48a8eae935f;hpb=92f87b75f96392c0f6b306a55738cdab413a7b92;p=libs%2Fgl.git

diff --git a/source/renderer.cpp b/source/renderer.cpp
index ee845e08..94875084 100644
--- a/source/renderer.cpp
+++ b/source/renderer.cpp
@@ -21,11 +21,14 @@ Renderer::Renderer(const Camera *c):
 	mtx_changed(false),
 	camera(c),
 	state_stack(1),
-	state(&state_stack.back()),
 	vertex_array(0),
 	vertex_array_changed(false),
 	element_buffer(0)
 {
+	state_stack.reserve(16);
+	shdata_stack.reserve(32);
+	state = &state_stack.back();
+
 	MatrixStack::modelview().push();
 	if(camera)
 	{
@@ -68,22 +71,21 @@ void Renderer::set_material(const Material *m)
 	state->material = m;
 }
 
-void Renderer::set_shader(const Program *p, const ProgramData *d)
+void Renderer::set_shader_program(const Program *p, const ProgramData *d)
 {
 	state->shprog = p;
-	if(d)
-		state->shdata.assign(1, d);
-	else
-		state->shdata.clear();
+	if(p && d)
+		add_shader_data(*d);
+
+	/* Even if we have no new shdata, the existing ones need to be re-applied
+	to the new program */
 	shdata_changed = true;
 }
 
-void Renderer::add_shader_data(const ProgramData *d)
+void Renderer::add_shader_data(const ProgramData &d)
 {
-	if(!state->shprog)
-		throw invalid_operation("Renderer::add_shader_data");
-
-	state->shdata.push_back(d);
+	shdata_stack.push_back(&d);
+	state->shdata_count = shdata_stack.size();
 	shdata_changed = true;
 }
 
@@ -117,6 +119,8 @@ void Renderer::pop_state()
 
 	state_stack.pop_back();
 	state = &state_stack.back();
+	if(shdata_stack.size()>state->shdata_count)
+		shdata_stack.erase(shdata_stack.begin()+state->shdata_count, shdata_stack.end());
 	mtx_stack.pop();
 	mtx_changed = true;
 	shdata_changed = true;
@@ -175,7 +179,7 @@ void Renderer::apply_state()
 		state->shprog->bind();
 		if(shdata_changed)
 		{
-			for(vector<const ProgramData *>::const_iterator i=state->shdata.begin(); i!=state->shdata.end(); ++i)
+			for(vector<const ProgramData *>::const_iterator i=shdata_stack.begin(); i!=shdata_stack.end(); ++i)
 				(*i)->apply();
 			shdata_changed = false;
 		}