X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fbuilders%2Fsequencebuilder.cpp;h=f007350eeaa0e76ad023055f59d133bd407e368a;hp=a614a836a5c4d15ee52770f4861e7063ed7fe1e1;hb=54fdd850d1e657bc357d859a532497905ded741a;hpb=006bdb4f8660098fc524dcca80b24c943c65b249

diff --git a/source/builders/sequencebuilder.cpp b/source/builders/sequencebuilder.cpp
index a614a836..f007350e 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;
@@ -59,12 +59,11 @@ void SequenceBuilder::build(Sequence &sequence) const
 
 	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);
@@ -78,20 +77,23 @@ void SequenceBuilder::build(Sequence &sequence) const
 		PostProcessor *proc = 0;
 		if(!p.slot_name.empty())
 			proc = get_item(postprocessors, p.slot_name);
-		if(proc)
-			sequence.add_postprocessor(*proc);
-		else if(p.postprocessor_template)
+		if(!proc)
 		{
-			proc = p.postprocessor_template->create(sequence.get_width(), sequence.get_height());
-			if(proc)
+			if(p.postprocessor_template)
 			{
+				proc = p.postprocessor_template->create(sequence.get_width(), sequence.get_height());
 #ifdef DEBUG
 				if(!debug_name.empty())
 					proc->set_debug_name(format("%s/%d.pproc", debug_name, index++));
 #endif
-				sequence.add_postprocessor_owned(proc);
 			}
+			else
+				throw invalid_operation("SequenceBuilder::build");
+
+			sequence.add_owned(proc);
 		}
+
+		sequence.add_postprocessor(*proc);
 	}
 }
 
@@ -125,7 +127,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");