Query information about uniform blocks when linking a Program

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

diff --git a/source/program.h b/source/program.h
index ddfc828c5ceddcbbc6e2758318ca78ec0e3512be..40a7a33b143a39aa98f779b6e1d68a8285d54a7c 100644 (file)
--- a/source/program.h
+++ b/source/program.h
@@ -54,19 +54,32 @@ public:
        struct UniformInfo
        {
                std::string name;
-               int location;
-               int size;
+               unsigned location;
+               unsigned size;
+               unsigned array_stride;
+               unsigned matrix_stride;
                GLenum type;
        };
 
+       struct UniformBlockInfo
+       {
+               std::string name;
+               unsigned data_size;
+               unsigned bind_point;
+               std::vector<const UniformInfo *> uniforms;
+               unsigned layout_hash;
+       };
+
        typedef std::list<Shader *> ShaderList;
        typedef std::map<std::string, UniformInfo> UniformMap;
+       typedef std::map<std::string, UniformBlockInfo> UniformBlockMap;
 
 private:
        unsigned id;
        ShaderList shaders;
        ShaderList owned_data;
        bool linked;
+       UniformBlockMap uniform_blocks;
        UniformMap uniforms;
        unsigned uniform_layout_hash;
 
@@ -87,14 +100,24 @@ private:
        static std::string process_standard_source(const char **, const std::string &);
 public:
        const ShaderList &get_shaders() const { return shaders; }
+
        void bind_attribute(unsigned, const std::string &);
+
        void link();
+private:
+       static unsigned compute_layout_hash(const std::vector<const UniformInfo *> &);
+public:
        bool is_linked() const { return linked; }
        std::string get_info_log() const;
-       void bind() const;
+
        unsigned get_uniform_layout_hash() const { return uniform_layout_hash; }
+       const UniformBlockMap &get_uniform_blocks() const { return uniform_blocks; }
+       const UniformBlockInfo &get_uniform_block_info(const std::string &) const;
+       const UniformMap &get_uniforms() const { return uniforms; }
+       const UniformInfo &get_uniform_info(const std::string &) const;
        int get_uniform_location(const std::string &) const;
 
+       void bind() const;
        static void unbind();
 };