Eliminate the polymorphic Uniform class hierarchy

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

diff --git a/source/render/renderer.h b/source/render/renderer.h
index 7997b35cd7618f0aab6d9109f71f72bcadfd7156..5139c4ce925fd978d8136e6b5655f6ddfd4087d2 100644 (file)
--- a/source/render/renderer.h
+++ b/source/render/renderer.h
@@ -3,6 +3,7 @@
 
 #include <set>
 #include <vector>
+#include "commands.h"
 #include "framebuffer.h"
 #include "matrix.h"
 #include "pipelinestate.h"
@@ -119,6 +120,7 @@ private:
        std::vector<BoundProgramData> shdata_stack;
        std::set<const Renderable *> excluded;
        PipelineState pipeline_state;
+       Commands commands;
 
 public:
        Renderer();
@@ -193,14 +195,13 @@ public:
        void exclude(const Renderable &);
        void include(const Renderable &);
 
-       void clear();
-       void clear(BufferBits);
+       void clear(const ClearValue *);
 
        void render(const Renderable &, Tag = Tag());
        void draw(const Batch &);
        void draw_instanced(const Batch &, unsigned);
 
-       void resolve_multisample(Framebuffer &, BufferBits);
+       void resolve_multisample(Framebuffer &);
 
 private:
        void apply_state();