Add support for non-square matrix uniforms

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

diff --git a/source/program.h b/source/program.h
index 826a49637bf9535caf0e30af2c3cdb7ca5ed222b..8c1356c2678a7ec306ddfe60368d12dd5805caac 100644 (file)
--- a/source/program.h
+++ b/source/program.h
@@ -59,9 +59,18 @@ public:
                LayoutHash layout_hash;
        };
 
+       struct AttributeInfo
+       {
+               std::string name;
+               unsigned location;
+               unsigned size;
+               GLenum type;
+       };
+
        typedef std::vector<Shader *> ShaderList;
        typedef std::map<std::string, UniformInfo> UniformMap;
        typedef std::map<std::string, UniformBlockInfo> UniformBlockMap;
+       typedef std::map<std::string, AttributeInfo> AttributeMap;
 
 private:
        unsigned id;
@@ -71,7 +80,7 @@ private:
        UniformBlockMap uniform_blocks;
        UniformMap uniforms;
        LayoutHash uniform_layout_hash;
-       bool legacy_vars;
+       AttributeMap attributes;
 
 public:
        /// Constructs an empty Program with no Shaders attached.
@@ -102,6 +111,7 @@ public:
 
        void link();
 private:
+       static void require_type(GLenum);
        void query_uniforms();
        void query_uniform_blocks(const std::vector<UniformInfo *> &);
        void query_attributes();
@@ -117,8 +127,9 @@ public:
        const UniformMap &get_uniforms() const { return uniforms; }
        const UniformInfo &get_uniform_info(const std::string &) const;
        int get_uniform_location(const std::string &) const;
-
-       bool uses_legacy_variables() const { return legacy_vars; }
+       const AttributeMap &get_attributes() const { return attributes; }
+       const AttributeInfo &get_attribute_info(const std::string &) const;
+       int get_attribute_location(const std::string &) const;
 
        void bind() const;
        static void unbind();