Add the specializations for non-square matrix uniforms

[libs/gl.git] / source / uniform.h

diff --git a/source/uniform.h b/source/uniform.h
index 156fe67623ec27bb4afd3334fac24dcc1bc77372..ad2d88cc477715021baea7a4f7df4798b43173e7 100644 (file)
--- 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,8 +124,15 @@ public:
        { return new UniformMatrix(value); }
 };
 
+// The naming of these types follows the OpenGL convention of columns x rows
 typedef UniformMatrix<float, 2, 2> UniformMatrix2x2f;
+typedef UniformMatrix<float, 2, 3> UniformMatrix3x2f;
+typedef UniformMatrix<float, 2, 4> UniformMatrix4x2f;
+typedef UniformMatrix<float, 3, 2> UniformMatrix2x3f;
 typedef UniformMatrix<float, 3, 3> UniformMatrix3x3f;
+typedef UniformMatrix<float, 3, 4> UniformMatrix4x3f;
+typedef UniformMatrix<float, 4, 2> UniformMatrix2x4f;
+typedef UniformMatrix<float, 4, 3> UniformMatrix3x4f;
 typedef UniformMatrix<float, 4, 4> UniformMatrix4x4f;
 
 
@@ -144,6 +154,11 @@ public:
                std::copy(vp, vp+elemsize*size, values);
        }
 
+       ~UniformArray()
+       {
+               delete[] values;
+       }
+
        virtual void apply(int index) const
        { T::apply(index, size, values); }