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

diff --git a/source/core/program.cpp b/source/core/program.cpp
index 999a94ad..5b357f39 100644
--- a/source/core/program.cpp
+++ b/source/core/program.cpp
@@ -3,10 +3,12 @@
 #include <msp/core/algorithm.h>
 #include <msp/core/hash.h>
 #include <msp/core/maputils.h>
+#include <msp/core/raii.h>
 #include <msp/gl/extensions/arb_es2_compatibility.h>
 #include <msp/gl/extensions/arb_fragment_shader.h>
 #include <msp/gl/extensions/arb_gl_spirv.h>
 #include <msp/gl/extensions/arb_geometry_shader4.h>
+#include <msp/gl/extensions/arb_separate_shader_objects.h>
 #include <msp/gl/extensions/arb_shader_objects.h>
 #include <msp/gl/extensions/arb_uniform_buffer_object.h>
 #include <msp/gl/extensions/arb_vertex_shader.h>
@@ -32,7 +34,7 @@ Program::Program()
 	init();
 }
 
-Program::Program(const std::string &source)
+Program::Program(const string &source)
 {
 	init();
 
@@ -69,6 +71,7 @@ void Program::init()
 
 	id = glCreateProgram();
 	module = 0;
+	bindings = 0;
 	linked = false;
 }
 
@@ -156,6 +159,11 @@ void Program::add_glsl_stages(const GlslModule &mod, const map<string, int> &spe
 
 		compile_glsl_stage(stage_id);
 	}
+
+	if(!bindings)
+		bindings = new Bindings;
+	bindings->textures = compiler.get_texture_bindings();
+	bindings->blocks = compiler.get_uniform_block_bindings();
 }
 
 void Program::compile_glsl_stage(unsigned stage_id)
@@ -301,6 +309,34 @@ void Program::link()
 	{
 		query_uniforms();
 		query_attributes();
+		if(bindings)
+		{
+			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())
+				{
+					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)
+			{
+				int location = get_uniform_location(i->first);
+				if(location>=0)
+				{
+					if(ARB_separate_shader_objects)
+						glProgramUniform1i(id, location, i->second);
+					else
+						glUniform1i(location, i->second);
+				}
+			}
+
+			delete bindings;
+			bindings = 0;
+		}
 	}
 	else if(module->get_format()==Module::SPIR_V)
 	{
@@ -336,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_member(uniforms, &UniformInfo::tag);
 
 	if(ARB_uniform_buffer_object)
 	{
@@ -350,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_member(uniforms, Tag(uniform_names[i]), &UniformInfo::tag);
 		query_uniform_blocks(uniforms_by_index);
 	}
 
@@ -372,7 +409,6 @@ void Program::query_uniforms()
 
 void Program::query_uniform_blocks(const vector<UniformInfo *> &uniforms_by_index)
 {
-	std::set<unsigned> used_bind_points;
 	unsigned count = get_program_i(id, GL_ACTIVE_UNIFORM_BLOCKS);
 	// Reserve an extra index for the default block
 	uniform_blocks.reserve(count+1);
@@ -389,6 +425,9 @@ void Program::query_uniform_blocks(const vector<UniformInfo *> &uniforms_by_inde
 		glGetActiveUniformBlockiv(id, i, GL_UNIFORM_BLOCK_DATA_SIZE, &value);
 		info.data_size = value;
 
+		glGetActiveUniformBlockiv(id, i, GL_UNIFORM_BLOCK_BINDING, &value);
+		info.bind_point = value;
+
 		glGetActiveUniformBlockiv(id, i, GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS, &value);
 		vector<int> indices(value);
 		glGetActiveUniformBlockiv(id, i, GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES, &indices[0]);
@@ -431,14 +470,8 @@ 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);
-		unsigned n_bindings = BufferRange::get_n_uniform_buffer_bindings();
-		info.bind_point = info.layout_hash%n_bindings;
-		while(used_bind_points.count(info.bind_point))
-			info.bind_point = (info.bind_point+1)%n_bindings;
-		glUniformBlockBinding(id, i, info.bind_point);
-		used_bind_points.insert(info.bind_point);
 	}
 }
 
@@ -499,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_member(uniforms, &UniformInfo::tag);
 
 	for(unsigned i=0; i<uniform_blocks.size(); ++i)
 	{
@@ -514,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_member(uniforms, Tag(*j), &UniformInfo::tag);
 			block.uniforms.push_back(&uni);
 			uni.block = &block;
 		}
@@ -546,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;
@@ -597,17 +632,6 @@ 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)
-{
-	return uni1.name<uni2.name;
-}
-
-template<typename T>
-bool Program::name_search(const T &item, const string &name)
-{
-	return item.name<name;
-}
-
 string Program::get_info_log() const
 {
 	GLsizei len = get_program_i(id, GL_INFO_LOG_LENGTH);
@@ -627,24 +651,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_member(uniforms, Tag(name), &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_member(uniforms, 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_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);
+	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_member(attributes, name, &AttributeInfo::name);
 	if(i==attributes.end() || i->name!=name)
 		throw key_error(name);
 	return *i;
@@ -655,7 +693,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_member(attributes, name, &AttributeInfo::name);
 	return i!=attributes.end() && i->name==name ? i->location : -1;
 }