X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbuilders%2Fsequencebuilder.cpp;h=bf3fef42dfb82f55989a21f8c325139ee569ba7d;hb=215b633d194920cc697d68cfec201c680210b73c;hp=6e87081d4ab5805d8173240eba3ca0b800331045;hpb=ff8a8bfa114a690b7b25d9503bb5ed811d6aeca9;p=libs%2Fgl.git diff --git a/source/builders/sequencebuilder.cpp b/source/builders/sequencebuilder.cpp index 6e87081d..bf3fef42 100644 --- a/source/builders/sequencebuilder.cpp +++ b/source/builders/sequencebuilder.cpp @@ -50,6 +50,12 @@ 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()) { @@ -58,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); @@ -69,7 +74,7 @@ void SequenceBuilder::build(Sequence &sequence) const #endif for(const SequenceTemplate::PostProcessor &p: tmpl.get_postprocessors()) { - PostProcessor *proc = 0; + RefPtr proc = 0; if(!p.slot_name.empty()) proc = get_item(postprocessors, p.slot_name); if(proc) @@ -83,7 +88,8 @@ 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()); } } } @@ -119,7 +125,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