X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fprogram.cpp;h=9b5400a38122073af034eb05a17cdef434ad5820;hb=ca174bb730e3484cc9572013186d83bbc39bac99;hp=2c15bc774b248b58f56ae3019c4680b0c09859e8;hpb=fa2b4c8a93ebad2497cacfdeaa9a2c20be486520;p=libs%2Fgl.git

diff --git a/source/core/program.cpp b/source/core/program.cpp
index 2c15bc77..9b5400a3 100644
--- a/source/core/program.cpp
+++ b/source/core/program.cpp
@@ -34,7 +34,7 @@ Program::Program()
 	init();
 }
 
-Program::Program(const std::string &source)
+Program::Program(const string &source)
 {
 	init();
 
@@ -379,7 +379,7 @@ void Program::query_uniforms()
 		}
 	}
 
-	sort(uniforms, &uniform_tag_compare);
+	sort_member(uniforms, &UniformInfo::tag);
 
 	if(ARB_uniform_buffer_object)
 	{
@@ -387,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, Tag(uniform_names[i]), &search<UniformInfo, Tag, &UniformInfo::tag>);
+				uniforms_by_index[i] = &*lower_bound_member(uniforms, Tag(uniform_names[i]), &UniformInfo::tag);
 		query_uniform_blocks(uniforms_by_index);
 	}
 
@@ -400,6 +400,9 @@ void Program::query_uniforms()
 			i->location = glGetUniformLocation(id, i->name.c_str());
 			i->block = &default_block;
 			default_block.uniforms.push_back(&*i);
+
+			if(is_image(i->type) && i->location>=0)
+				glGetUniformiv(id, i->location, &i->binding);
 		}
 
 	default_block.layout_hash = compute_layout_hash(default_block.uniforms);
@@ -470,7 +473,7 @@ void Program::query_uniform_blocks(const vector<UniformInfo *> &uniforms_by_inde
 				uniforms_by_index[query_indices[j]]->matrix_stride = values[j];
 		}
 
-		sort(info.uniforms.begin(), info.uniforms.end(), uniform_location_compare);
+		sort(info.uniforms, uniform_location_compare);
 		info.layout_hash = compute_layout_hash(info.uniforms);
 	}
 }
@@ -534,12 +537,13 @@ void Program::collect_uniforms()
 			info.name = i->name;
 			info.tag = i->name;
 			info.location = i->location;
+			info.binding = i->binding;
 			info.array_size = i->array_size;
 			info.type = i->type;
 		}
 	}
 
-	sort(uniforms, &uniform_tag_compare);
+	sort_member(uniforms, &UniformInfo::tag);
 
 	for(unsigned i=0; i<uniform_blocks.size(); ++i)
 	{
@@ -548,10 +552,11 @@ 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, Tag(*j), &search<UniformInfo, Tag, &UniformInfo::tag>);
+			UniformInfo &uni = *lower_bound_member(uniforms, Tag(*j), &UniformInfo::tag);
 			block.uniforms.push_back(&uni);
 			uni.block = &block;
 		}
+		sort(block.uniforms, uniform_location_compare);
 		block.layout_hash = compute_layout_hash(block.uniforms);
 	}
 
@@ -632,17 +637,6 @@ bool Program::uniform_location_compare(const UniformInfo *uni1, const UniformInf
 	return uni1->location<uni2->location;
 }
 
-bool Program::uniform_tag_compare(const UniformInfo &uni1, const UniformInfo &uni2)
-{
-	return uni1.tag<uni2.tag;
-}
-
-template<typename T, typename A, A T::*member>
-bool Program::search(const T &item, const A &key)
-{
-	return item.*member<key;
-}
-
 string Program::get_info_log() const
 {
 	GLsizei len = get_program_i(id, GL_INFO_LOG_LENGTH);
@@ -662,7 +656,7 @@ 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, Tag(name), &search<UniformInfo, Tag, &UniformInfo::tag>);
+	vector<UniformInfo>::const_iterator i = lower_bound_member(uniforms, Tag(name), &UniformInfo::tag);
 	if(i==uniforms.end() || i->name!=name)
 		throw key_error(name);
 	return *i;
@@ -670,7 +664,7 @@ const Program::UniformInfo &Program::get_uniform_info(const string &name) const
 
 const Program::UniformInfo &Program::get_uniform_info(Tag tag) const
 {
-	vector<UniformInfo>::const_iterator i = lower_bound(uniforms, tag, &search<UniformInfo, Tag, &UniformInfo::tag>);
+	vector<UniformInfo>::const_iterator i = lower_bound_member(uniforms, tag, &UniformInfo::tag);
 	if(i==uniforms.end() || i->tag!=tag)
 		throw key_error(tag);
 	return *i;
@@ -681,19 +675,25 @@ 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, Tag(name), &search<UniformInfo, Tag, &UniformInfo::tag>);
+	vector<UniformInfo>::const_iterator i = lower_bound_member(uniforms, Tag(name), &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>);
+	vector<UniformInfo>::const_iterator i = lower_bound_member(uniforms, tag, &UniformInfo::tag);
 	return i!=uniforms.end() && i->tag==tag && i->block->bind_point<0 ? i->location : -1;
 }
 
+int Program::get_uniform_binding(Tag tag) const
+{
+	vector<UniformInfo>::const_iterator i = lower_bound_member(uniforms, tag, &UniformInfo::tag);
+	return i!=uniforms.end() && i->tag==tag ? i->binding : -1;
+}
+
 const Program::AttributeInfo &Program::get_attribute_info(const string &name) const
 {
-	vector<AttributeInfo>::const_iterator i = lower_bound(attributes, name, &search<AttributeInfo, string, &AttributeInfo::name>);
+	vector<AttributeInfo>::const_iterator i = lower_bound_member(attributes, name, &AttributeInfo::name);
 	if(i==attributes.end() || i->name!=name)
 		throw key_error(name);
 	return *i;
@@ -704,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, &search<AttributeInfo, string, &AttributeInfo::name>);
+	vector<AttributeInfo>::const_iterator i = lower_bound_member(attributes, name, &AttributeInfo::name);
 	return i!=attributes.end() && i->name==name ? i->location : -1;
 }
 
@@ -734,7 +734,8 @@ Program::UniformInfo::UniformInfo():
 	array_size(0),
 	array_stride(0),
 	matrix_stride(0),
-	type(VOID)
+	type(VOID),
+	binding(-1)
 { }