X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fprogram.cpp;h=64e1ae30f4a9a38f0b749cb82109a3f5c8576a50;hb=f73e671dcb36c097647cddbf5b1eaaad2ffc9299;hp=1a7ac17b3e99325d33918cebff6593b4c257a989;hpb=afb4e0ab972776eb17e97ca8f3be02c64e77cf46;p=libs%2Fgl.git

diff --git a/source/core/program.cpp b/source/core/program.cpp
index 1a7ac17b..64e1ae30 100644
--- a/source/core/program.cpp
+++ b/source/core/program.cpp
@@ -26,32 +26,22 @@ void Program::add_stages(const Module &mod, const map<string, int> &spec_values)
 		add_glsl_stages(static_cast<const GlslModule &>(mod), spec_values, transient);
 		break;
 	case Module::SPIR_V:
-		add_spirv_stages(static_cast<const SpirVModule &>(mod), spec_values, transient);
+		add_spirv_stages(static_cast<const SpirVModule &>(mod), spec_values);
 		break;
 	default:
 		throw invalid_argument("Program::add_stages");
 	}
 
-	finalize(mod);
+	finalize(mod, transient);
 
-	if(mod.get_format()==Module::GLSL)
+	if(mod.get_format()==Module::SPIR_V)
 	{
-		query_uniforms();
-		query_attributes();
-		apply_bindings(transient);
-	}
-	else if(mod.get_format()==Module::SPIR_V)
-	{
-		collect_uniforms(static_cast<const SpirVModule &>(mod), transient.spec_values);
+		collect_uniforms(static_cast<const SpirVModule &>(mod));
 		collect_attributes(static_cast<const SpirVModule &>(mod));
+		collect_builtins(static_cast<const SpirVModule &>(mod));
 	}
 
-	for(ReflectData::UniformBlockInfo &b: reflect_data.uniform_blocks)
-		if(!b.data_size && !b.uniforms.empty())
-		{
-			const ReflectData::UniformInfo &uni = *b.uniforms.back();
-			b.data_size = uni.location*16+uni.array_size*get_type_size(uni.type);
-		}
+	finalize_uniforms();
 
 	for(const ReflectData::UniformInfo &u: reflect_data.uniforms)
 		require_type(u.type);
@@ -59,7 +49,7 @@ void Program::add_stages(const Module &mod, const map<string, int> &spec_values)
 		require_type(a.type);
 }
 
-void Program::collect_uniforms(const SpirVModule &mod, const map<unsigned, int> &spec_values)
+void Program::collect_uniforms(const SpirVModule &mod)
 {
 	// Prepare the default block
 	reflect_data.uniform_blocks.push_back(ReflectData::UniformBlockInfo());
@@ -79,7 +69,7 @@ void Program::collect_uniforms(const SpirVModule &mod, const map<unsigned, int>
 			if(!v.name.empty())
 				prefix = v.struct_type->name+".";
 			block_uniform_names.push_back(vector<string>());
-			collect_block_uniforms(*v.struct_type, prefix, 0, spec_values, block_uniform_names.back());
+			collect_block_uniforms(*v.struct_type, prefix, 0, block_uniform_names.back());
 		}
 		else if(v.storage==SpirVModule::UNIFORM_CONSTANT && v.location>=0)
 		{
@@ -90,7 +80,7 @@ void Program::collect_uniforms(const SpirVModule &mod, const map<unsigned, int>
 			info.tag = v.name;
 			info.location = v.location;
 			info.binding = v.binding;
-			info.array_size = v.array_size;
+			info.array_size = max(v.array_size, 1U);
 			info.type = v.type;
 		}
 	}
@@ -114,29 +104,20 @@ void Program::collect_uniforms(const SpirVModule &mod, const map<unsigned, int>
 	reflect_data.update_layout_hash();
 }
 
-void Program::collect_block_uniforms(const SpirVModule::Structure &strct, const string &prefix, unsigned base_offset, const map<unsigned, int> &spec_values, vector<string> &uniform_names)
+void Program::collect_block_uniforms(const SpirVModule::Structure &strct, const string &prefix, unsigned base_offset, vector<string> &uniform_names)
 {
 	for(const SpirVModule::StructMember &m: strct.members)
 	{
 		unsigned offset = base_offset+m.offset;
 		if(m.struct_type)
 		{
-			unsigned array_size = m.array_size;
-			if(m.array_size_spec)
-			{
-				array_size = m.array_size_spec->i_value;
-				auto j = spec_values.find(m.array_size_spec->constant_id);
-				if(j!=spec_values.end())
-					array_size = j->second;
-			}
-
-			if(array_size)
+			if(m.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, spec_values, uniform_names);
+				for(unsigned j=0; j<m.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(*m.struct_type, prefix+m.name+".", offset, spec_values, uniform_names);
+				collect_block_uniforms(*m.struct_type, prefix+m.name+".", offset, uniform_names);
 		}
 		else
 		{
@@ -147,7 +128,7 @@ void Program::collect_block_uniforms(const SpirVModule::Structure &strct, const
 			info.name = name;
 			info.tag = name;
 			info.offset = offset;
-			info.array_size = m.array_size;
+			info.array_size = max(m.array_size, 1U);
 			info.array_stride = m.array_stride;
 			info.matrix_stride = m.matrix_stride;
 			info.type = m.type;