X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpipeline.cpp;h=bfd7bc679c6d69c4432d8f3d52a83003c4b16157;hb=ab83db6f1e31d44ced585119a57fd10896e469cb;hp=b9db62d84ef4526945beba95b377bf4ee5afe418;hpb=7cbe8cc9893fe14f889321bd55e78b0ed6503e23;p=libs%2Fgl.git diff --git a/source/pipeline.cpp b/source/pipeline.cpp index b9db62d8..bfd7bc67 100644 --- a/source/pipeline.cpp +++ b/source/pipeline.cpp @@ -21,33 +21,29 @@ Pipeline::Pipeline(unsigned w, unsigned h, bool d): height(h), hdr(d), samples(0), - fbo(0), - color_buf(0), - depth_buf(0), - fbo_ms(0), - color_buf_ms(0), - depth_buf_ms(0) -{ } + target_ms(0) +{ + target[0] = 0; + target[1] = 0; +} Pipeline::~Pipeline() { - delete fbo; - delete color_buf; - delete depth_buf; + delete target[0]; + delete target[1]; + delete target_ms; } void Pipeline::set_hdr(bool h) { hdr = h; - if(!postproc.empty()) - create_fbos(); + create_targets(true); } void Pipeline::set_multisample(unsigned s) { samples = s; - if(!postproc.empty()) - create_fbos(); + create_targets(false); } void Pipeline::set_camera(const Camera *c) @@ -55,21 +51,10 @@ void Pipeline::set_camera(const Camera *c) camera = c; } -PipelinePass &Pipeline::add_pass(const Tag &tag) -{ - PipelinePass &pass = insert_unique(passes, tag, PipelinePass())->second; - pass_order.push_back(tag); - return pass; -} - -PipelinePass &Pipeline::get_pass(const Tag &tag) +Pipeline::Pass &Pipeline::add_pass(const Tag &tag) { - return get_item(passes, tag); -} - -const PipelinePass &Pipeline::get_pass(const Tag &tag) const -{ - return get_item(passes, tag); + passes.push_back(Pass(tag)); + return passes.back(); } void Pipeline::add_renderable(const Renderable &r) @@ -110,94 +95,104 @@ void Pipeline::remove_renderable(const Renderable &r) void Pipeline::add_postprocessor(PostProcessor &pp) { postproc.push_back(&pp); - if(!fbo) - create_fbos(); - { - } + create_targets(false); } -void Pipeline::render(Renderer &renderer, const Tag &tag) const +void Pipeline::render(const Tag &tag) const { - const PipelinePass &pass = get_pass(tag); - - Bind bind_depth_test(pass.depth_test); - Bind bind_blend(pass.blend); - Bind bind_lighting(pass.lighting); + if(tag.id) + return; - for(vector::const_iterator i=renderables.begin(); i!=renderables.end(); ++i) - if(i->passes.empty() || i->passes.count(tag)) - i->renderable->render(renderer, tag); + Renderer renderer(camera); + render(renderer, tag); } -void Pipeline::render_all() const +void Pipeline::render(Renderer &renderer, const Tag &tag) const { - if(camera) - camera->apply(); + if(tag.id) + return; - if(fbo) + if(target[0]) { - Framebuffer *f = (fbo_ms ? fbo_ms : fbo); - f->bind(); - f->clear(COLOR_BUFFER_BIT|DEPTH_BUFFER_BIT); + Framebuffer &fbo = (samples ? target_ms->fbo : target[0]->fbo); + // XXX exception safety + fbo.bind(); + fbo.clear(COLOR_BUFFER_BIT|DEPTH_BUFFER_BIT); } - Renderer renderer(camera); - for(vector::const_iterator i=pass_order.begin(); i!=pass_order.end(); ++i) - render(renderer, *i); + for(PassList::const_iterator i=passes.begin(); i!=passes.end(); ++i) + { + Bind bind_depth_test(i->get_depth_test()); + Bind bind_blend(i->get_blend()); + Bind bind_lighting(i->get_lighting()); - if(fbo) + for(vector::const_iterator j=renderables.begin(); j!=renderables.end(); ++j) + if(j->passes.empty() || j->passes.count(i->get_tag())) + j->renderable->render(renderer, i->get_tag()); + } + + if(target[0]) { - if(fbo_ms) - fbo->blit_from(*fbo_ms, COLOR_BUFFER_BIT|DEPTH_BUFFER_BIT, false); + if(samples) + target[0]->fbo.blit_from(target_ms->fbo, COLOR_BUFFER_BIT|DEPTH_BUFFER_BIT, false); + + for(unsigned i=0; ifbo.bind(); + else + Framebuffer::unbind(); + postproc[i]->render(target[j]->color, target[j]->depth); + } + Framebuffer::unbind(); } - - // XXX Need two color buffer textures to handle multiple post-processors correctly - for(vector::const_iterator i=postproc.begin(); i!=postproc.end(); ++i) - (*i)->render(*color_buf, *depth_buf); } -void Pipeline::create_fbos() +void Pipeline::create_targets(bool recreate) { - delete fbo; - delete color_buf; - delete depth_buf; + if(recreate) + { + delete target[0]; + delete target[1]; + delete target_ms; + target[0] = 0; + target[1] = 0; + target_ms = 0; + } - delete fbo_ms; - fbo_ms = 0; - delete color_buf_ms; - color_buf_ms = 0; - delete depth_buf_ms; - depth_buf_ms = 0; + PixelFormat fmt = (hdr ? RGB16F : RGB); + if(!target[0]) + target[0] = new RenderTarget(width, height, fmt); + if(!target[1] && postproc.size()>1) + target[1] = new RenderTarget(width, height, fmt); - fbo = new Framebuffer; + if(!target_ms && samples) + target_ms = new MultisampleTarget(width, height, samples, fmt); +} - color_buf = new Texture2D; - color_buf->set_min_filter(NEAREST); - color_buf->set_mag_filter(NEAREST); - color_buf->set_wrap(CLAMP_TO_EDGE); - color_buf->storage((hdr ? RGB16F : RGB), width, height); - fbo->attach(COLOR_ATTACHMENT0, *color_buf, 0); - depth_buf = new Texture2D; - depth_buf->set_min_filter(NEAREST); - depth_buf->set_mag_filter(NEAREST); - depth_buf->set_wrap(CLAMP_TO_EDGE); - depth_buf->storage(DEPTH_COMPONENT, width, height); - fbo->attach(DEPTH_ATTACHMENT, *depth_buf, 0); +Pipeline::Pass::Pass(const Tag &t): + tag(t), + lighting(0), + depth_test(0), + blend(0) +{ } - if(samples) - { - fbo_ms = new Framebuffer; +void Pipeline::Pass::set_lighting(const Lighting *l) +{ + lighting = l; +} - color_buf_ms = new Renderbuffer; - color_buf_ms->storage_multisample(samples, (hdr ? RGB16F : RGB), width, height); - fbo_ms->attach(COLOR_ATTACHMENT0, *color_buf_ms); +void Pipeline::Pass::set_depth_test(const DepthTest *d) +{ + depth_test = d; +} - depth_buf_ms = new Renderbuffer; - depth_buf_ms->storage_multisample(samples, DEPTH_COMPONENT, width, height); - fbo_ms->attach(DEPTH_ATTACHMENT, *depth_buf_ms); - } +void Pipeline::Pass::set_blend(const Blend *b) +{ + blend = b; } @@ -205,5 +200,31 @@ Pipeline::Slot::Slot(const Renderable *r): renderable(r) { } + +Pipeline::RenderTarget::RenderTarget(unsigned w, unsigned h, PixelFormat f) +{ + color.set_min_filter(NEAREST); + color.set_mag_filter(NEAREST); + color.set_wrap(CLAMP_TO_EDGE); + color.storage(f, w, h); + fbo.attach(COLOR_ATTACHMENT0, color, 0); + + depth.set_min_filter(NEAREST); + depth.set_mag_filter(NEAREST); + depth.set_wrap(CLAMP_TO_EDGE); + depth.storage(DEPTH_COMPONENT, w, h); + fbo.attach(DEPTH_ATTACHMENT, depth, 0); +} + + +Pipeline::MultisampleTarget::MultisampleTarget(unsigned w, unsigned h, unsigned s, PixelFormat f) +{ + color.storage_multisample(s, f, w, h); + fbo.attach(COLOR_ATTACHMENT0, color); + + depth.storage_multisample(s, DEPTH_COMPONENT, w, h); + fbo.attach(DEPTH_ATTACHMENT, depth); +} + } // namespace GL } // namespace Msp