Rewrite state management

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

diff --git a/source/render/programdata.h b/source/render/programdata.h
index a05674dd21927304d3755aa5f0118870ef81729e..93eb3be89e1dc66e7ad85061d75752a4fe080a9a 100644 (file)
--- a/source/render/programdata.h
+++ b/source/render/programdata.h
@@ -23,6 +23,7 @@ public:
 
 class Buffer;
 class BufferBackedUniformBlock;
+class PipelineState;
 class UniformBlock;
 struct Color;
 
@@ -249,10 +250,9 @@ private:
        void update_block_uniform_indices(SharedBlock &, const Program::UniformBlockInfo &) const;
        void update_block(SharedBlock &, const Program::UniformBlockInfo &) const;
 
+       std::vector<ProgramBlock>::const_iterator prepare_program(const Program &) const;
 public:
-       /** Applies uniform blocks for the currently bound program, creating them
-       if needed. */
-       void apply() const;
+       void apply(const Program &, PipelineState &) const;
 
        void set_debug_name(const std::string &);
 };