X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fprogramdata.h;h=f11a254cb8014e5ec9a341f5c695c5685b7c802c;hp=fe907d5cb65e21cfecbd5b01f3ec5bb2286f1c4a;hb=56beca9d8b4f7b4edac81411d31e24df88e84ac3;hpb=1b45b45f7d543ea677183bab5aaa9ff90b6576cf

diff --git a/source/programdata.h b/source/programdata.h
index fe907d5c..f11a254c 100644
--- a/source/programdata.h
+++ b/source/programdata.h
@@ -141,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,9 +173,14 @@ public:
 	void uniform3_array(const std::string &, unsigned, const float *);
 	void uniform4_array(const std::string &, unsigned, const int *);
 	void uniform4_array(const std::string &, unsigned, const float *);
+	void uniform_matrix2_array(const std::string &, unsigned, const float *);
+	void uniform_matrix3_array(const std::string &, unsigned, const float *);
 	void uniform_matrix4_array(const std::string &, unsigned, const float *);
 	void remove_uniform(const std::string &);
 
+	std::vector<std::string> get_uniform_names() const;
+	const Uniform &get_uniform(const std::string &) const;
+
 private:
 	unsigned compute_slot_mask(const Program::UniformBlockInfo &) const;
 	void update_block(UniformBlock &, const Program::UniformBlockInfo &) const;