Give Program::Bindings a more generic name

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

diff --git a/source/core/program.h b/source/core/program.h
index 3af4e582f1ba85d7faae39e6331b8b699653542e..6ed2f5716e7e50e0e20371204bb1eb32035a2aa5 100644 (file)
--- a/source/core/program.h
+++ b/source/core/program.h
@@ -8,6 +8,7 @@
 #include "datatype.h"
 #include "gl.h"
 #include "module.h"
+#include "tag.h"
 #include "vertexformat.h"
 
 namespace Msp {
@@ -72,6 +73,8 @@ public:
                unsigned array_stride;
                unsigned matrix_stride;
                DataType type;
+               Tag tag;
+               int binding;
 
                UniformInfo();
        };
@@ -98,9 +101,16 @@ public:
        };
 
 private:
+       struct TransientData
+       {
+               std::map<std::string, unsigned> textures;
+               std::map<std::string, unsigned> blocks;
+       };
+
        unsigned id;
        std::vector<unsigned> stage_ids;
        const Module *module;
+       TransientData *transient;
        bool linked;
        std::vector<UniformBlockInfo> uniform_blocks;
        std::vector<UniformInfo> uniforms;
@@ -153,9 +163,6 @@ private:
        void update_layout_hash();
        static LayoutHash compute_layout_hash(const std::vector<const UniformInfo *> &);
        static bool uniform_location_compare(const UniformInfo *, const UniformInfo *);
-       static bool uniform_name_compare(const UniformInfo &, const UniformInfo &);
-       template<typename T>
-       static bool name_search(const T &, const std::string &);
 public:
        bool is_linked() const { return linked; }
        DEPRECATED std::string get_info_log() const;
@@ -165,7 +172,10 @@ public:
        const UniformBlockInfo &get_uniform_block_info(const std::string &) const;
        const std::vector<UniformInfo> &get_uniforms() const { return uniforms; }
        const UniformInfo &get_uniform_info(const std::string &) const;
+       const UniformInfo &get_uniform_info(Tag) const;
        int get_uniform_location(const std::string &) const;
+       int get_uniform_location(Tag) const;
+       int get_uniform_binding(Tag) const;
        const std::vector<AttributeInfo> &get_attributes() const { return attributes; }
        const AttributeInfo &get_attribute_info(const std::string &) const;
        int get_attribute_location(const std::string &) const;