X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramdata.h;h=5d6dceb784e997a9b463d1322ebd0b2f96769a8e;hb=7699570b9a07ef1fbe2b3b8badfa923de2fdd0a1;hp=38803c571ee2e210451ccc6abb3abd41ab005b23;hpb=904de4f7fd994886adbd3a6c03bc1b7c14ebc562;p=libs%2Fgl.git

diff --git a/source/programdata.h b/source/programdata.h
index 38803c57..5d6dceb7 100644
--- a/source/programdata.h
+++ b/source/programdata.h
@@ -67,10 +67,10 @@ private:
 	mutable Buffer *buffer;
 	mutable Changes changes;
 
-	ProgramData &operator=(const ProgramData &);
 public:
 	ProgramData();
 	ProgramData(const ProgramData &);
+	ProgramData &operator=(const ProgramData &);
 	~ProgramData();
 
 private:
@@ -87,8 +87,10 @@ public:
 	void uniform(const std::string &, const Vector4 &);
 	void uniform(const std::string &, const Color &);
 	void uniform4(const std::string &, const float *);
+	void uniform_matrix2(const std::string &, const float *);
+	void uniform_matrix3(const std::string &, const float *);
+	void uniform(const std::string &, const Matrix &);
 	void uniform_matrix4(const std::string &, const float *);
-	void uniform_matrix4(const std::string &, const Matrix &);
 	void uniform1_array(const std::string &, unsigned, const float *);
 	void uniform2_array(const std::string &, unsigned, const float *);
 	void uniform3_array(const std::string &, unsigned, const float *);