X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fprogram.cpp;h=81da5b96e7b50fd858e6a82d4017412711b9bb97;hb=1f71ec73edacd6c1bd230abace3cb791eb2ca759;hp=22626c6543674118737df4e1272785f1db6f9a12;hpb=6f39983060a27634c012f66c82fea0d09fea9774;p=libs%2Fgl.git

diff --git a/source/core/program.cpp b/source/core/program.cpp
index 22626c65..81da5b96 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,12 +214,12 @@ 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();
+	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())
@@ -309,12 +309,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 +322,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)
@@ -334,8 +334,8 @@ void Program::link()
 				}
 			}
 
-			delete bindings;
-			bindings = 0;
+			delete transient;
+			transient = 0;
 		}
 	}
 	else if(module->get_format()==Module::SPIR_V)
@@ -537,6 +537,7 @@ void Program::collect_uniforms()
 			info.name = i->name;
 			info.tag = i->name;
 			info.location = i->location;
+			info.binding = i->binding;
 			info.array_size = i->array_size;
 			info.type = i->type;
 		}