X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Fprogramdata.h;h=93eb3be89e1dc66e7ad85061d75752a4fe080a9a;hb=e92de029768eef5f0fd744329e589161b46d0762;hp=aeffae45700726f9bc5bd9c7fbc350477486eb90;hpb=bb386d895f5fce2f0099886fdf7e7073b18246e8;p=libs%2Fgl.git

diff --git a/source/render/programdata.h b/source/render/programdata.h
index aeffae45..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;
 
@@ -158,6 +159,7 @@ private:
 	mutable BufferBackedUniformBlock *last_buffer_block;
 	mutable Buffer *buffer;
 	mutable Mask dirty;
+	std::string debug_name;
 
 public:
 	ProgramData(const Program * = 0);
@@ -248,10 +250,11 @@ 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 &);
 };
 
 template<typename T, unsigned N>