Add support for non-square matrix uniforms

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

diff --git a/source/programdata.h b/source/programdata.h
index 08b117b4fbc2712842bfd2967f23201a29b18bcc..605b41b1359c0da3146b05d2b78e9cf7dfb96e9f 100644 (file)
--- a/source/programdata.h
+++ b/source/programdata.h
@@ -181,8 +181,20 @@ public:
        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, 2, 3> &);
+       void uniform_matrix3x2(const std::string &, const float *);
+       void uniform(const std::string &, const LinAl::Matrix<float, 2, 4> &);
+       void uniform_matrix4x2(const std::string &, const float *);
+       void uniform(const std::string &, const LinAl::Matrix<float, 3, 2> &);
+       void uniform_matrix2x3(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 LinAl::Matrix<float, 3, 4> &);
+       void uniform_matrix4x3(const std::string &, const float *);
+       void uniform(const std::string &, const LinAl::Matrix<float, 4, 2> &);
+       void uniform_matrix2x4(const std::string &, const float *);
+       void uniform(const std::string &, const LinAl::Matrix<float, 4, 3> &);
+       void uniform_matrix3x4(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 *);
@@ -194,7 +206,13 @@ public:
        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_matrix3x2_array(const std::string &, unsigned, const float *);
+       void uniform_matrix4x2_array(const std::string &, unsigned, const float *);
+       void uniform_matrix2x3_array(const std::string &, unsigned, const float *);
        void uniform_matrix3_array(const std::string &, unsigned, const float *);
+       void uniform_matrix4x3_array(const std::string &, unsigned, const float *);
+       void uniform_matrix2x4_array(const std::string &, unsigned, const float *);
+       void uniform_matrix3x4_array(const std::string &, unsigned, const float *);
        void uniform_matrix4_array(const std::string &, unsigned, const float *);
        void remove_uniform(const std::string &);