X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Fsequence.cpp;h=4f10026ad497386b39ebb3a89fbd43e5e974518d;hb=94cadd1618f93239b1cb0acbd4f958257c035c98;hp=f7dea9bf617ebf1db173fec541408b0735b4989b;hpb=867c4e8c34fe24146f4f8cf6bd0b27a6d99aa1a2;p=libs%2Fgl.git

diff --git a/source/render/sequence.cpp b/source/render/sequence.cpp
index f7dea9bf..4f10026a 100644
--- a/source/render/sequence.cpp
+++ b/source/render/sequence.cpp
@@ -12,7 +12,7 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-Tag Sequence::noclear_tag = "noclear";
+const Tag Sequence::noclear_tag = "noclear";
 
 Sequence::Sequence(unsigned w, unsigned h, const FrameFormat &f):
 	width(w),
@@ -33,9 +33,8 @@ Sequence::Sequence(unsigned w, unsigned h, const FrameFormat &f):
 
 Sequence::~Sequence()
 {
-	for(PostProcStep &p: postproc)
-		if(p.owned)
-			delete p.postproc;
+	for(OwnedObject &o: owned_data)
+		o.delete_func(o.pointer);
 	delete target[0];
 	delete target[1];
 	delete target_ms;
@@ -66,29 +65,15 @@ void Sequence::set_clear_stencil(int s)
 
 Sequence::Step &Sequence::add_step(Tag tag, Renderable &r)
 {
-	steps.push_back(Step(tag, &r));
+	steps.emplace_back(tag, &r);
 	return steps.back();
 }
 
 void Sequence::add_postprocessor(PostProcessor &pp)
-{
-	add_postprocessor(&pp, false);
-}
-
-void Sequence::add_postprocessor_owned(PostProcessor *pp)
-{
-	add_postprocessor(pp, true);
-}
-
-void Sequence::add_postprocessor(PostProcessor *pp, bool owned)
 {
 	if(target_format.empty())
-	{
-		if(owned)
-			delete pp;
 		throw invalid_operation("Sequence::add_postprocessor");
-	}
-	postproc.push_back(PostProcStep(pp, owned));
+	postproc.push_back(&pp);
 }
 
 void Sequence::setup_frame(Renderer &renderer)
@@ -124,7 +109,7 @@ void Sequence::render(Renderer &renderer, Tag tag) const
 			throw invalid_operation("Sequence::render");
 
 		const FrameFormat &format = target_fbo->get_format();
-		ClearValue clear_values[7];
+		ClearValue clear_values[FrameFormat::MAX_ATTACHMENTS];
 		unsigned i = 0;
 		Color default_color = (clear_colors.empty() ? Color(0.0f, 0.0f, 0.0f, 0.0f) : clear_colors.front());
 		ClearValue *cv = clear_values;
@@ -148,19 +133,22 @@ void Sequence::render(Renderer &renderer, Tag tag) const
 
 		renderer.set_depth_test(&s.get_depth_test());
 		renderer.set_stencil_test(&s.get_stencil_test());
-		renderer.set_blend(&s.get_blend());
 
-		if (const Lighting *lighting = s.get_lighting())
+		if(const Lighting *lighting = s.get_lighting())
 			renderer.add_shader_data(lighting->get_shader_data());
 
 		if(const Renderable *renderable = s.get_renderable())
-			renderer.render(*renderable, s.get_tag());
+			renderable->render(renderer, s.get_tag());
 	}
 
 	if(target[0])
 	{
+		RenderTarget *source = target[0];
 		if(target_ms)
-			renderer.resolve_multisample(target[0]->get_framebuffer());
+		{
+			renderer.resolve_multisample();
+			source = target_ms;
+		}
 
 		renderer.set_depth_test(0);
 		renderer.set_stencil_test(0);
@@ -168,11 +156,12 @@ void Sequence::render(Renderer &renderer, Tag tag) const
 
 		for(unsigned i=0; i<postproc.size(); ++i)
 		{
-			unsigned j = i%2;
-			renderer.set_framebuffer(i+1<postproc.size() ? &target[1-j]->get_framebuffer() : out_fbo);
-			const Texture2D &color = target[j]->get_target_texture(COLOR_ATTACHMENT);
-			const Texture2D &depth = target[j]->get_target_texture(DEPTH_ATTACHMENT);
-			postproc[i].postproc->render(renderer, color, depth);
+			unsigned j = 1-i%2;
+			renderer.set_framebuffer(i+1<postproc.size() ? &target[j]->get_framebuffer() : out_fbo);
+			const Texture2D &color = source->get_target_texture(COLOR_ATTACHMENT);
+			const Texture2D &depth = source->get_target_texture(DEPTH_ATTACHMENT);
+			postproc[i]->render(renderer, color, depth);
+			source = target[j];
 		}
 	}
 }
@@ -212,10 +201,5 @@ void Sequence::Step::set_stencil_test(const StencilTest &st)
 	stencil_test = st;
 }
 
-void Sequence::Step::set_blend(const Blend &b)
-{
-	blend = b;
-}
-
 } // namespace GL
 } // namespace Msp