X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbackends%2Fopengl%2Fprogram_backend.cpp;h=e83a94844dc4e79e28986e0d8dcf8e835e9cad7e;hb=89347a620294a1136ee111edeadec68390654f78;hp=685f15421d6d726f34f6b73840a5f7ac96eb3e3f;hpb=e70662d7812464159f2e47f4bebb69d88f89ae93;p=libs%2Fgl.git

diff --git a/source/backends/opengl/program_backend.cpp b/source/backends/opengl/program_backend.cpp
index 685f1542..e83a9484 100644
--- a/source/backends/opengl/program_backend.cpp
+++ b/source/backends/opengl/program_backend.cpp
@@ -99,7 +99,7 @@ unsigned OpenGLProgram::add_stage(Stage type)
 	return stage_id;
 }
 
-void OpenGLProgram::add_glsl_stages(const GlslModule &mod, const map<string, int> &spec_values, TransientData &transient)
+void OpenGLProgram::add_glsl_stages(const GlslModule &mod, const map<string, int> &spec_values)
 {
 	SL::Compiler compiler(Device::get_current().get_info().glsl_features);
 	compiler.set_source(mod.get_prepared_source(), "<module>");
@@ -146,11 +146,44 @@ void OpenGLProgram::add_glsl_stages(const GlslModule &mod, const map<string, int
 		compile_glsl_stage(mod, stage_id);
 	}
 
-	transient.textures = compiler.get_texture_bindings();
-	transient.blocks = compiler.get_uniform_block_bindings();
-
 	ReflectData &rd = static_cast<Program *>(this)->reflect_data;
 	rd.n_clip_distances = compiler.get_n_clip_distances();
+
+	link(mod);
+	query_uniforms();
+	query_attributes();
+
+	const map<string, unsigned> &block_bindings = compiler.get_uniform_block_bindings();
+	if(!block_bindings.empty())
+	{
+		for(unsigned i=0; i<rd.uniform_blocks.size(); ++i)
+		{
+			auto j = block_bindings.find(rd.uniform_blocks[i].name);
+			if(j!=block_bindings.end())
+			{
+				glUniformBlockBinding(id, i, j->second);
+				rd.uniform_blocks[i].bind_point = j->second;
+			}
+		}
+	}
+
+	const map<string, unsigned> &tex_bindings = compiler.get_texture_bindings();
+	if(!tex_bindings.empty())
+	{
+		if(!ARB_separate_shader_objects)
+			glUseProgram(id);
+		for(const auto &kvp: tex_bindings)
+		{
+			int location = static_cast<const Program *>(this)->get_uniform_location(kvp.first);
+			if(location>=0)
+			{
+				if(ARB_separate_shader_objects)
+					glProgramUniform1i(id, location, kvp.second);
+				else
+					glUniform1i(location, kvp.second);
+			}
+		}
+	}
 }
 
 void OpenGLProgram::compile_glsl_stage(const GlslModule &mod, unsigned stage_id)
@@ -220,9 +253,11 @@ void OpenGLProgram::add_spirv_stages(const SpirVModule &mod, const map<string, i
 	for(unsigned i=0; i<MAX_STAGES; ++i)
 		if(stage_ids[i])
 			glSpecializeShader(stage_ids[i], j->name.c_str(), spec_id_array.size(), &spec_id_array[0], &spec_value_array[0]);
+
+	link(mod);
 }
 
-void OpenGLProgram::finalize(const Module &mod, TransientData &transient)
+void OpenGLProgram::link(const Module &mod)
 {
 	glLinkProgram(id);
 	int status = 0;
@@ -243,13 +278,6 @@ void OpenGLProgram::finalize(const Module &mod, TransientData &transient)
 	if(!info_log.empty())
 		IO::print("Program link info log:\n%s", info_log);
 #endif
-
-	if(mod.get_format()==Module::GLSL)
-	{
-		query_uniforms();
-		query_attributes();
-		apply_bindings(transient);
-	}
 }
 
 void OpenGLProgram::query_uniforms()
@@ -274,7 +302,7 @@ void OpenGLProgram::query_uniforms()
 			if(len>3 && !strcmp(name+len-3, "[0]"))
 				name[len-3] = 0;
 
-			rd.uniforms.push_back(ReflectData::UniformInfo());
+			rd.uniforms.emplace_back();
 			ReflectData::UniformInfo &info = rd.uniforms.back();
 			info.name = name;
 			info.tag = name;
@@ -296,7 +324,7 @@ void OpenGLProgram::query_uniforms()
 		query_uniform_blocks(uniforms_by_index);
 	}
 
-	rd.uniform_blocks.push_back(ReflectData::UniformBlockInfo());
+	rd.uniform_blocks.emplace_back();
 	ReflectData::UniformBlockInfo &default_block = rd.uniform_blocks.back();
 
 	for(ReflectData::UniformInfo &u: rd.uniforms)
@@ -331,7 +359,7 @@ void OpenGLProgram::query_uniform_blocks(const vector<ReflectData::UniformInfo *
 		char name[128];
 		int len;
 		glGetActiveUniformBlockName(id, i, sizeof(name), &len, name);
-		rd.uniform_blocks.push_back(ReflectData::UniformBlockInfo());
+		rd.uniform_blocks.emplace_back();
 		ReflectData::UniformBlockInfo &info = rd.uniform_blocks.back();
 		info.name = name;
 
@@ -408,7 +436,7 @@ void OpenGLProgram::query_attributes()
 			if(len>3 && !strcmp(name+len-3, "[0]"))
 				name[len-3] = 0;
 
-			rd.attributes.push_back(ReflectData::AttributeInfo());
+			rd.attributes.emplace_back();
 			ReflectData::AttributeInfo &info = rd.attributes.back();
 			info.name = name;
 			info.location = glGetAttribLocation(id, name);
@@ -418,35 +446,6 @@ void OpenGLProgram::query_attributes()
 	}
 }
 
-void OpenGLProgram::apply_bindings(const TransientData &transient)
-{
-	ReflectData &rd = static_cast<Program *>(this)->reflect_data;
-
-	for(unsigned i=0; i<rd.uniform_blocks.size(); ++i)
-	{
-		auto j = transient.blocks.find(rd.uniform_blocks[i].name);
-		if(j!=transient.blocks.end())
-		{
-			glUniformBlockBinding(id, i, j->second);
-			rd.uniform_blocks[i].bind_point = j->second;
-		}
-	}
-
-	if(!ARB_separate_shader_objects)
-		glUseProgram(id);
-	for(const auto &kvp: transient.textures)
-	{
-		int location = static_cast<const Program *>(this)->get_uniform_location(kvp.first);
-		if(location>=0)
-		{
-			if(ARB_separate_shader_objects)
-				glProgramUniform1i(id, location, kvp.second);
-			else
-				glUniform1i(location, kvp.second);
-		}
-	}
-}
-
 void OpenGLProgram::finalize_uniforms()
 {
 	ReflectData &rd = static_cast<Program *>(this)->reflect_data;