X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Fprogram.cpp;h=8ac13bbd0ce21454cb5af1b269dacc0fc6770205;hp=533dca610c9585f649420edadd34bf4f5e858617;hb=HEAD;hpb=58c5647c775e38dd08a64ad435dfe0673a62fcd1

diff --git a/source/core/program.cpp b/source/core/program.cpp
index 533dca61..91f21565 100644
--- a/source/core/program.cpp
+++ b/source/core/program.cpp
@@ -33,14 +33,13 @@ void Program::add_stages(const Module &mod, const map<string, int> &spec_values)
 	reflect_data = ReflectData();
 	const Module *final_module = &mod;
 
-	TransientData transient;
 	switch(mod.get_format())
 	{
 	case Module::GLSL:
-		add_glsl_stages(static_cast<const GlslModule &>(mod), spec_values, transient);
+		add_glsl_stages(static_cast<const GlslModule &>(mod), spec_values);
 		break;
 	case Module::SPIR_V:
-		if(!spec_values.empty())
+		if(static_cast<const SpirVModule &>(mod).is_specializable())
 		{
 			specialized_spirv = static_cast<const SpirVModule &>(mod).specialize(spec_values);
 			final_module = specialized_spirv;
@@ -51,24 +50,21 @@ void Program::add_stages(const Module &mod, const map<string, int> &spec_values)
 		throw invalid_argument("Program::add_stages");
 	}
 
-	finalize(*final_module, transient);
-
 	if(final_module->get_format()==Module::SPIR_V)
 	{
 		const SpirVModule &spirv_mod = *static_cast<const SpirVModule *>(final_module);
 		collect_uniforms(spirv_mod);
 		collect_attributes(spirv_mod);
 		collect_builtins(spirv_mod);
+
+		for(const SpirVModule::EntryPoint &e: spirv_mod.get_entry_points())
+			if(e.stage==SpirVModule::COMPUTE)
+				reflect_data.compute_wg_size = e.compute_local_size;
 	}
 
 	finalize_uniforms();
 
-	for(const ReflectData::UniformInfo &u: reflect_data.uniforms)
-		if(u.binding>=0)
-			reflect_data.used_bindings.push_back(u.binding);
-	for(const ReflectData::UniformBlockInfo &b: reflect_data.uniform_blocks)
-		reflect_data.used_bindings.push_back(b.bind_point);
-	sort(reflect_data.used_bindings);
+	reflect_data.update_used_bindings();
 
 	for(const ReflectData::UniformInfo &u: reflect_data.uniforms)
 		require_type(u.type);
@@ -82,7 +78,6 @@ void Program::collect_uniforms(const SpirVModule &mod)
 	reflect_data.uniform_blocks.emplace_back();
 	vector<vector<string> > block_uniform_names(1);
 
-	unsigned n_descriptor_sets = 0;
 	for(const SpirVModule::Variable &v: mod.get_variables())
 	{
 		if((v.storage==SpirVModule::UNIFORM || v.storage==SpirVModule::PUSH_CONSTANT) && v.struct_type)
@@ -90,17 +85,20 @@ void Program::collect_uniforms(const SpirVModule &mod)
 			reflect_data.uniform_blocks.emplace_back();
 			ReflectData::UniformBlockInfo &info = reflect_data.uniform_blocks.back();
 			info.name = v.struct_type->name;
+			info.data_size = v.struct_type->size;
 			if(v.storage==SpirVModule::PUSH_CONSTANT)
+			{
 				info.bind_point = ReflectData::PUSH_CONSTANT;
+				reflect_data.push_constants_size = info.data_size;
+			}
 			else
 			{
 				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);
+				reflect_data.n_descriptor_sets = max(reflect_data.n_descriptor_sets, v.descriptor_set+1);
 			}
-			info.data_size = v.struct_type->size;
 
 			string prefix;
 			if(!v.name.empty())
@@ -118,7 +116,7 @@ void Program::collect_uniforms(const SpirVModule &mod)
 			info.location = v.location;
 			if(v.binding>=0)
 				info.binding = v.binding | (v.descriptor_set<<20);
-			n_descriptor_sets = max(n_descriptor_sets, v.descriptor_set+1);
+			reflect_data.n_descriptor_sets = max(reflect_data.n_descriptor_sets, v.descriptor_set+1);
 			info.array_size = max(v.array_size, 1U);
 			info.type = v.type;
 		}
@@ -146,7 +144,6 @@ void Program::collect_uniforms(const SpirVModule &mod)
 		block.update_layout_hash();
 	}
 
-	reflect_data.n_descriptor_sets = n_descriptor_sets;
 	reflect_data.update_layout_hash();
 }
 
@@ -198,6 +195,8 @@ void Program::collect_attributes(const SpirVModule &mod)
 					info.type = v->type;
 				}
 		}
+
+	sort_member(reflect_data.attributes, &ReflectData::AttributeInfo::name);
 }
 
 void Program::collect_builtins(const SpirVModule &mod)