X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Frender%2Fprogramdata.h;h=93eb3be89e1dc66e7ad85061d75752a4fe080a9a;hb=9b3bce7ae76ff8c0c81315d2505ea96bf422a318;hp=a05674dd21927304d3755aa5f0118870ef81729e;hpb=a482029babea3210840d8c62e9df9ece4342b2b9;p=libs%2Fgl.git

diff --git a/source/render/programdata.h b/source/render/programdata.h
index a05674dd..93eb3be8 100644
--- 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 &);
 };