X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fprogram.cpp;h=2934d240c7ef0c3bda346636d51725c8729b7bd1;hb=013c562e389936acf61970118eab23a420a8f611;hp=4707f4c0416e2be185441efebe847e65ed49fd7a;hpb=f82ef715f0d7e1e7d0b93be4b7b89c8ce6bba40b;p=libs%2Fgl.git

diff --git a/source/core/program.cpp b/source/core/program.cpp
index 4707f4c0..2934d240 100644
--- a/source/core/program.cpp
+++ b/source/core/program.cpp
@@ -17,6 +17,8 @@ void Program::add_stages(const Module &mod, const map<string, int> &spec_values)
 	if(has_stages())
 		throw invalid_operation("Program::add_stages");
 
+	reflect_data = ReflectData();
+
 	TransientData transient;
 	switch(mod.get_format())
 	{
@@ -30,28 +32,15 @@ void Program::add_stages(const Module &mod, const map<string, int> &spec_values)
 		throw invalid_argument("Program::add_stages");
 	}
 
-	reflect_data = ReflectData();
-
-	finalize(mod);
+	finalize(mod, transient);
 
-	if(mod.get_format()==Module::GLSL)
-	{
-		query_uniforms();
-		query_attributes();
-		apply_bindings(transient);
-	}
-	else if(mod.get_format()==Module::SPIR_V)
+	if(mod.get_format()==Module::SPIR_V)
 	{
 		collect_uniforms(static_cast<const SpirVModule &>(mod), transient.spec_values);
 		collect_attributes(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);