X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fbuilders%2Fsequencebuilder.cpp;h=eff9348b8395a78226436110633a400c9e373d26;hb=b8b7c6b251cace40021bdfacc6aa17242aa51e1d;hp=6e87081d4ab5805d8173240eba3ca0b800331045;hpb=ff8a8bfa114a690b7b25d9503bb5ed811d6aeca9;p=libs%2Fgl.git

diff --git a/source/builders/sequencebuilder.cpp b/source/builders/sequencebuilder.cpp
index 6e87081d..eff9348b 100644
--- a/source/builders/sequencebuilder.cpp
+++ b/source/builders/sequencebuilder.cpp
@@ -16,8 +16,8 @@ namespace GL {
 SequenceBuilder::SequenceBuilder(const SequenceTemplate &t):
 	tmpl(t)
 {
-	for(const SequenceTemplate::Step &s: tmpl.get_steps())
-		renderables[s.slot_name] = s.default_renderable;
+	for(const SequenceTemplate::Renderable &r: tmpl.get_renderables())
+		renderables[r.slot_name] = r.renderable;
 	for(const SequenceTemplate::PostProcessor &p: tmpl.get_postprocessors())
 		if(!p.slot_name.empty())
 			postprocessors[p.slot_name] = 0;
@@ -50,15 +50,20 @@ void SequenceBuilder::build(Sequence &sequence) const
 #endif
 
 	sequence.set_clear_enabled(tmpl.is_clear_enabled());
+	if(tmpl.is_clear_enabled())
+	{
+		sequence.set_clear_colors(tmpl.get_clear_colors());
+		sequence.set_clear_depth(tmpl.get_clear_depth());
+		sequence.set_clear_stencil(tmpl.get_clear_stencil());
+	}
 
 	for(const SequenceTemplate::Step &s: tmpl.get_steps())
 	{
-		Renderable *renderable = get_item(renderables, s.slot_name);
+		Renderable *renderable = get_item(renderables, s.renderable_name);
 		if(!renderable)
-			continue;
+			throw missing_renderable(s.renderable_name);
 
 		Sequence::Step &step = sequence.add_step(s.tag, *renderable);
-		step.set_blend(s.blend);
 		step.set_depth_test(s.depth_test);
 		step.set_stencil_test(s.stencil_test);
 		step.set_lighting(s.lighting);
@@ -69,7 +74,7 @@ void SequenceBuilder::build(Sequence &sequence) const
 #endif
 	for(const SequenceTemplate::PostProcessor &p: tmpl.get_postprocessors())
 	{
-		PostProcessor *proc = 0;
+		RefPtr<PostProcessor> proc = 0;
 		if(!p.slot_name.empty())
 			proc = get_item(postprocessors, p.slot_name);
 		if(proc)
@@ -83,9 +88,13 @@ void SequenceBuilder::build(Sequence &sequence) const
 				if(!debug_name.empty())
 					proc->set_debug_name(format("%s/%d.pproc", debug_name, index++));
 #endif
-				sequence.add_postprocessor_owned(proc);
+				sequence.add_postprocessor(*proc.get());
+				sequence.add_owned(proc.release());
 			}
 		}
+
+		if(!proc)
+			throw invalid_operation("SequenceBuilder::build");
 	}
 }
 
@@ -119,7 +128,7 @@ Sequence *SequenceBuilder::build(const Framebuffer &fbo) const
 
 FrameFormat SequenceBuilder::create_frame_format() const
 {
-	unsigned samples = min(tmpl.get_maximum_multisample(), Limits::get_global().max_samples);
+	unsigned samples = min(tmpl.get_maximum_multisample(), DeviceInfo::get_global().limits.max_samples);
 	if(samples<tmpl.get_required_multisample())
 		throw invalid_operation("SequenceBuilder::create_frame_format");