X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Funiform.h;h=8dc43ab5791a7e48b8055297003d5eb3c7f77e4b;hp=f8a59f2a441e5fd2b3ec2ba55cdd604b50ab0477;hb=679f0fd1f3504b5536f18943e188606887f3785c;hpb=8eb9a8d90e5597154dab666481037b306b7bbca2

diff --git a/source/uniform.h b/source/uniform.h
index f8a59f2a..8dc43ab5 100644
--- a/source/uniform.h
+++ b/source/uniform.h
@@ -84,8 +84,11 @@ public:
 	{ return new UniformVector(value); }
 };
 
+typedef UniformVector<int, 2> Uniform2i;
 typedef UniformVector<float, 2> Uniform2f;
+typedef UniformVector<int, 3> Uniform3i;
 typedef UniformVector<float, 3> Uniform3f;
+typedef UniformVector<int, 4> Uniform4i;
 typedef UniformVector<float, 4> Uniform4f;
 
 
@@ -121,6 +124,8 @@ public:
 	{ return new UniformMatrix(value); }
 };
 
+typedef UniformMatrix<float, 2, 2> UniformMatrix2x2f;
+typedef UniformMatrix<float, 3, 3> UniformMatrix3x3f;
 typedef UniformMatrix<float, 4, 4> UniformMatrix4x4f;
 
 
@@ -142,6 +147,11 @@ public:
 		std::copy(vp, vp+elemsize*size, values);
 	}
 
+	~UniformArray()
+	{
+		delete[] values;
+	}
+
 	virtual void apply(int index) const
 	{ T::apply(index, size, values); }