X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Frenderer.cpp;h=6bbfbbe0d0785628b89d1ec7c84608b2f0905b93;hb=274b6fb1b02692cc422bad9040d1abe5d545505a;hp=0c5bf77454ed25c32151f2a44ed189723234a192;hpb=016f0f0dd51511f98d0bf398d99199d7dec1543c;p=libs%2Fgl.git

diff --git a/source/render/renderer.cpp b/source/render/renderer.cpp
index 0c5bf774..6bbfbbe0 100644
--- a/source/render/renderer.cpp
+++ b/source/render/renderer.cpp
@@ -21,6 +21,9 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
+const Tag Renderer::world_obj_matrix_tag("world_obj_matrix");
+const Tag Renderer::world_obj_normal_matrix_tag("world_obj_normal_matrix");
+
 Renderer::Renderer():
 	placeholder_texture(Resources::get_global().get<Texture>("_placeholder.png"))
 {
@@ -40,7 +43,6 @@ void Renderer::begin()
 
 	RendererBackend::begin();
 
-	add_shader_data(standard_shdata);
 	commands.begin_frame(frame_index);
 }
 
@@ -71,9 +73,14 @@ void Renderer::pop_state()
 	if(state_stack.size()==1)
 		throw stack_underflow("Renderer::pop_state");
 
+	uintptr_t old_pipeline = current_state->pipeline_key;
+
 	state_stack.pop_back();
 	current_state = &state_stack.back();
 	changed |= MATRIX;
+
+	if(current_state->pipeline_key!=old_pipeline)
+		changed |= PIPELINE_KEY;
 }
 
 Renderer::State &Renderer::get_state() const
@@ -85,10 +92,19 @@ Renderer::State &Renderer::get_state() const
 	return *current_state;
 }
 
+void Renderer::set_pipeline_key(uintptr_t key)
+{
+	State &state = get_state();
+	if(key!=state.pipeline_key)
+	{
+		state.pipeline_key = key;
+		changed |= PIPELINE_KEY;
+	}
+}
+
 void Renderer::set_camera(const Camera &c)
 {
 	get_state().camera = &c;
-	add_shader_data(c.get_shader_data());
 	set_matrix(Matrix());
 }
 
@@ -242,7 +258,7 @@ void Renderer::set_object_lod_bias(unsigned b)
 void Renderer::clear(const ClearValue *values)
 {
 	apply_framebuffer();
-	commands.use_pipeline(&pipeline_state);
+	commands.use_pipeline(&get_pipeline_state());
 	commands.clear(values);
 }
 
@@ -250,8 +266,9 @@ void Renderer::draw(const Batch &batch)
 {
 	apply_state();
 	batch.refresh(frame_index);
-	pipeline_state.set_primitive_type(batch.get_type());
-	commands.use_pipeline(&pipeline_state);
+	PipelineState &ps = get_pipeline_state();
+	ps.set_primitive_type(batch.get_type());
+	commands.use_pipeline(&ps);
 	commands.draw(batch);
 }
 
@@ -259,8 +276,9 @@ void Renderer::draw_instanced(const Batch &batch, unsigned count)
 {
 	apply_state();
 	batch.refresh(frame_index);
-	pipeline_state.set_primitive_type(batch.get_type());
-	commands.use_pipeline(&pipeline_state);
+	PipelineState &ps = get_pipeline_state();
+	ps.set_primitive_type(batch.get_type());
+	commands.use_pipeline(&ps);
 	commands.draw_instanced(batch, count);
 }
 
@@ -276,8 +294,8 @@ void Renderer::resolve_multisample(Framebuffer &target)
 	if(target.get_width()!=width || target.get_height()!=height)
 		throw incompatible_data("Renderer::resolve_multisample");
 
-	pipeline_state.set_framebuffer(state.framebuffer);
-	commands.use_pipeline(&pipeline_state);
+	apply_framebuffer();
+	commands.use_pipeline(&get_pipeline_state());
 	commands.resolve_multisample(target);
 }
 
@@ -291,14 +309,27 @@ void Renderer::end_query(const QueryPool &pool, unsigned index)
 	commands.end_query(pool, index);
 }
 
+PipelineState &Renderer::get_pipeline_state()
+{
+	if(changed&PIPELINE_KEY)
+	{
+		RendererBackend::set_pipeline_key(current_state->pipeline_key);
+		changed &= ~PIPELINE_KEY;
+	}
+
+	return RendererBackend::get_pipeline_state();
+}
+
 void Renderer::apply_framebuffer()
 {
 	const State &state = get_state();
 
-	pipeline_state.set_framebuffer(state.framebuffer);
+	PipelineState &ps = get_pipeline_state();
+
+	ps.set_framebuffer(state.framebuffer);
 	static const Rect default_rect = Rect::max();
-	pipeline_state.set_viewport(state.viewport ? *state.viewport : default_rect);
-	pipeline_state.set_scissor(state.scissor ? *state.scissor : default_rect);
+	ps.set_viewport(state.viewport ? *state.viewport : default_rect);
+	ps.set_scissor(state.scissor ? *state.scissor : default_rect);
 }
 
 void Renderer::apply_state()
@@ -310,30 +341,44 @@ void Renderer::apply_state()
 
 	apply_framebuffer();
 
-	bool shprog_changed = (state.shprog!=pipeline_state.get_shader_program());
-	pipeline_state.set_shader_program(state.shprog);
+	PipelineState &ps = get_pipeline_state();
+	bool pipeline_changed = (&ps!=last_pipeline);
+	last_pipeline = &ps;
 
-	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;
-	}
+	bool shprog_changed = (state.shprog!=ps.get_shader_program());
+	ps.set_shader_program(state.shprog);
 
 	bool shdata_changed = changed&SHADER_DATA;
 	for(auto i=shdata_stack.begin(); (!shdata_changed && i!=shdata_stack.end()); ++i)
 		shdata_changed = (i->shdata->get_generation()!=i->generation);
 	bool extra_shdata = (shdata_stack.size()>state.shdata_count);
 
-	if(shdata_changed || shprog_changed || extra_shdata)
+	if(changed&CAMERA)
+	{
+		shdata_changed = true;
+		changed &= ~CAMERA;
+	}
+
+	if(changed&MATRIX)
+	{
+		standard_shdata.uniform(world_obj_matrix_tag, state.model_matrix);
+		LinAl::Matrix<float, 3, 3> nm = state.model_matrix.block<3, 3>(0, 0);
+		nm = transpose(invert(nm));
+		standard_shdata.uniform(world_obj_normal_matrix_tag, nm);
+		changed &= ~MATRIX;
+		shdata_changed = true;
+	}
+
+	if(shdata_changed || shprog_changed || pipeline_changed || extra_shdata)
 	{
 		if(extra_shdata)
 			shdata_stack.erase(shdata_stack.begin()+state.shdata_count, shdata_stack.end());
+		standard_shdata.apply(*state.shprog, ps, frame_index);
+		if(state.camera)
+			state.camera->get_shader_data().apply(*state.shprog, ps, frame_index);
 		for(const BoundProgramData &d: shdata_stack)
 		{
-			d.shdata->apply(*state.shprog, pipeline_state, frame_index);
+			d.shdata->apply(*state.shprog, ps, frame_index);
 			d.generation = d.shdata->get_generation();
 		}
 		changed &= ~SHADER_DATA;
@@ -346,10 +391,10 @@ void Renderer::apply_state()
 		if(const VertexArray *array = state.vertex_setup->get_instance_array())
 			array->refresh(frame_index);
 	}
-	pipeline_state.set_vertex_setup(state.vertex_setup);
+	ps.set_vertex_setup(state.vertex_setup);
 
-	pipeline_state.set_front_face(state.front_face);
-	pipeline_state.set_face_cull(state.face_cull);
+	ps.set_front_face(state.front_face);
+	ps.set_face_cull(state.face_cull);
 
 	if(state.texture_count<texture_stack.size())
 		flush_textures();
@@ -360,15 +405,15 @@ void Renderer::apply_state()
 			if(t.binding<0 || shprog_changed)
 				t.binding = state.shprog->get_uniform_binding(t.tag);
 			if(t.binding>=0)
-				pipeline_state.set_texture(t.binding, t.texture, t.level, t.sampler);
+				ps.set_texture(t.binding, t.texture, t.level, t.sampler);
 		}
 
 	static const DepthTest default_depth_test;
-	pipeline_state.set_depth_test(state.depth_test ? *state.depth_test : default_depth_test);
+	ps.set_depth_test(state.depth_test ? *state.depth_test : default_depth_test);
 	static const StencilTest default_stencil_test;
-	pipeline_state.set_stencil_test(state.stencil_test ? *state.stencil_test : default_stencil_test);
+	ps.set_stencil_test(state.stencil_test ? *state.stencil_test : default_stencil_test);
 	static const Blend default_blend;
-	pipeline_state.set_blend(state.blend ? *state.blend : default_blend);
+	ps.set_blend(state.blend ? *state.blend : default_blend);
 }