+ info.array_size = size;
+ info.type = from_gl_type(type);
+ }
+ }
+}
+
+void Program::collect_uniforms()
+{
+ const SpirVModule &mod = static_cast<const SpirVModule &>(*module);
+
+ // Prepare the default block
+ reflect_data.uniform_blocks.push_back(ReflectData::UniformBlockInfo());
+ vector<vector<string> > block_uniform_names(1);
+
+ for(const SpirVModule::Variable &v: mod.get_variables())
+ {
+ if(v.storage==SpirVModule::UNIFORM && v.struct_type)
+ {
+ reflect_data.uniform_blocks.push_back(ReflectData::UniformBlockInfo());
+ ReflectData::UniformBlockInfo &info = reflect_data.uniform_blocks.back();
+ info.name = v.struct_type->name;
+ info.bind_point = v.binding;
+ info.data_size = v.struct_type->size;
+
+ string prefix;
+ if(!v.name.empty())
+ prefix = v.struct_type->name+".";
+ block_uniform_names.push_back(vector<string>());
+ collect_block_uniforms(*v.struct_type, prefix, 0, block_uniform_names.back());
+ }
+ else if(v.storage==SpirVModule::UNIFORM_CONSTANT && v.location>=0)
+ {
+ block_uniform_names[0].push_back(v.name);
+ reflect_data.uniforms.push_back(ReflectData::UniformInfo());
+ ReflectData::UniformInfo &info = reflect_data.uniforms.back();
+ info.name = v.name;
+ info.tag = v.name;
+ info.location = v.location;
+ info.binding = v.binding;
+ info.array_size = v.array_size;
+ info.type = v.type;
+ }
+ }
+
+ sort_member(reflect_data.uniforms, &ReflectData::UniformInfo::tag);
+
+ for(unsigned i=0; i<reflect_data.uniform_blocks.size(); ++i)
+ {
+ ReflectData::UniformBlockInfo &block = reflect_data.uniform_blocks[i];
+ for(const string &n: block_uniform_names[i])
+ {
+ // The element is already known to be present
+ ReflectData::UniformInfo &uni = *lower_bound_member(reflect_data.uniforms, Tag(n), &ReflectData::UniformInfo::tag);
+ block.uniforms.push_back(&uni);
+ uni.block = █