X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fprogram.cpp;h=bc61e1db7173f141f609a346b180bc51675dc375;hb=e98188ff6c9bba9761b71f2a69f3be7eb89ba3da;hp=66fbb7af61179a7ccb64554f24afb3bb5ac26868;hpb=fee6115b609b8726b50a1f9169d50e8f68170b75;p=libs%2Fgl.git

diff --git a/source/core/program.cpp b/source/core/program.cpp
index 66fbb7af..bc61e1db 100644
--- a/source/core/program.cpp
+++ b/source/core/program.cpp
@@ -36,9 +36,11 @@ void Program::add_stages(const Module &mod, const map<string, int> &spec_values)
 
 	if(mod.get_format()==Module::SPIR_V)
 	{
-		collect_uniforms(static_cast<const SpirVModule &>(mod));
-		collect_attributes(static_cast<const SpirVModule &>(mod));
-		collect_builtins(static_cast<const SpirVModule &>(mod));
+		const SpirVModule &spirv_mod = static_cast<const SpirVModule &>(mod);
+		vector<uint8_t> used_variables = collect_used_variables(spirv_mod, spec_values);
+		collect_uniforms(spirv_mod, used_variables);
+		collect_attributes(spirv_mod, used_variables);
+		collect_builtins(spirv_mod);
 	}
 
 	finalize_uniforms();
@@ -49,14 +51,79 @@ void Program::add_stages(const Module &mod, const map<string, int> &spec_values)
 		require_type(a.type);
 }
 
-void Program::collect_uniforms(const SpirVModule &mod)
+vector<uint8_t> Program::collect_used_variables(const SpirVModule &mod, const map<string, int> &spec_values)
+{
+	std::map<unsigned, int> spec_values_by_id;
+	for(const SpirVModule::Constant &c: mod.get_spec_constants())
+	{
+		auto i = spec_values.find(c.name);
+		if(i!=spec_values.end())
+			spec_values_by_id[c.constant_id] = i->second;
+	}
+
+	const vector<SpirVModule::InstructionBlock> &blocks = mod.get_blocks();
+	vector<uint8_t> visited(blocks.size(), 4);
+	for(unsigned i=0; i<blocks.size(); ++i)
+	{
+		const SpirVModule::InstructionBlock &b = blocks[i];
+
+		bool cond = true;
+		if(b.condition)
+		{
+			cond = b.condition->i_value;
+			auto j = spec_values_by_id.find(b.condition->constant_id);
+			if(j!=spec_values_by_id.end())
+				cond = j->second;
+			if(b.negate_condition)
+				cond = !cond;
+		}
+
+		visited[i] |= cond*2;
+		for(const SpirVModule::InstructionBlock *s: b.successors)
+			visited[s-blocks.data()] &= 3;
+	}
+
+	for(unsigned i=0; i<blocks.size(); ++i)
+		if(visited[i]&4)
+			collect_visited_blocks(blocks, i, visited);
+
+	const vector<SpirVModule::Variable> &variables = mod.get_variables();
+	vector<uint8_t> used(variables.size());
+	for(unsigned i=0; i<blocks.size(); ++i)
+		if(visited[i]&1)
+		{
+			for(const SpirVModule::Variable *v: blocks[i].accessed_variables)
+				used[v-variables.data()] = 1;
+		}
+
+	return used;
+}
+
+void Program::collect_visited_blocks(const vector<SpirVModule::InstructionBlock> &blocks, unsigned i, vector<uint8_t> &visited)
+{
+	visited[i] |= 1;
+	for(const SpirVModule::InstructionBlock *s: blocks[i].successors)
+	{
+		unsigned j = s-blocks.data();
+		if((visited[j]&3)==2)
+			collect_visited_blocks(blocks, j, visited);
+	}
+}
+
+void Program::collect_uniforms(const SpirVModule &mod, const vector<uint8_t> &used_variables)
 {
 	// Prepare the default block
 	reflect_data.uniform_blocks.push_back(ReflectData::UniformBlockInfo());
 	vector<vector<string> > block_uniform_names(1);
 
-	for(const SpirVModule::Variable &v: mod.get_variables())
+	const vector<SpirVModule::Variable> &variables = mod.get_variables();
+	unsigned n_descriptor_sets = 0;
+	for(unsigned i=0; i<variables.size(); ++i)
 	{
+		if(!used_variables[i])
+			continue;
+
+		const SpirVModule::Variable &v = variables[i];
 		if((v.storage==SpirVModule::UNIFORM || v.storage==SpirVModule::PUSH_CONSTANT) && v.struct_type)
 		{
 			reflect_data.uniform_blocks.push_back(ReflectData::UniformBlockInfo());
@@ -66,8 +133,11 @@ void Program::collect_uniforms(const SpirVModule &mod)
 				info.bind_point = ReflectData::PUSH_CONSTANT;
 			else
 			{
-				info.bind_point = v.binding;
-				info.descriptor_set = v.descriptor_set;
+				if(v.binding>=0)
+					info.bind_point = v.binding | (v.descriptor_set<<20);
+				else
+					info.bind_point = ReflectData::DEFAULT_BLOCK;
+				n_descriptor_sets = max(n_descriptor_sets, v.descriptor_set+1);
 			}
 			info.data_size = v.struct_type->size;
 
@@ -77,7 +147,7 @@ void Program::collect_uniforms(const SpirVModule &mod)
 			block_uniform_names.push_back(vector<string>());
 			collect_block_uniforms(*v.struct_type, prefix, 0, block_uniform_names.back());
 		}
-		else if(v.storage==SpirVModule::UNIFORM_CONSTANT && v.location>=0)
+		else if(v.storage==SpirVModule::UNIFORM_CONSTANT && (v.location>=0 || v.binding>=0))
 		{
 			block_uniform_names[0].push_back(v.name);
 			reflect_data.uniforms.push_back(ReflectData::UniformInfo());
@@ -85,8 +155,9 @@ void Program::collect_uniforms(const SpirVModule &mod)
 			info.name = v.name;
 			info.tag = v.name;
 			info.location = v.location;
-			info.binding = v.binding;
-			info.descriptor_set = v.descriptor_set;
+			if(v.binding>=0)
+				info.binding = v.binding | (v.descriptor_set<<20);
+			n_descriptor_sets = max(n_descriptor_sets, v.descriptor_set+1);
 			info.array_size = max(v.array_size, 1U);
 			info.type = v.type;
 		}
@@ -94,6 +165,12 @@ void Program::collect_uniforms(const SpirVModule &mod)
 
 	sort_member(reflect_data.uniforms, &ReflectData::UniformInfo::tag);
 
+	if(block_uniform_names.front().empty())
+	{
+		reflect_data.uniform_blocks.erase(reflect_data.uniform_blocks.begin());
+		block_uniform_names.erase(block_uniform_names.begin());
+	}
+
 	for(unsigned i=0; i<reflect_data.uniform_blocks.size(); ++i)
 	{
 		ReflectData::UniformBlockInfo &block = reflect_data.uniform_blocks[i];
@@ -108,6 +185,7 @@ void Program::collect_uniforms(const SpirVModule &mod)
 		block.update_layout_hash();
 	}
 
+	reflect_data.n_descriptor_sets = n_descriptor_sets;
 	reflect_data.update_layout_hash();
 }
 
@@ -143,13 +221,14 @@ void Program::collect_block_uniforms(const SpirVModule::Structure &strct, const
 	}
 }
 
-void Program::collect_attributes(const SpirVModule &mod)
+void Program::collect_attributes(const SpirVModule &mod, const vector<uint8_t> &used_variables)
 {
+	const vector<SpirVModule::Variable> &variables = mod.get_variables();
 	for(const SpirVModule::EntryPoint &e: mod.get_entry_points())
 		if(e.stage==SpirVModule::VERTEX && e.name=="main")
 		{
 			for(const SpirVModule::Variable *v: e.globals)
-				if(v->storage==SpirVModule::INPUT)
+				if(v->storage==SpirVModule::INPUT && used_variables[v-variables.data()])
 				{
 					reflect_data.attributes.push_back(ReflectData::AttributeInfo());
 					ReflectData::AttributeInfo &info = reflect_data.attributes.back();