X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Fprogram.cpp;h=473d8a0b0d2c79e8a147e4b278e02ffbf303cb73;hp=5b357f3966021dc546807aa99def9a855a9f9a99;hb=3a1b9cbe2441ae670a97541dc8ccb0a2860c8302;hpb=3f5e469de3454aee1d1923045fc713329a32cc18

diff --git a/source/core/program.cpp b/source/core/program.cpp
index 5b357f39..473d8a0b 100644
--- a/source/core/program.cpp
+++ b/source/core/program.cpp
@@ -13,6 +13,7 @@
 #include <msp/gl/extensions/arb_uniform_buffer_object.h>
 #include <msp/gl/extensions/arb_vertex_shader.h>
 #include <msp/gl/extensions/ext_gpu_shader4.h>
+#include <msp/gl/extensions/khr_debug.h>
 #include <msp/gl/extensions/nv_non_square_matrices.h>
 #include <msp/io/print.h>
 #include <msp/strings/format.h>
@@ -70,21 +71,23 @@ void Program::init()
 	static Require _req(ARB_shader_objects);
 
 	id = glCreateProgram();
+	fill(stage_ids, stage_ids+MAX_STAGES, 0);
 	module = 0;
-	bindings = 0;
+	transient = 0;
 	linked = false;
 }
 
 Program::~Program()
 {
-	for(vector<unsigned>::iterator i=stage_ids.begin(); i!=stage_ids.end(); ++i)
-		glDeleteShader(*i);
+	for(unsigned i=0; i<MAX_STAGES; ++i)
+		if(stage_ids[i])
+			glDeleteShader(stage_ids[i]);
 	glDeleteProgram(id);
 }
 
 void Program::add_stages(const Module &mod, const map<string, int> &spec_values)
 {
-	if(!stage_ids.empty())
+	if(has_stages())
 		throw invalid_operation("Program::add_stages");
 
 	switch(mod.get_format())
@@ -95,20 +98,37 @@ void Program::add_stages(const Module &mod, const map<string, int> &spec_values)
 	}
 }
 
-unsigned Program::add_stage(GLenum type)
+bool Program::has_stages() const
 {
+	for(unsigned i=0; i<MAX_STAGES; ++i)
+		if(stage_ids[i])
+			return true;
+	return false;
+}
+
+unsigned Program::add_stage(Stage type)
+{
+	GLenum gl_type;
 	switch(type)
 	{
-	case GL_VERTEX_SHADER: { static Require _req(ARB_vertex_shader); } break;
-	case GL_GEOMETRY_SHADER: { static Require _req(ARB_geometry_shader4); } break;
-	case GL_FRAGMENT_SHADER: { static Require _req(ARB_fragment_shader); } break;
+	case VERTEX: { static Require _req(ARB_vertex_shader); gl_type = GL_VERTEX_SHADER; } break;
+	case GEOMETRY: { static Require _req(ARB_geometry_shader4); gl_type = GL_GEOMETRY_SHADER; } break;
+	case FRAGMENT: { static Require _req(ARB_fragment_shader); gl_type = GL_FRAGMENT_SHADER; } break;
 	default: throw invalid_argument("Program::add_stage");
 	}
 
-	unsigned stage_id = glCreateShader(type);
-	stage_ids.push_back(stage_id);
+	if(stage_ids[type])
+		throw invalid_operation("Program::add_stage");
+
+	unsigned stage_id = glCreateShader(gl_type);
+	stage_ids[type] = stage_id;
 	glAttachShader(id, stage_id);
 
+#ifdef DEBUG
+	if(!debug_name.empty() && KHR_debug)
+		set_stage_debug_name(stage_id, type);
+#endif
+
 	return stage_id;
 }
 
@@ -127,43 +147,41 @@ void Program::add_glsl_stages(const GlslModule &mod, const map<string, int> &spe
 #endif
 
 	vector<SL::Stage::Type> stages = compiler.get_stages();
-	for(vector<SL::Stage::Type>::const_iterator i=stages.begin(); i!=stages.end(); ++i)
+	for(SL::Stage::Type st: stages)
 	{
 		unsigned stage_id = 0;
-		switch(*i)
+		switch(st)
 		{
-		case SL::Stage::VERTEX: stage_id = add_stage(GL_VERTEX_SHADER); break;
-		case SL::Stage::GEOMETRY: stage_id = add_stage(GL_GEOMETRY_SHADER); break;
-		case SL::Stage::FRAGMENT: stage_id = add_stage(GL_FRAGMENT_SHADER); break;
+		case SL::Stage::VERTEX: stage_id = add_stage(VERTEX); break;
+		case SL::Stage::GEOMETRY: stage_id = add_stage(GEOMETRY); break;
+		case SL::Stage::FRAGMENT: stage_id = add_stage(FRAGMENT); break;
 		default: throw invalid_operation("Program::add_glsl_stages");
 		}
 
-		string stage_src = compiler.get_stage_glsl(*i);
+		string stage_src = compiler.get_stage_glsl(st);
 		const char *src_ptr = stage_src.data();
 		int src_len = stage_src.size();
 		glShaderSource(stage_id, 1, &src_ptr, &src_len);
 
-		if(*i==SL::Stage::VERTEX)
+		if(st==SL::Stage::VERTEX)
 		{
-			const map<string, unsigned> &attribs = compiler.get_vertex_attributes();
-			for(map<string, unsigned>::const_iterator j=attribs.begin(); j!=attribs.end(); ++j)
-				glBindAttribLocation(id, j->second, j->first.c_str());
+			for(const auto &kvp: compiler.get_vertex_attributes())
+				glBindAttribLocation(id, kvp.second, kvp.first.c_str());
 		}
 
-		if(*i==SL::Stage::FRAGMENT && EXT_gpu_shader4)
+		if(st==SL::Stage::FRAGMENT && EXT_gpu_shader4)
 		{
-			const map<string, unsigned> &frag_outs = compiler.get_fragment_outputs();
-			for(map<string, unsigned>::const_iterator j=frag_outs.begin(); j!=frag_outs.end(); ++j)
-				glBindFragDataLocation(id, j->second, j->first.c_str());
+			for(const auto &kvp: compiler.get_fragment_outputs())
+				glBindFragDataLocation(id, kvp.second, kvp.first.c_str());
 		}
 
 		compile_glsl_stage(stage_id);
 	}
 
-	if(!bindings)
-		bindings = new Bindings;
-	bindings->textures = compiler.get_texture_bindings();
-	bindings->blocks = compiler.get_uniform_block_bindings();
+	if(!transient)
+		transient = new TransientData;
+	transient->textures = compiler.get_texture_bindings();
+	transient->blocks = compiler.get_uniform_block_bindings();
 }
 
 void Program::compile_glsl_stage(unsigned stage_id)
@@ -193,45 +211,48 @@ void Program::add_spirv_stages(const SpirVModule &mod, const map<string, int> &s
 
 	module = &mod;
 
-	const vector<SpirVModule::EntryPoint> &entry_points = mod.get_entry_points();
-	std::set<SpirVModule::Stage> stages;
-	for(vector<SpirVModule::EntryPoint>::const_iterator i=entry_points.begin(); i!=entry_points.end(); ++i)
+	unsigned n_stages = 0;
+	unsigned used_stage_ids[MAX_STAGES];
+	for(const SpirVModule::EntryPoint &e: mod.get_entry_points())
 	{
-		if(stages.count(i->stage))
-			throw invalid_argument("Program::add_spirv_stages");
-
-		switch(i->stage)
+		unsigned stage_id = 0;
+		switch(e.stage)
 		{
-		case SpirVModule::VERTEX: add_stage(GL_VERTEX_SHADER); break;
-		case SpirVModule::GEOMETRY: add_stage(GL_GEOMETRY_SHADER); break;
-		case SpirVModule::FRAGMENT: add_stage(GL_FRAGMENT_SHADER); break;
+		case SpirVModule::VERTEX: stage_id = add_stage(VERTEX); break;
+		case SpirVModule::GEOMETRY: stage_id = add_stage(GEOMETRY); break;
+		case SpirVModule::FRAGMENT: stage_id = add_stage(FRAGMENT); break;
 		default: throw invalid_operation("Program::add_spirv_stages");
 		}
 
-		stages.insert(i->stage);
+		used_stage_ids[n_stages++] = stage_id;
 	}
 
-	const vector<UInt32> &code = mod.get_code();
-	glShaderBinary(stage_ids.size(), &stage_ids[0], GL_SHADER_BINARY_FORMAT_SPIR_V, &code[0], code.size()*4);
+	const vector<uint32_t> &code = mod.get_code();
+	glShaderBinary(n_stages, used_stage_ids, GL_SHADER_BINARY_FORMAT_SPIR_V, &code[0], code.size()*4);
+
+	if(!spec_values.empty() && !transient)
+		transient = new TransientData;
 
-	const vector<SpirVModule::SpecConstant> &spec_consts = mod.get_spec_constants();
+	const vector<SpirVModule::Constant> &spec_consts = mod.get_spec_constants();
 	vector<unsigned> spec_id_array;
 	vector<unsigned> spec_value_array;
 	spec_id_array.reserve(spec_consts.size());
 	spec_value_array.reserve(spec_consts.size());
-	for(vector<SpirVModule::SpecConstant>::const_iterator i=spec_consts.begin(); i!=spec_consts.end(); ++i)
+	for(const SpirVModule::Constant &c: spec_consts)
 	{
-		map<string, int>::const_iterator j = spec_values.find(i->name);
-		if(j!=spec_values.end())
+		auto i = spec_values.find(c.name);
+		if(i!=spec_values.end())
 		{
-			spec_id_array.push_back(i->constant_id);
-			spec_value_array.push_back(j->second);
+			spec_id_array.push_back(c.constant_id);
+			spec_value_array.push_back(i->second);
+			transient->spec_values[c.constant_id] = i->second;
 		}
 	}
 
-	vector<SpirVModule::EntryPoint>::const_iterator j=entry_points.begin();
-	for(vector<unsigned>::const_iterator i=stage_ids.begin(); i!=stage_ids.end(); ++i, ++j)
-		glSpecializeShader(*i, j->name.c_str(), spec_id_array.size(), &spec_id_array[0], &spec_value_array[0]);
+	auto j = mod.get_entry_points().begin();
+	for(unsigned i=0; i<MAX_STAGES; ++i)
+		if(stage_ids[i])
+			glSpecializeShader(stage_ids[i], j->name.c_str(), spec_id_array.size(), &spec_id_array[0], &spec_value_array[0]);
 }
 
 #pragma GCC diagnostic push
@@ -241,7 +262,17 @@ void Program::attach_shader(Shader &shader)
 	unsigned shader_id = shader.steal_id();
 	if(!shader_id)
 		throw invalid_argument("Program::attach_shader");
-	stage_ids.push_back(shader_id);
+
+	int type;
+	glGetShaderiv(shader_id, GL_SHADER_TYPE, &type);
+	switch(type)
+	{
+	case GL_VERTEX_SHADER: stage_ids[VERTEX] = shader_id; break;
+	case GL_GEOMETRY_SHADER: stage_ids[GEOMETRY] = shader_id; break;
+	case GL_FRAGMENT_SHADER: stage_ids[FRAGMENT] = shader_id; break;
+	}
+
+	glAttachShader(id, shader_id);
 	compile_glsl_stage(shader_id);
 }
 
@@ -281,7 +312,7 @@ void Program::bind_fragment_data(unsigned index, const string &name)
 
 void Program::link()
 {
-	if(stage_ids.empty())
+	if(!has_stages())
 		throw invalid_operation("Program::link");
 
 	uniforms.clear();
@@ -309,33 +340,31 @@ void Program::link()
 	{
 		query_uniforms();
 		query_attributes();
-		if(bindings)
+		if(transient)
 		{
 			for(unsigned i=0; i<uniform_blocks.size(); ++i)
 			{
-				map<string, unsigned>::const_iterator j = bindings->blocks.find(uniform_blocks[i].name);
-				if(j!=bindings->blocks.end())
+				auto j = transient->blocks.find(uniform_blocks[i].name);
+				if(j!=transient->blocks.end())
 				{
 					glUniformBlockBinding(id, i, j->second);
 					uniform_blocks[i].bind_point = j->second;
 				}
 			}
 
-			Conditional<BindRestore> _bind(!ARB_separate_shader_objects, this);
-			for(map<string, unsigned>::const_iterator i=bindings->textures.begin(); i!=bindings->textures.end(); ++i)
+			if(!ARB_separate_shader_objects)
+				glUseProgram(id);
+			for(const auto &kvp: transient->textures)
 			{
-				int location = get_uniform_location(i->first);
+				int location = get_uniform_location(kvp.first);
 				if(location>=0)
 				{
 					if(ARB_separate_shader_objects)
-						glProgramUniform1i(id, location, i->second);
+						glProgramUniform1i(id, location, kvp.second);
 					else
-						glUniform1i(location, i->second);
+						glUniform1i(location, kvp.second);
 				}
 			}
-
-			delete bindings;
-			bindings = 0;
 		}
 	}
 	else if(module->get_format()==Module::SPIR_V)
@@ -344,10 +373,13 @@ void Program::link()
 		collect_attributes();
 	}
 
-	for(vector<UniformInfo>::const_iterator i=uniforms.begin(); i!=uniforms.end(); ++i)
-		require_type(i->type);
-	for(vector<AttributeInfo>::const_iterator i=attributes.begin(); i!=attributes.end(); ++i)
-		require_type(i->type);
+	delete transient;
+	transient = 0;
+
+	for(const UniformInfo &u: uniforms)
+		require_type(u.type);
+	for(const AttributeInfo &a: attributes)
+		require_type(a.type);
 }
 
 void Program::query_uniforms()
@@ -394,12 +426,15 @@ void Program::query_uniforms()
 	uniform_blocks.push_back(UniformBlockInfo());
 	UniformBlockInfo &default_block = uniform_blocks.back();
 
-	for(vector<UniformInfo>::iterator i=uniforms.begin(); i!=uniforms.end(); ++i)
-		if(!i->block)
+	for(UniformInfo &u: uniforms)
+		if(!u.block)
 		{
-			i->location = glGetUniformLocation(id, i->name.c_str());
-			i->block = &default_block;
-			default_block.uniforms.push_back(&*i);
+			u.location = glGetUniformLocation(id, u.name.c_str());
+			u.block = &default_block;
+			default_block.uniforms.push_back(&u);
+
+			if(is_image(u.type) && u.location>=0)
+				glGetUniformiv(id, u.location, &u.binding);
 		}
 
 	default_block.layout_hash = compute_layout_hash(default_block.uniforms);
@@ -431,12 +466,12 @@ void Program::query_uniform_blocks(const vector<UniformInfo *> &uniforms_by_inde
 		glGetActiveUniformBlockiv(id, i, GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS, &value);
 		vector<int> indices(value);
 		glGetActiveUniformBlockiv(id, i, GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES, &indices[0]);
-		for(vector<int>::iterator j=indices.begin(); j!=indices.end(); ++j)
+		for(int j: indices)
 		{
-			if(!uniforms_by_index[*j])
+			if(!uniforms_by_index[j])
 				throw logic_error("Program::link");
-			info.uniforms.push_back(uniforms_by_index[*j]);
-			uniforms_by_index[*j]->block = &info;
+			info.uniforms.push_back(uniforms_by_index[j]);
+			uniforms_by_index[j]->block = &info;
 		}
 
 		vector<unsigned> query_indices(indices.begin(), indices.end());
@@ -446,9 +481,9 @@ void Program::query_uniform_blocks(const vector<UniformInfo *> &uniforms_by_inde
 			uniforms_by_index[indices[j]]->offset = values[j];
 
 		query_indices.clear();
-		for(vector<int>::iterator j=indices.begin(); j!=indices.end(); ++j)
-			if(uniforms_by_index[*j]->array_size>1)
-				query_indices.push_back(*j);
+		for(int j: indices)
+			if(uniforms_by_index[j]->array_size>1)
+				query_indices.push_back(j);
 		if(!query_indices.empty())
 		{
 			glGetActiveUniformsiv(id, query_indices.size(), &query_indices[0], GL_UNIFORM_ARRAY_STRIDE, &values[0]);
@@ -457,11 +492,11 @@ void Program::query_uniform_blocks(const vector<UniformInfo *> &uniforms_by_inde
 		}
 
 		query_indices.clear();
-		for(vector<int>::iterator j=indices.begin(); j!=indices.end(); ++j)
+		for(int j: indices)
 		{
-			DataType t = uniforms_by_index[*j]->type;
+			DataType t = uniforms_by_index[j]->type;
 			if(is_matrix(t))
-				query_indices.push_back(*j);
+				query_indices.push_back(j);
 		}
 		if(!query_indices.empty())
 		{
@@ -509,33 +544,33 @@ void Program::collect_uniforms()
 	uniform_blocks.push_back(UniformBlockInfo());
 	vector<vector<string> > block_uniform_names(1);
 
-	const vector<SpirVModule::Variable> &variables = mod.get_variables();
-	for(vector<SpirVModule::Variable>::const_iterator i=variables.begin(); i!=variables.end(); ++i)
+	for(const SpirVModule::Variable &v: mod.get_variables())
 	{
-		if(i->storage==SpirVModule::UNIFORM && i->struct_type)
+		if(v.storage==SpirVModule::UNIFORM && v.struct_type)
 		{
 			uniform_blocks.push_back(UniformBlockInfo());
 			UniformBlockInfo &info = uniform_blocks.back();
-			info.name = i->struct_type->name;
-			info.bind_point = i->binding;
-			info.data_size = i->struct_type->size;
+			info.name = v.struct_type->name;
+			info.bind_point = v.binding;
+			info.data_size = v.struct_type->size;
 
 			string prefix;
-			if(!i->name.empty())
-				prefix = i->struct_type->name+".";
+			if(!v.name.empty())
+				prefix = v.struct_type->name+".";
 			block_uniform_names.push_back(vector<string>());
-			collect_block_uniforms(*i->struct_type, prefix, 0, block_uniform_names.back());
+			collect_block_uniforms(*v.struct_type, prefix, 0, block_uniform_names.back());
 		}
-		else if(i->storage==SpirVModule::UNIFORM_CONSTANT && i->location>=0)
+		else if(v.storage==SpirVModule::UNIFORM_CONSTANT && v.location>=0)
 		{
-			block_uniform_names[0].push_back(i->name);
+			block_uniform_names[0].push_back(v.name);
 			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;
+			info.name = v.name;
+			info.tag = v.name;
+			info.location = v.location;
+			info.binding = v.binding;
+			info.array_size = v.array_size;
+			info.type = v.type;
 		}
 	}
 
@@ -544,14 +579,14 @@ void Program::collect_uniforms()
 	for(unsigned i=0; i<uniform_blocks.size(); ++i)
 	{
 		UniformBlockInfo &block = uniform_blocks[i];
-		const vector<string> &names = block_uniform_names[i];
-		for(vector<string>::const_iterator j=names.begin(); j!=names.end(); ++j)
+		for(const string &n: block_uniform_names[i])
 		{
 			// The element is already known to be present
-			UniformInfo &uni = *lower_bound_member(uniforms, Tag(*j), &UniformInfo::tag);
+			UniformInfo &uni = *lower_bound_member(uniforms, Tag(n), &UniformInfo::tag);
 			block.uniforms.push_back(&uni);
 			uni.block = &block;
 		}
+		sort(block.uniforms, uniform_location_compare);
 		block.layout_hash = compute_layout_hash(block.uniforms);
 	}
 
@@ -560,32 +595,44 @@ void Program::collect_uniforms()
 
 void Program::collect_block_uniforms(const SpirVModule::Structure &strct, const string &prefix, unsigned base_offset, vector<string> &uniform_names)
 {
-	for(vector<SpirVModule::StructMember>::const_iterator i=strct.members.begin(); i!=strct.members.end(); ++i)
+	for(const SpirVModule::StructMember &m: strct.members)
 	{
-		unsigned offset = base_offset+i->offset;
-		if(i->struct_type)
+		unsigned offset = base_offset+m.offset;
+		if(m.struct_type)
 		{
-			if(i->array_size)
+			unsigned array_size = m.array_size;
+			if(m.array_size_spec)
 			{
-				for(unsigned j=0; j<i->array_size; ++j, offset+=i->array_stride)
-					collect_block_uniforms(*i->struct_type, format("%s%s[%d].", prefix, i->name, j), offset, uniform_names);
+				array_size = m.array_size_spec->i_value;
+				if(transient)
+				{
+					auto j = transient->spec_values.find(m.array_size_spec->constant_id);
+					if(j!=transient->spec_values.end())
+						array_size = j->second;
+				}
+			}
+
+			if(array_size)
+			{
+				for(unsigned j=0; j<array_size; ++j, offset+=m.array_stride)
+					collect_block_uniforms(*m.struct_type, format("%s%s[%d].", prefix, m.name, j), offset, uniform_names);
 			}
 			else
-				collect_block_uniforms(*i->struct_type, prefix+i->name+".", offset, uniform_names);
+				collect_block_uniforms(*m.struct_type, prefix+m.name+".", offset, uniform_names);
 		}
 		else
 		{
-			string name = prefix+i->name;
+			string name = prefix+m.name;
 			uniform_names.push_back(name);
 			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;
-			info.matrix_stride = i->matrix_stride;
-			info.type = i->type;
+			info.array_size = m.array_size;
+			info.array_stride = m.array_stride;
+			info.matrix_stride = m.matrix_stride;
+			info.type = m.type;
 		}
 	}
 }
@@ -594,19 +641,18 @@ void Program::collect_attributes()
 {
 	const SpirVModule &mod = static_cast<const SpirVModule &>(*module);
 
-	const vector<SpirVModule::EntryPoint> &entry_points = mod.get_entry_points();
-	for(vector<SpirVModule::EntryPoint>::const_iterator i=entry_points.begin(); i!=entry_points.end(); ++i)
-		if(i->stage==SpirVModule::VERTEX && i->name=="main")
+	for(const SpirVModule::EntryPoint &e: mod.get_entry_points())
+		if(e.stage==SpirVModule::VERTEX && e.name=="main")
 		{
-			for(vector<const SpirVModule::Variable *>::const_iterator j=i->globals.begin(); j!=i->globals.end(); ++j)
-				if((*j)->storage==SpirVModule::INPUT)
+			for(const SpirVModule::Variable *v: e.globals)
+				if(v->storage==SpirVModule::INPUT)
 				{
 					attributes.push_back(AttributeInfo());
 					AttributeInfo &info = attributes.back();
-					info.name = (*j)->name;
-					info.location = (*j)->location;
-					info.array_size = (*j)->array_size;
-					info.type = (*j)->type;
+					info.name = v->name;
+					info.location = v->location;
+					info.array_size = v->array_size;
+					info.type = v->type;
 				}
 		}
 }
@@ -614,16 +660,16 @@ void Program::collect_attributes()
 void Program::update_layout_hash()
 {
 	string layout_descriptor;
-	for(vector<UniformBlockInfo>::const_iterator i=uniform_blocks.begin(); i!=uniform_blocks.end(); ++i)
-		layout_descriptor += format("%d:%x\n", i->bind_point, i->layout_hash);
+	for(const UniformBlockInfo &b: uniform_blocks)
+		layout_descriptor += format("%d:%x\n", b.bind_point, b.layout_hash);
 	uniform_layout_hash = hash32(layout_descriptor);
 }
 
 Program::LayoutHash Program::compute_layout_hash(const vector<const UniformInfo *> &uniforms)
 {
 	string layout_descriptor;
-	for(vector<const UniformInfo *>::const_iterator i = uniforms.begin(); i!=uniforms.end(); ++i)
-		layout_descriptor += format("%d:%s:%x:%d\n", (*i)->location, (*i)->name, (*i)->type, (*i)->array_size);
+	for(const UniformInfo *u: uniforms)
+		layout_descriptor += format("%d:%s:%x:%d\n", u->location, u->name, u->type, u->array_size);
 	return hash32(layout_descriptor);
 }
 
@@ -643,15 +689,15 @@ string Program::get_info_log() const
 
 const Program::UniformBlockInfo &Program::get_uniform_block_info(const string &name) const
 {
-	for(vector<UniformBlockInfo>::const_iterator i=uniform_blocks.begin(); i!=uniform_blocks.end(); ++i)
-		if(i->name==name)
-			return *i;
-	throw key_error(name);
+	auto i = find_member(uniform_blocks, name, &UniformBlockInfo::name);
+	if(i==uniform_blocks.end())
+		throw key_error(name);
+	return *i;
 }
 
 const Program::UniformInfo &Program::get_uniform_info(const string &name) const
 {
-	vector<UniformInfo>::const_iterator i = lower_bound_member(uniforms, Tag(name), &UniformInfo::tag);
+	auto i = lower_bound_member(uniforms, Tag(name), &UniformInfo::tag);
 	if(i==uniforms.end() || i->name!=name)
 		throw key_error(name);
 	return *i;
@@ -659,7 +705,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_member(uniforms, tag, &UniformInfo::tag);
+	auto i = lower_bound_member(uniforms, tag, &UniformInfo::tag);
 	if(i==uniforms.end() || i->tag!=tag)
 		throw key_error(tag);
 	return *i;
@@ -670,19 +716,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_member(uniforms, Tag(name), &UniformInfo::tag);
+	auto 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_member(uniforms, tag, &UniformInfo::tag);
+	auto 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
+{
+	auto 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_member(attributes, name, &AttributeInfo::name);
+	auto i = lower_bound_member(attributes, name, &AttributeInfo::name);
 	if(i==attributes.end() || i->name!=name)
 		throw key_error(name);
 	return *i;
@@ -693,27 +745,35 @@ 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_member(attributes, name, &AttributeInfo::name);
+	auto i = lower_bound_member(attributes, name, &AttributeInfo::name);
 	return i!=attributes.end() && i->name==name ? i->location : -1;
 }
 
-void Program::bind() const
+void Program::set_debug_name(const string &name)
 {
-	if(!linked)
-		throw invalid_operation("Program::bind");
-
-	if(!set_current(this))
-		return;
-
-	glUseProgram(id);
+#ifdef DEBUG
+	debug_name = name;
+	if(KHR_debug)
+	{
+		glObjectLabel(GL_PROGRAM, id, name.size(), name.c_str());
+		for(unsigned i=0; i<MAX_STAGES; ++i)
+			if(stage_ids[i])
+				set_stage_debug_name(stage_ids[i], static_cast<Stage>(i));
+	}
+#else
+	(void)name;
+#endif
 }
 
-void Program::unbind()
+void Program::set_stage_debug_name(unsigned stage_id, Stage type)
 {
-	if(!set_current(0))
-		return;
-
-	glUseProgram(0);
+#ifdef DEBUG
+	static const char *const suffixes[] = { " [VS]", " [GS]", " [FS]" };
+	string name = debug_name+suffixes[type];
+	glObjectLabel(GL_SHADER, stage_id, name.size(), name.c_str());
+#else
+	(void)stage_id; (void)type;
+#endif
 }
 
 
@@ -723,7 +783,8 @@ Program::UniformInfo::UniformInfo():
 	array_size(0),
 	array_stride(0),
 	matrix_stride(0),
-	type(VOID)
+	type(VOID),
+	binding(-1)
 { }