X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Frender%2Frenderer.cpp;h=4acf3deda9dded4cabc903e5bfc42d718f0c2f3d;hb=9b3bce7ae76ff8c0c81315d2505ea96bf422a318;hp=d86b78046eb24454f954155f687d0c2ec9c710c0;hpb=a482029babea3210840d8c62e9df9ece4342b2b9;p=libs%2Fgl.git

diff --git a/source/render/renderer.cpp b/source/render/renderer.cpp
index d86b7804..4acf3ded 100644
--- a/source/render/renderer.cpp
+++ b/source/render/renderer.cpp
@@ -10,9 +10,9 @@
 #include "programdata.h"
 #include "renderable.h"
 #include "renderer.h"
+#include "resourcemanager.h"
 #include "sampler.h"
 #include "texture.h"
-#include "texunit.h"
 #include "vertexarray.h"
 #include "vertexsetup.h"
 #include "windingtest.h"
@@ -57,6 +57,10 @@ void Renderer::transform(const Matrix &matrix)
 
 void Renderer::set_texture(Tag tag, const Texture *tex, const Sampler *samp)
 {
+	if(tex)
+		if(ResourceManager *res_mgr = tex->get_manager())
+			res_mgr->resource_used(*tex);
+
 	if(texture_stack.size()>state->texture_count)
 	{
 		BoundTexture &bt = texture_stack[state->texture_count];
@@ -86,17 +90,9 @@ void Renderer::set_texture(Tag tag, const Texture *tex, const Sampler *samp)
 
 void Renderer::flush_textures()
 {
-	for(unsigned i=0; i<texture_stack.size(); ++i)
-	{
-		BoundTexture &bt = texture_stack[i];
-		if(i>=state->texture_count && bt.unit>=0)
-		{
-			Texture::unbind_from(bt.unit);
-			Sampler::unbind_from(bt.unit);
-		}
-		else if(bt.replaced>=static_cast<int>(state->texture_count))
-			bt.replaced = -1;
-	}
+	for(unsigned i=0; i<state->texture_count; ++i)
+		if(texture_stack[i].replaced>=static_cast<int>(state->texture_count))
+			texture_stack[i].replaced = -1;
 
 	texture_stack.erase(texture_stack.begin()+state->texture_count, texture_stack.end());
 }
@@ -194,19 +190,10 @@ void Renderer::end()
 
 	*state = State();
 	shdata_stack.clear();
+	add_shader_data(standard_shdata);
 	excluded.clear();
 
-	for(vector<BoundTexture>::iterator i=texture_stack.begin(); i!=texture_stack.end(); ++i)
-		if(i->unit>=0)
-		{
-			Texture::unbind_from(i->unit);
-			Sampler::unbind_from(i->unit);
-		}
-	Clipping::unbind();
-	Program::unbind();
-	VertexSetup::unbind();
-	Buffer::unbind_from(ELEMENT_ARRAY_BUFFER);
-	WindingTest::unbind();
+	PipelineState::clear();
 }
 
 void Renderer::exclude(const Renderable &renderable)
@@ -244,40 +231,38 @@ void Renderer::apply_state()
 	if(!state->shprog)
 		throw invalid_operation("Renderer::apply_state");
 
-	/* We (mostly) let the objects themselves figure out if the binding has
-	changed */
+	if(changed&MATRIX)
+	{
+		standard_shdata.uniform("world_obj_matrix", state->model_matrix);
+		LinAl::SquareMatrix<float, 3> nm = state->model_matrix.block<3, 3>(0, 0);
+		nm = transpose(invert(nm));
+		standard_shdata.uniform("world_obj_normal_matrix", nm);
+		changed &= ~MATRIX;
+	}
 
-	if(state->texture_count<texture_stack.size())
-		flush_textures();
+	bool shprog_changed = (state->shprog!=pipeline_state.get_shader_program());
+	pipeline_state.set_shader_program(state->shprog);
 
-	for(vector<BoundTexture>::const_iterator i=texture_stack.begin(); i!=texture_stack.end(); ++i)
+	if(state->vertex_setup)
 	{
-		int unit = state->shprog->get_uniform_binding(i->tag);
-		if(unit>=0)
-		{
-			if(i->texture)
-				i->texture->bind_to(unit);
-			if(i->sampler)
-				i->sampler->bind_to(unit);
-			i->unit = unit;
-		}
+		if(const VertexArray *array = state->vertex_setup->get_vertex_array())
+			array->refresh();
+		if(const VertexArray *array = state->vertex_setup->get_instance_array())
+			array->refresh();
 	}
+	pipeline_state.set_vertex_setup(state->vertex_setup);
 
-	if(state->clipping)
-		state->clipping->bind();
-	else
-		Clipping::unbind();
+	pipeline_state.set_winding_test((state->winding_test && state->reverse_winding) ? &state->winding_test->get_reverse() : state->winding_test);
+	pipeline_state.set_enabled_clip_planes(state->clipping ? (1<<state->clipping->get_n_planes())-1 : 0);
 
-	bool shprog_changed = (state->shprog!=Program::current());
-	state->shprog->bind();
+	if(state->texture_count<texture_stack.size())
+		flush_textures();
 
-	if(changed&MATRIX)
+	for(vector<BoundTexture>::const_iterator i=texture_stack.begin(); i!=texture_stack.end(); ++i)
 	{
-		standard_shdata.uniform("world_obj_matrix", state->model_matrix);
-		LinAl::SquareMatrix<float, 3> nm = state->model_matrix.block<3, 3>(0, 0);
-		nm = transpose(invert(nm));
-		standard_shdata.uniform("world_obj_normal_matrix", nm);
-		changed &= ~MATRIX;
+		int unit = (i->tag.id ? state->shprog->get_uniform_binding(i->tag) : i->unit);
+		if(unit>=0)
+			pipeline_state.set_texture(unit, i->texture, i->sampler);
 	}
 
 	bool shdata_changed = changed&SHADER_DATA;
@@ -291,26 +276,13 @@ void Renderer::apply_state()
 			shdata_stack.erase(shdata_stack.begin()+state->shdata_count, shdata_stack.end());
 		for(vector<BoundProgramData>::const_iterator i=shdata_stack.begin(); i!=shdata_stack.end(); ++i)
 		{
-			i->shdata->apply();
+			i->shdata->apply(*state->shprog, pipeline_state);
 			i->generation = i->shdata->get_generation();
 		}
 		changed &= ~SHADER_DATA;
 	}
 
-	if(state->vertex_setup)
-		state->vertex_setup->bind();
-	else
-		VertexSetup::unbind();
-
-	if(state->winding_test)
-	{
-		if(state->reverse_winding)
-			state->winding_test->get_reverse().bind();
-		else
-			state->winding_test->bind();
-	}
-	else
-		WindingTest::unbind();
+	pipeline_state.apply();
 }