X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fprogram.cpp;h=038c031393ae33a5fcaeee27a1c00910f5da0c3c;hb=52335491d6e3b568f2b19bd0ec15c8d7b5f011da;hp=aa2e784939d0345d3e91ef3be842b2d3f781ee64;hpb=3a6eb030fb4eca4c2a317f270704fddf31613130;p=libs%2Fgl.git

diff --git a/source/core/program.cpp b/source/core/program.cpp
index aa2e7849..038c0313 100644
--- a/source/core/program.cpp
+++ b/source/core/program.cpp
@@ -71,7 +71,7 @@ void Program::init()
 
 	id = glCreateProgram();
 	module = 0;
-	bindings = 0;
+	transient = 0;
 	linked = false;
 }
 
@@ -160,10 +160,10 @@ 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();
+	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)
@@ -214,18 +214,22 @@ void Program::add_spirv_stages(const SpirVModule &mod, const map<string, int> &s
 	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<SpirVModule::SpecConstant> &spec_consts = mod.get_spec_constants();
+	if(!spec_values.empty() && !transient)
+		transient = new TransientData;
+
+	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(vector<SpirVModule::Constant>::const_iterator i=spec_consts.begin(); i!=spec_consts.end(); ++i)
 	{
 		map<string, int>::const_iterator j = spec_values.find(i->name);
 		if(j!=spec_values.end())
 		{
 			spec_id_array.push_back(i->constant_id);
 			spec_value_array.push_back(j->second);
+			transient->spec_values[i->constant_id] = j->second;
 		}
 	}
 
@@ -309,12 +313,12 @@ 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())
+				map<string, unsigned>::const_iterator 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;
@@ -322,7 +326,7 @@ void Program::link()
 			}
 
 			Conditional<BindRestore> _bind(!ARB_separate_shader_objects, this);
-			for(map<string, unsigned>::const_iterator i=bindings->textures.begin(); i!=bindings->textures.end(); ++i)
+			for(map<string, unsigned>::const_iterator i=transient->textures.begin(); i!=transient->textures.end(); ++i)
 			{
 				int location = get_uniform_location(i->first);
 				if(location>=0)
@@ -333,9 +337,6 @@ void Program::link()
 						glUniform1i(location, i->second);
 				}
 			}
-
-			delete bindings;
-			bindings = 0;
 		}
 	}
 	else if(module->get_format()==Module::SPIR_V)
@@ -344,6 +345,9 @@ void Program::link()
 		collect_attributes();
 	}
 
+	delete transient;
+	transient = 0;
+
 	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)
@@ -379,7 +383,7 @@ void Program::query_uniforms()
 		}
 	}
 
-	sort(uniforms, &uniform_tag_compare);
+	sort_member(uniforms, &UniformInfo::tag);
 
 	if(ARB_uniform_buffer_object)
 	{
@@ -387,7 +391,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 +404,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 +477,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 +541,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 +556,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);
 	}
 
@@ -565,9 +574,21 @@ void Program::collect_block_uniforms(const SpirVModule::Structure &strct, const
 		unsigned offset = base_offset+i->offset;
 		if(i->struct_type)
 		{
-			if(i->array_size)
+			unsigned array_size = i->array_size;
+			if(i->array_size_spec)
+			{
+				array_size = i->array_size_spec->i_value;
+				if(transient)
+				{
+					map<unsigned, int>::const_iterator j = transient->spec_values.find(i->array_size_spec->constant_id);
+					if(j!=transient->spec_values.end())
+						array_size = j->second;
+				}
+			}
+
+			if(array_size)
 			{
-				for(unsigned j=0; j<i->array_size; ++j, offset+=i->array_stride)
+				for(unsigned j=0; j<array_size; ++j, offset+=i->array_stride)
 					collect_block_uniforms(*i->struct_type, format("%s%s[%d].", prefix, i->name, j), offset, uniform_names);
 			}
 			else
@@ -632,17 +653,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 +672,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 +680,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 +691,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 +720,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 +750,8 @@ Program::UniformInfo::UniformInfo():
 	array_size(0),
 	array_stride(0),
 	matrix_stride(0),
-	type(VOID)
+	type(VOID),
+	binding(-1)
 { }