X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fbuilders%2Fsequencebuilder.cpp;h=5a68d4142a90bd777f058a9a3c3e4160c9367cf0;hp=9bb8f1dcd6b05def0558b6f81cfa7767dd5061e7;hb=a3cc9f4469153396c7ad0868f3cbb2d2f698d710;hpb=2d3113a7dbbe4be2f1d1e8980c1c4e42175163da

diff --git a/source/builders/sequencebuilder.cpp b/source/builders/sequencebuilder.cpp
index 9bb8f1dc..5a68d414 100644
--- a/source/builders/sequencebuilder.cpp
+++ b/source/builders/sequencebuilder.cpp
@@ -3,7 +3,6 @@
 #include <msp/strings/format.h>
 #include "deviceinfo.h"
 #include "error.h"
-#include "renderbuffer.h"
 #include "sequence.h"
 #include "sequencebuilder.h"
 #include "sequencetemplate.h"
@@ -51,14 +50,6 @@ void SequenceBuilder::build(Sequence &sequence) const
 		sequence.set_debug_name(debug_name);
 #endif
 
-	sequence.set_hdr(tmpl.get_hdr());
-	sequence.set_alpha(tmpl.get_alpha());
-	unsigned samples = min(tmpl.get_maximum_multisample(), Limits::get_global().max_samples);
-	if(samples<tmpl.get_required_multisample())
-		throw invalid_operation("SequenceBuilder::build");
-
-	sequence.set_multisample(samples);
-
 	const vector<SequenceTemplate::Step> &steps = tmpl.get_steps();
 	for(vector<SequenceTemplate::Step>::const_iterator i=steps.begin(); i!=steps.end(); ++i)
 	{
@@ -67,8 +58,9 @@ void SequenceBuilder::build(Sequence &sequence) const
 			continue;
 
 		Sequence::Step &step = sequence.add_step(i->tag, *renderable);
-		step.set_blend(i->blend.get());
-		step.set_depth_test(i->depth_test.get());
+		step.set_blend(i->blend);
+		step.set_depth_test(i->depth_test);
+		step.set_stencil_test(i->stencil_test);
 		step.set_lighting(i->lighting);
 	}
 
@@ -97,24 +89,37 @@ void SequenceBuilder::build(Sequence &sequence) const
 
 Sequence *SequenceBuilder::build(unsigned w, unsigned h) const
 {
-	RefPtr<Sequence> sequence = new Sequence(w, h);
+	RefPtr<Sequence> sequence = new Sequence(w, h, create_frame_format());
 	build(*sequence);
 	return sequence.release();
 }
 
 Sequence *SequenceBuilder::build(const View &view) const
 {
-	RefPtr<Sequence> sequence = new Sequence(view);
+	RefPtr<Sequence> sequence = new Sequence(view, create_frame_format());
 	build(*sequence);
 	return sequence.release();
 }
 
 Sequence *SequenceBuilder::build(const Framebuffer &fbo) const
 {
-	RefPtr<Sequence> sequence = new Sequence(fbo);
+	RefPtr<Sequence> sequence = new Sequence(fbo, create_frame_format());
 	build(*sequence);
 	return sequence.release();
 }
 
+FrameFormat SequenceBuilder::create_frame_format() const
+{
+	unsigned samples = min(tmpl.get_maximum_multisample(), Limits::get_global().max_samples);
+	if(samples<tmpl.get_required_multisample())
+		throw invalid_operation("SequenceBuilder::create_frame_format");
+
+	PixelComponents color_comp = (tmpl.get_alpha() ? RGBA : RGB);
+	DataType color_type = (tmpl.get_hdr() ? HALF_FLOAT : UNSIGNED_BYTE);
+	PixelFormat color_pf = make_pixelformat(color_comp, color_type);
+
+	return (COLOR_ATTACHMENT,color_pf, DEPTH_ATTACHMENT).set_samples(samples);
+}
+
 } // namespace GL
 } // namespace Msp