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

diff --git a/source/builders/sequencebuilder.cpp b/source/builders/sequencebuilder.cpp
index f007350e..65aeaa13 100644
--- a/source/builders/sequencebuilder.cpp
+++ b/source/builders/sequencebuilder.cpp
@@ -1,7 +1,7 @@
 #include <msp/core/algorithm.h>
 #include <msp/core/maputils.h>
 #include <msp/strings/format.h>
-#include "deviceinfo.h"
+#include "device.h"
 #include "error.h"
 #include "sequence.h"
 #include "sequencebuilder.h"
@@ -49,6 +49,48 @@ void SequenceBuilder::build(Sequence &sequence) const
 		sequence.set_debug_name(debug_name);
 #endif
 
+	map<string, Renderable *> final_renderables = renderables;
+	vector<const SequenceTemplate::Renderable *> sequences;
+	for(const SequenceTemplate::Renderable &r: tmpl.get_renderables())
+	{
+		Renderable *&ptr = final_renderables[r.slot_name];
+		if(!ptr)
+		{
+			if(r.effect_template)
+			{
+				Effect *effect = r.effect_template->create(final_renderables);
+#ifdef DEBUG
+				if(!debug_name.empty())
+					effect->set_debug_name(format("%s/%s", debug_name, r.slot_name));
+#endif
+				ptr = effect;
+			}
+			else if(r.sequence_template)
+			{
+				Sequence *seq = new Sequence;
+#ifdef DEBUG
+				if(!debug_name.empty())
+					seq->set_debug_name(format("%s/%s", debug_name, r.slot_name));
+#endif
+				ptr = seq;
+				sequences.push_back(&r);
+			}
+			else
+				throw invalid_operation("SequenceBuilder::build");
+
+			sequence.add_owned(ptr);
+		}
+	}
+
+	for(const SequenceTemplate::Renderable *s: sequences)
+	{
+		SequenceBuilder bld(*s->sequence_template);
+		for(const auto &kvp: s->sequence_renderables)
+			if(Renderable *r = get_item(final_renderables, kvp.second))
+				bld.set_renderable(kvp.first, *r);
+		bld.build(*static_cast<Sequence *>(get_item(final_renderables, s->slot_name)));
+	}
+
 	sequence.set_clear_enabled(tmpl.is_clear_enabled());
 	if(tmpl.is_clear_enabled())
 	{
@@ -59,11 +101,9 @@ void SequenceBuilder::build(Sequence &sequence) const
 
 	for(const SequenceTemplate::Step &s: tmpl.get_steps())
 	{
-		Renderable *renderable = get_item(renderables, s.renderable_name);
-		if(!renderable)
-			throw missing_renderable(s.renderable_name);
-
-		Sequence::Step &step = sequence.add_step(s.tag, *renderable);
+		// Existence is already ensured above
+		Renderable &renderable = *get_item(final_renderables, s.renderable_name);
+		Sequence::Step &step = sequence.add_step(s.tag, renderable);
 		step.set_depth_test(s.depth_test);
 		step.set_stencil_test(s.stencil_test);
 		step.set_lighting(s.lighting);
@@ -127,7 +167,7 @@ Sequence *SequenceBuilder::build(const Framebuffer &fbo) const
 
 FrameFormat SequenceBuilder::create_frame_format() const
 {
-	unsigned samples = min(tmpl.get_maximum_multisample(), DeviceInfo::get_global().limits.max_samples);
+	unsigned samples = min(tmpl.get_maximum_multisample(), Device::get_current().get_info().limits.max_samples);
 	if(samples<tmpl.get_required_multisample())
 		throw invalid_operation("SequenceBuilder::create_frame_format");