X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fprogramdata.h;h=0851f5f6a007396ab5a37a9c5968490ab31b5d10;hb=133fe7352831197c9ec59f923c1126651d80edcb;hp=e045c6fd10def72e59adfc92dc4586373a915361;hpb=9885c5465db78b6a1d9cc8bf7ffa7a79fb116afc;p=libs%2Fgl.git

diff --git a/source/programdata.h b/source/programdata.h
index e045c6fd..0851f5f6 100644
--- a/source/programdata.h
+++ b/source/programdata.h
@@ -123,6 +123,7 @@ private:
 	typedef std::map<Program::LayoutHash, ProgramUniforms> ProgramMap;
 
 	// XXX All these mutables are a bit silly, but I'm out of better ideas
+	const Program *tied_program;
 	SlotMap uniform_slots;
 	std::vector<Uniform *> uniforms;
 	mutable BlockMap blocks;
@@ -132,7 +133,7 @@ private:
 	mutable unsigned dirty;
 
 public:
-	ProgramData();
+	ProgramData(const Program * = 0);
 	ProgramData(const ProgramData &);
 	ProgramData &operator=(const ProgramData &);
 	~ProgramData();
@@ -140,6 +141,7 @@ public:
 private:
 	void uniform(const std::string &, Uniform *);
 public:
+	void uniform(const std::string &, const Uniform &);
 	void uniform(const std::string &, int);
 	void uniform(const std::string &, float);
 	void uniform(const std::string &, int, int);
@@ -172,6 +174,7 @@ public:
 	void uniform4_array(const std::string &, unsigned, const int *);
 	void uniform4_array(const std::string &, unsigned, const float *);
 	void uniform_matrix4_array(const std::string &, unsigned, const float *);
+	void remove_uniform(const std::string &);
 
 private:
 	unsigned compute_slot_mask(const Program::UniformBlockInfo &) const;