Move blend state from Sequence::Step to RenderMethod

[libs/gl.git] / source / builders / sequencebuilder.cpp

diff --git a/source/builders/sequencebuilder.cpp b/source/builders/sequencebuilder.cpp
index 300ba23846ae5eba8571194a915119b4327dc370..5fca61400a03645941c06a053c1353ff16513ba2 100644 (file)
--- a/source/builders/sequencebuilder.cpp
+++ b/source/builders/sequencebuilder.cpp
@@ -49,6 +49,14 @@ void SequenceBuilder::build(Sequence &sequence) const
                sequence.set_debug_name(debug_name);
 #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);
@@ -56,7 +64,6 @@ void SequenceBuilder::build(Sequence &sequence) const
                        continue;
 
                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);
@@ -87,6 +94,13 @@ void SequenceBuilder::build(Sequence &sequence) const
        }
 }
 
+Sequence *SequenceBuilder::build() const
+{
+       RefPtr<Sequence> sequence = new Sequence();
+       build(*sequence);
+       return sequence.release();
+}
+
 Sequence *SequenceBuilder::build(unsigned w, unsigned h) const
 {
        RefPtr<Sequence> sequence = new Sequence(w, h, create_frame_format());
@@ -110,7 +124,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");