Remove obsolete stuff from Sequence

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

diff --git a/source/render/sequence.h b/source/render/sequence.h
index fb60e37159f7a4220753b093548afc2d9e6b1023..f862bbcb55914b229ff1d4d2e756e1fc0809e6c8 100644 (file)
--- a/source/render/sequence.h
+++ b/source/render/sequence.h
@@ -3,10 +3,12 @@
 
 #include <map>
 #include <set>
+#include "blend.h"
+#include "depthtest.h"
 #include "framebuffer.h"
 #include "renderable.h"
-#include "renderbuffer.h"
 #include "rendertarget.h"
+#include "stenciltest.h"
 #include "texture2d.h"
 
 namespace Msp {
@@ -15,7 +17,6 @@ namespace GL {
 class Blend;
 class Camera;
 class Clipping;
-class DepthTest;
 class Lighting;
 class PostProcessor;
 class View;
@@ -42,8 +43,9 @@ public:
        private:
                Tag tag;
                const Lighting *lighting;
-               const DepthTest *depth_test;
-               const Blend *blend;
+               DepthTest depth_test;
+               StencilTest stencil_test;
+               Blend blend;
                const Clipping *clipping;
                Renderable *renderable;
 
@@ -53,22 +55,29 @@ public:
                Tag get_tag() const { return tag; }
 
                void set_lighting(const Lighting *);
-               void set_depth_test(const DepthTest *);
-               void set_blend(const Blend *);
+               void set_depth_test(const DepthTest &);
+               void set_stencil_test(const StencilTest &);
+               void set_blend(const Blend &);
                void set_clipping(const Clipping *);
                const Lighting *get_lighting() const { return lighting; }
-               const DepthTest *get_depth_test() const { return depth_test; }
-               const Blend *get_blend() const { return blend; }
+               const DepthTest &get_depth_test() const { return depth_test; }
+               const StencilTest &get_stencil_test() const { return stencil_test; }
+               const Blend &get_blend() const { return blend; }
                const Clipping *get_clipping() const { return clipping; }
                Renderable *get_renderable() const { return renderable; }
        };
 
-       DEPRECATED typedef Step Pass;
-
 private:
+       struct PostProcStep
+       {
+               PostProcessor *postproc;
+               bool owned;
+
+               PostProcStep(PostProcessor *pp, bool o): postproc(pp), owned(o) { }
+       };
+
        std::vector<Step> steps;
-       const Camera *camera;
-       std::vector<RefPtr<PostProcessor> > postproc;
+       std::vector<PostProcStep> postproc;
        unsigned width;
        unsigned height;
        bool hdr;
@@ -76,6 +85,7 @@ private:
        unsigned samples;
        RenderTarget *target[2];
        RenderTarget *target_ms;
+       std::string debug_name;
 
 public:
        Sequence(unsigned, unsigned, bool = false);
@@ -105,8 +115,6 @@ public:
        Renderable multiple times. */
        Step &add_step(Tag, Renderable &);
 
-       DEPRECATED Step &add_pass(Tag t, Renderable &r) { return add_step(t, r); }
-
        /** Adds a postprocessor to the sequence. */
        void add_postprocessor(PostProcessor &);
 
@@ -126,6 +134,11 @@ public:
 
 private:
        void create_targets(unsigned);
+
+public:
+       void set_debug_name(const std::string &);
+private:
+       void set_target_debug_names();
 };
 
 } // namespace GL