From: Mikko Rasa <tdb@tdb.fi>
Date: Tue, 18 Jul 2023 08:27:49 +0000 (+0300)
Subject: Some minor refactoring
X-Git-Url: https://git.tdb.fi/?a=commitdiff_plain;h=1effa18f6f2f69d04babc942e85981a06e2198bc;p=libs%2Fgl.git

Some minor refactoring
---

diff --git a/source/backends/opengl/program_backend.cpp b/source/backends/opengl/program_backend.cpp
index 7183cce4..52d48c22 100644
--- a/source/backends/opengl/program_backend.cpp
+++ b/source/backends/opengl/program_backend.cpp
@@ -329,8 +329,7 @@ void OpenGLProgram::query_uniforms()
 
 			rd.uniforms.emplace_back();
 			ReflectData::UniformInfo &info = rd.uniforms.back();
-			info.name = name;
-			info.tag = name;
+			info.tag = info.name = name;
 			info.array_size = size;
 			info.type = from_gl_type(type);
 			uniform_names[i] = name;
@@ -380,12 +379,13 @@ void OpenGLProgram::query_uniform_blocks(const vector<ReflectData::UniformInfo *
 	rd.blocks.reserve(count+1);
 	for(unsigned i=0; i<count; ++i)
 	{
+		rd.blocks.emplace_back();
+		ReflectData::BlockInfo &info = rd.blocks.back();
+
 		char name[128];
 		int len;
 		glGetActiveUniformBlockName(id, i, sizeof(name), &len, name);
-		rd.blocks.emplace_back();
-		ReflectData::BlockInfo &info = rd.blocks.back();
-		info.tag = info.name = name;
+		info.tag = info.name.assign(name, len);
 
 		int value;
 		glGetActiveUniformBlockiv(id, i, GL_UNIFORM_BLOCK_DATA_SIZE, &value);
diff --git a/source/core/program.cpp b/source/core/program.cpp
index e946a847..54b58220 100644
--- a/source/core/program.cpp
+++ b/source/core/program.cpp
@@ -111,8 +111,7 @@ void Program::collect_uniforms(const SpirVModule &mod)
 			block_uniform_names[0].push_back(v.name);
 			reflect_data.uniforms.emplace_back();
 			ReflectData::UniformInfo &info = reflect_data.uniforms.back();
-			info.name = v.name;
-			info.tag = v.name;
+			info.tag = info.name = v.name;
 			info.location = v.location;
 			if(v.binding>=0)
 				info.binding = v.binding | (v.descriptor_set<<20);
diff --git a/source/materials/programdata.cpp b/source/materials/programdata.cpp
index 6be31552..7a72e1c6 100644
--- a/source/materials/programdata.cpp
+++ b/source/materials/programdata.cpp
@@ -480,22 +480,23 @@ vector<ProgramData::ProgramBlock>::iterator ProgramData::get_program(const Progr
 	for(const ProgramBlock &b: programs)
 		block_hashes.push_back(b.block_index>=0 ? blocks[b.block_index].block_hash : 0);
 
-	for(unsigned j=0; j<block_infos.size(); ++j)
+	unsigned j = index+1;
+	for(const ReflectData::BlockInfo &b: block_infos)
 	{
-		const ReflectData::BlockInfo &info = block_infos[j];
-		block_hashes[index+1+j] = info.layout_hash;
-		programs[index+1+j].bind_point = info.bind_point;
+		block_hashes[j] = b.layout_hash;
+		programs[j].bind_point = b.bind_point;
+		++j;
 
-		auto k = lower_bound_member(blocks, info.layout_hash, &SharedBlock::block_hash);
-		if(k==blocks.end() || k->block_hash!=info.layout_hash)
+		auto k = lower_bound_member(blocks, b.layout_hash, &SharedBlock::block_hash);
+		if(k==blocks.end() || k->block_hash!=b.layout_hash)
 		{
-			k = blocks.insert(k, SharedBlock(info.layout_hash));
-			update_block_uniform_indices(*k, info);
+			k = blocks.insert(k, SharedBlock(b.layout_hash));
+			update_block_uniform_indices(*k, b);
 		}
 	}
 
 	/* Reassign shared block indices from the stored hashes. */
-	for(unsigned j=0; j<programs.size(); ++j)
+	for(j=0; j<programs.size(); ++j)
 	{
 		unsigned hash = block_hashes[j];
 		if(hash)