X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramdata.h;h=6e4b53fe10374bf73f462acbfb08fef19bf455e3;hb=437609f708f2918067ec64f6d02261d113b1cac0;hp=0f752191d586e1c0b00eca480c5693c2e269a3cd;hpb=5ae4b0008b25072b5716f0cb585133315625a661;p=libs%2Fgl.git

diff --git a/source/programdata.h b/source/programdata.h
index 0f752191..6e4b53fe 100644
--- a/source/programdata.h
+++ b/source/programdata.h
@@ -3,6 +3,7 @@
 
 #include <map>
 #include <msp/datafile/objectloader.h>
+#include "matrix.h"
 #include "program.h"
 #include "vector.h"
 
@@ -10,7 +11,6 @@ namespace Msp {
 namespace GL {
 
 class Buffer;
-class Matrix;
 class Uniform;
 class UniformBlock;
 struct Color;
@@ -110,10 +110,13 @@ public:
 	void uniform(const std::string &, const Vector4 &);
 	void uniform(const std::string &, const Color &);
 	void uniform4(const std::string &, const float *);
+	void uniform(const std::string &, const LinAl::Matrix<float, 2, 2> &);
 	void uniform_matrix2(const std::string &, const float *);
+	void uniform(const std::string &, const LinAl::Matrix<float, 3, 3> &);
 	void uniform_matrix3(const std::string &, const float *);
 	void uniform(const std::string &, const Matrix &);
 	void uniform_matrix4(const std::string &, const float *);
+	void uniform1_array(const std::string &, unsigned, const int *);
 	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 *);