Redesign framebuffer attachment management

[libs/gl.git] / source / render / sequence.cpp

diff --git a/source/render/sequence.cpp b/source/render/sequence.cpp
index aaa1ef12a2238e209973c708446672b3ba865ed6..e27ebf1888248695240a71a71179f4182e6d36db 100644 (file)
--- a/source/render/sequence.cpp
+++ b/source/render/sequence.cpp
@@ -197,8 +197,8 @@ void Sequence::render(Renderer &renderer, Tag tag) const
                {
                        unsigned j = i%2;
                        renderer.set_framebuffer(i+1<postproc.size() ? &target[1-j]->get_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);
                }
        }
@@ -220,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])
@@ -230,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())