Use Tag to identify uniforms in Program and ProgramData

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

diff --git a/source/core/program.h b/source/core/program.h
index 6613a13451a8493224e4fe77f26dc6f17fcdcb46..939521dcd804866a65f52d544b6aa722e773c798 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,7 @@ public:
                unsigned array_stride;
                unsigned matrix_stride;
                DataType type;
+               Tag tag;
 
                UniformInfo();
        };
@@ -160,9 +162,9 @@ 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 &);
+       static bool uniform_tag_compare(const UniformInfo &, const UniformInfo &);
+       template<typename T, typename A, A T::*>
+       static bool search(const T &, const A &);
 public:
        bool is_linked() const { return linked; }
        DEPRECATED std::string get_info_log() const;
@@ -172,7 +174,9 @@ 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;
        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;