X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frenderer.cpp;h=c213f0a987218f579fbc4991fc6722bece0e083a;hb=ff458d6c6118f3864a7b8494a06472d8b0ebe06a;hp=c3a6923f17338cb51d4221f02f6aa158e07fa0fe;hpb=63317e423282c1d8a7965743b20a9059a8086e67;p=libs%2Fgl.git

diff --git a/source/renderer.cpp b/source/renderer.cpp
index c3a6923f..c213f0a9 100644
--- a/source/renderer.cpp
+++ b/source/renderer.cpp
@@ -14,6 +14,7 @@
 #include "texturing.h"
 #include "texunit.h"
 #include "vertexarray.h"
+#include "vertexsetup.h"
 #include "windingtest.h"
 
 using namespace std;
@@ -22,9 +23,9 @@ namespace Msp {
 namespace GL {
 
 Renderer::Renderer(const Camera *c):
+	default_camera(c),
 	changed(0),
 	matrices_loaded(false),
-	shdata_applied(0),
 	state_stack(1)
 {
 	state_stack.reserve(16);
@@ -125,9 +126,16 @@ void Renderer::set_shader_program(const Program *p, const ProgramData *d)
 
 void Renderer::add_shader_data(const ProgramData &d)
 {
-	shdata_stack.push_back(&d);
-	state->shdata_count = shdata_stack.size();
-	changed |= SHADER_DATA;
+	if(state->shdata_count<shdata_stack.size() && shdata_stack[state->shdata_count]==&d)
+		++state->shdata_count;
+	else
+	{
+		if(shdata_stack.size()>state->shdata_count)
+			shdata_stack.erase(shdata_stack.begin()+state->shdata_count, shdata_stack.end());
+		shdata_stack.push_back(&d);
+		state->shdata_count = shdata_stack.size();
+		changed |= SHADER_DATA;
+	}
 }
 
 void Renderer::set_mesh(const Mesh *m)
@@ -135,6 +143,11 @@ void Renderer::set_mesh(const Mesh *m)
 	state->mesh = m;
 }
 
+void Renderer::set_vertex_setup(const VertexSetup *vs)
+{
+	state->vertex_setup = vs;
+}
+
 void Renderer::set_winding_test(const WindingTest *w)
 {
 	state->winding_test = w;
@@ -161,12 +174,6 @@ void Renderer::pop_state()
 	const Clipping *old_clipping = state->clipping;
 	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());
-		changed |= SHADER_DATA;
-	}
-	shdata_applied = min<unsigned>(shdata_applied, shdata_stack.size());
 	changed |= MATRIX;
 	bool camera_changed = (state->camera!=old_camera);
 	if(camera_changed)
@@ -206,6 +213,10 @@ void Renderer::end()
 		throw invalid_operation("Renderer::end");
 
 	*state = State();
+	if(default_camera)
+		set_camera(*default_camera);
+	else
+		standard_shdata.uniform("projection_matrix", Matrix());
 	shdata_stack.clear();
 	excluded.clear();
 
@@ -216,6 +227,7 @@ void Renderer::end()
 	Lighting::unbind();
 	Clipping::unbind();
 	Program::unbind();
+	VertexSetup::unbind();
 	Buffer::unbind_from(ELEMENT_ARRAY_BUFFER);
 	WindingTest::unbind();
 
@@ -265,14 +277,15 @@ void Renderer::apply_state()
 	changed */
 
 	bool legacy_bindings = (!state->shprog || state->shprog->uses_legacy_variables());
+	bool legacy_textures = !state->shprog;
 
 	if(state->texturing)
-		state->texturing->bind();
+		state->texturing->bind(legacy_textures);
 	else
 	{
 		Texturing::unbind();
 		if(state->texture)
-			state->texture->bind_to(0);
+			state->texture->bind_to(0, legacy_textures);
 		else
 			Texture::unbind_from(0);
 	}
@@ -343,15 +356,15 @@ void Renderer::apply_state()
 			}
 		}
 
-		if((changed&SHADER_DATA) || shprog_changed)
+		bool extra_shdata = (shdata_stack.size()>state->shdata_count);
+
+		if((changed&SHADER_DATA) || shprog_changed || extra_shdata)
 		{
-			vector<const ProgramData *>::const_iterator i = shdata_stack.begin();
-			if(!shprog_changed)
-				i += shdata_applied;
-			for(; i!=shdata_stack.end(); ++i)
+			if(extra_shdata)
+				shdata_stack.erase(shdata_stack.begin()+state->shdata_count, shdata_stack.end());
+			for(vector<const ProgramData *>::const_iterator i=shdata_stack.begin(); i!=shdata_stack.end(); ++i)
 				(*i)->apply();
 			changed &= ~SHADER_DATA;
-			shdata_applied = shdata_stack.size();
 		}
 	}
 	else
@@ -368,8 +381,15 @@ void Renderer::apply_state()
 			state->mesh->bind();
 	}
 	else
+	{
 		Mesh::unbind();
 
+		if(state->vertex_setup)
+			state->vertex_setup->bind();
+		else
+			VertexSetup::unbind();
+	}
+
 	if(state->winding_test)
 	{
 		if(state->reverse_winding)
@@ -415,6 +435,7 @@ Renderer::State::State():
 	shprog(0),
 	shdata_count(0),
 	mesh(0),
+	vertex_setup(0),
 	winding_test(0),
 	reverse_winding(false)
 { }