Add a RenderTarget class to manage and annotate FBOs

[libs/gl.git] / source / pipeline.h

diff --git a/source/pipeline.h b/source/pipeline.h
index d07e643176666f861e55dcb75a65f0de28b73021..e3f95994defff957a831987716901620aab94ad1 100644 (file)
--- a/source/pipeline.h
+++ b/source/pipeline.h
@@ -6,6 +6,7 @@
 #include "framebuffer.h"
 #include "renderable.h"
 #include "renderbuffer.h"
+#include "rendertarget.h"
 #include "texture2d.h"
 
 namespace Msp {
@@ -78,24 +79,6 @@ private:
                Slot(const Renderable *);
        };
 
-       struct RenderTarget
-       {
-               Framebuffer fbo;
-               Texture2D color;
-               Texture2D depth;
-
-               RenderTarget(unsigned, unsigned, PixelFormat);
-       };
-
-       struct MultisampleTarget
-       {
-               Framebuffer fbo;
-               Renderbuffer color;
-               Renderbuffer depth;
-
-               MultisampleTarget(unsigned, unsigned, unsigned, PixelFormat);
-       };
-
        typedef std::list<Pass> PassList;
 
        PassList passes;
@@ -107,7 +90,7 @@ private:
        bool hdr;
        unsigned samples;
        RenderTarget *target[2];
-       MultisampleTarget *target_ms;
+       RenderTarget *target_ms;
        mutable bool in_frame;
 
 public: