X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frenderer.cpp;h=ee845e08b12d18d66c864cf936b3b48a8eae935f;hb=ab83db6f1e31d44ced585119a57fd10896e469cb;hp=46df5bf52777564ea62b9d995693c57f7e0d5fa9;hpb=ccbcce1d5c7fae8ec644e465ac936f5c39000e57;p=libs%2Fgl.git

diff --git a/source/renderer.cpp b/source/renderer.cpp
index 46df5bf5..ee845e08 100644
--- a/source/renderer.cpp
+++ b/source/renderer.cpp
@@ -1,14 +1,7 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2011  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#include <msp/core/except.h>
 #include "batch.h"
 #include "buffer.h"
 #include "camera.h"
+#include "error.h"
 #include "material.h"
 #include "program.h"
 #include "programdata.h"
@@ -82,14 +75,16 @@ 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)
 {
 	if(!state->shprog)
-		throw InvalidState("No shader program");
+		throw invalid_operation("Renderer::add_shader_data");
 
 	state->shdata.push_back(d);
+	shdata_changed = true;
 }
 
 void Renderer::set_vertex_array(const VertexArray *a)
@@ -118,12 +113,13 @@ void Renderer::push_state()
 void Renderer::pop_state()
 {
 	if(state_stack.size()==1)
-		throw InvalidState("Can't pop the last state");
+		throw stack_underflow("Renderer::pop_state");
 
 	state_stack.pop_back();
 	state = &state_stack.back();
 	mtx_stack.pop();
 	mtx_changed = true;
+	shdata_changed = true;
 }
 
 void Renderer::escape()
@@ -135,7 +131,7 @@ void Renderer::escape()
 void Renderer::draw(const Batch &batch)
 {
 	if(!vertex_array)
-		throw InvalidState("Can't draw without a vertex array");
+		throw invalid_operation("Renderer::draw");
 
 	apply_state();
 
@@ -177,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();