X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Fsequence.cpp;h=e27ebf1888248695240a71a71179f4182e6d36db;hb=6353307898cd397e2bcde13e2448a8a678a60004;hp=472b572fa4adcc1f6806cf6e80a66c677a0cb355;hpb=b466adff89db080c304ac3178ce1f4fef844cb28;p=libs%2Fgl.git diff --git a/source/render/sequence.cpp b/source/render/sequence.cpp index 472b572f..e27ebf18 100644 --- a/source/render/sequence.cpp +++ b/source/render/sequence.cpp @@ -4,7 +4,6 @@ #include "framebuffer.h" #include "lighting.h" #include "postprocessor.h" -#include "renderbuffer.h" #include "renderer.h" #include "sequence.h" #include "texture2d.h" @@ -198,8 +197,8 @@ void Sequence::render(Renderer &renderer, Tag tag) const { unsigned j = i%2; renderer.set_framebuffer(i+1get_framebuffer() : out_fbo); - const Texture2D &color = target[j]->get_target_texture(RENDER_COLOR); - const Texture2D &depth = target[j]->get_target_texture(RENDER_DEPTH); + const Texture2D &color = target[j]->get_target_texture(COLOR_ATTACHMENT); + const Texture2D &depth = target[j]->get_target_texture(DEPTH_ATTACHMENT); postproc[i].postproc->render(renderer, color, depth); } } @@ -221,7 +220,7 @@ void Sequence::create_targets(unsigned recreate) } PixelFormat color_pf = (hdr ? (alpha ? RGBA16F : RGB16F) : (alpha ? RGBA8 : RGB8)); - RenderTargetFormat fmt = (RENDER_COLOR,color_pf, RENDER_DEPTH); + FrameFormat fmt = (COLOR_ATTACHMENT,color_pf, DEPTH_ATTACHMENT); if(!postproc.empty() || samples) { if(!target[0]) @@ -231,7 +230,7 @@ void Sequence::create_targets(unsigned recreate) } if(!target_ms && samples) - target_ms = new RenderTarget(width, height, samples, fmt); + target_ms = new RenderTarget(width, height, fmt.set_samples(samples)); #ifdef DEBUG if(!debug_name.empty())