Use Tag to identify uniforms in Program and ProgramData

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

diff --git a/source/core/program.cpp b/source/core/program.cpp
index dd38075a874637b761e0efadafe07af9347eafe2..2c15bc774b248b58f56ae3019c4680b0c09859e8 100644 (file)
--- a/source/core/program.cpp
+++ b/source/core/program.cpp
@@ -372,13 +372,14 @@ void Program::query_uniforms()
                        uniforms.push_back(UniformInfo());
                        UniformInfo &info = uniforms.back();
                        info.name = name;
+                       info.tag = name;
                        info.array_size = size;
                        info.type = from_gl_type(type);
                        uniform_names[i] = name;
                }
        }
 
-       sort(uniforms, &uniform_name_compare);
+       sort(uniforms, &uniform_tag_compare);
 
        if(ARB_uniform_buffer_object)
        {
@@ -386,7 +387,7 @@ void Program::query_uniforms()
                for(unsigned i=0; i<count; ++i)
                        if(!uniform_names[i].empty())
                                // The element is already known to be present
-                               uniforms_by_index[i] = &*lower_bound(uniforms, uniform_names[i], &name_search<UniformInfo>);
+                               uniforms_by_index[i] = &*lower_bound(uniforms, Tag(uniform_names[i]), &search<UniformInfo, Tag, &UniformInfo::tag>);
                query_uniform_blocks(uniforms_by_index);
        }
 
@@ -531,13 +532,14 @@ void Program::collect_uniforms()
                        uniforms.push_back(UniformInfo());
                        UniformInfo &info = uniforms.back();
                        info.name = i->name;
+                       info.tag = i->name;
                        info.location = i->location;
                        info.array_size = i->array_size;
                        info.type = i->type;
                }
        }
 
-       sort(uniforms, &uniform_name_compare);
+       sort(uniforms, &uniform_tag_compare);
 
        for(unsigned i=0; i<uniform_blocks.size(); ++i)
        {
@@ -546,7 +548,7 @@ void Program::collect_uniforms()
                for(vector<string>::const_iterator j=names.begin(); j!=names.end(); ++j)
                {
                        // The element is already known to be present
-                       UniformInfo &uni = *lower_bound(uniforms, *j, &name_search<UniformInfo>);
+                       UniformInfo &uni = *lower_bound(uniforms, Tag(*j), &search<UniformInfo, Tag, &UniformInfo::tag>);
                        block.uniforms.push_back(&uni);
                        uni.block = &block;
                }
@@ -578,6 +580,7 @@ void Program::collect_block_uniforms(const SpirVModule::Structure &strct, const
                        uniforms.push_back(UniformInfo());
                        UniformInfo &info = uniforms.back();
                        info.name = name;
+                       info.tag = name;
                        info.offset = offset;
                        info.array_size = i->array_size;
                        info.array_stride = i->array_stride;
@@ -629,15 +632,15 @@ bool Program::uniform_location_compare(const UniformInfo *uni1, const UniformInf
        return uni1->location<uni2->location;
 }
 
-bool Program::uniform_name_compare(const UniformInfo &uni1, const UniformInfo &uni2)
+bool Program::uniform_tag_compare(const UniformInfo &uni1, const UniformInfo &uni2)
 {
-       return uni1.name<uni2.name;
+       return uni1.tag<uni2.tag;
 }
 
-template<typename T>
-bool Program::name_search(const T &item, const string &name)
+template<typename T, typename A, A T::*member>
+bool Program::search(const T &item, const A &key)
 {
-       return item.name<name;
+       return item.*member<key;
 }
 
 string Program::get_info_log() const
@@ -659,24 +662,38 @@ const Program::UniformBlockInfo &Program::get_uniform_block_info(const string &n
 
 const Program::UniformInfo &Program::get_uniform_info(const string &name) const
 {
-       vector<UniformInfo>::const_iterator i = lower_bound(uniforms, name, &name_search<UniformInfo>);
+       vector<UniformInfo>::const_iterator i = lower_bound(uniforms, Tag(name), &search<UniformInfo, Tag, &UniformInfo::tag>);
        if(i==uniforms.end() || i->name!=name)
                throw key_error(name);
        return *i;
 }
 
+const Program::UniformInfo &Program::get_uniform_info(Tag tag) const
+{
+       vector<UniformInfo>::const_iterator i = lower_bound(uniforms, tag, &search<UniformInfo, Tag, &UniformInfo::tag>);
+       if(i==uniforms.end() || i->tag!=tag)
+               throw key_error(tag);
+       return *i;
+}
+
 int Program::get_uniform_location(const string &name) const
 {
        if(name[name.size()-1]==']')
                throw invalid_argument("Program::get_uniform_location");
 
-       vector<UniformInfo>::const_iterator i = lower_bound(uniforms, name, &name_search<UniformInfo>);
+       vector<UniformInfo>::const_iterator i = lower_bound(uniforms, Tag(name), &search<UniformInfo, Tag, &UniformInfo::tag>);
        return i!=uniforms.end() && i->name==name && i->block->bind_point<0 ? i->location : -1;
 }
 
+int Program::get_uniform_location(Tag tag) const
+{
+       vector<UniformInfo>::const_iterator i = lower_bound(uniforms, tag, &search<UniformInfo, Tag, &UniformInfo::tag>);
+       return i!=uniforms.end() && i->tag==tag && i->block->bind_point<0 ? i->location : -1;
+}
+
 const Program::AttributeInfo &Program::get_attribute_info(const string &name) const
 {
-       vector<AttributeInfo>::const_iterator i = lower_bound(attributes, name, &name_search<AttributeInfo>);
+       vector<AttributeInfo>::const_iterator i = lower_bound(attributes, name, &search<AttributeInfo, string, &AttributeInfo::name>);
        if(i==attributes.end() || i->name!=name)
                throw key_error(name);
        return *i;
@@ -687,7 +704,7 @@ int Program::get_attribute_location(const string &name) const
        if(name[name.size()-1]==']')
                throw invalid_argument("Program::get_attribute_location");
 
-       vector<AttributeInfo>::const_iterator i = lower_bound(attributes, name, &name_search<AttributeInfo>);
+       vector<AttributeInfo>::const_iterator i = lower_bound(attributes, name, &search<AttributeInfo, string, &AttributeInfo::name>);
        return i!=attributes.end() && i->name==name ? i->location : -1;
 }