From e0d9f85a9e4554f2bbf4354aa37ad6ae46aef718 Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Wed, 17 Nov 2021 14:52:06 +0200
Subject: [PATCH] Remove empty default block before adding uniforms to blocks

Otherwise the block pointers of the uniforms will be incorrect
---
 source/core/program.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/source/core/program.cpp b/source/core/program.cpp
index 8e845562..0b07da8e 100644
--- a/source/core/program.cpp
+++ b/source/core/program.cpp
@@ -94,6 +94,12 @@ void Program::collect_uniforms(const SpirVModule &mod)
 
 	sort_member(reflect_data.uniforms, &ReflectData::UniformInfo::tag);
 
+	if(block_uniform_names.front().empty())
+	{
+		reflect_data.uniform_blocks.erase(reflect_data.uniform_blocks.begin());
+		block_uniform_names.erase(block_uniform_names.begin());
+	}
+
 	for(unsigned i=0; i<reflect_data.uniform_blocks.size(); ++i)
 	{
 		ReflectData::UniformBlockInfo &block = reflect_data.uniform_blocks[i];
@@ -108,9 +114,6 @@ void Program::collect_uniforms(const SpirVModule &mod)
 		block.update_layout_hash();
 	}
 
-	if(reflect_data.uniform_blocks.front().uniforms.empty())
-		reflect_data.uniform_blocks.erase(reflect_data.uniform_blocks.begin());
-
 	reflect_data.update_layout_hash();
 }
 
-- 
2.43.0