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

diff --git a/source/core/program.cpp b/source/core/program.cpp
index 9b5400a3..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)
@@ -570,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