Check the flat qualifier from the correct member

[libs/gl.git] / source / core / program.cpp

diff --git a/source/core/program.cpp b/source/core/program.cpp
index e4250b6c05739b52d8f1e339db7c188ffac35aad..91f215651b57df64b834315c13aa89b86d57d546 100644 (file)
--- a/source/core/program.cpp
+++ b/source/core/program.cpp
@@ -56,6 +56,10 @@ void Program::add_stages(const Module &mod, const map<string, int> &spec_values)
                collect_uniforms(spirv_mod);
                collect_attributes(spirv_mod);
                collect_builtins(spirv_mod);
+
+               for(const SpirVModule::EntryPoint &e: spirv_mod.get_entry_points())
+                       if(e.stage==SpirVModule::COMPUTE)
+                               reflect_data.compute_wg_size = e.compute_local_size;
        }
 
        finalize_uniforms();
@@ -74,7 +78,6 @@ void Program::collect_uniforms(const SpirVModule &mod)
        reflect_data.uniform_blocks.emplace_back();
        vector<vector<string> > block_uniform_names(1);
 
-       unsigned n_descriptor_sets = 0;
        for(const SpirVModule::Variable &v: mod.get_variables())
        {
                if((v.storage==SpirVModule::UNIFORM || v.storage==SpirVModule::PUSH_CONSTANT) && v.struct_type)
@@ -82,17 +85,20 @@ void Program::collect_uniforms(const SpirVModule &mod)
                        reflect_data.uniform_blocks.emplace_back();
                        ReflectData::UniformBlockInfo &info = reflect_data.uniform_blocks.back();
                        info.name = v.struct_type->name;
+                       info.data_size = v.struct_type->size;
                        if(v.storage==SpirVModule::PUSH_CONSTANT)
+                       {
                                info.bind_point = ReflectData::PUSH_CONSTANT;
+                               reflect_data.push_constants_size = info.data_size;
+                       }
                        else
                        {
                                if(v.binding>=0)
                                        info.bind_point = v.binding | (v.descriptor_set<<20);
                                else
                                        info.bind_point = ReflectData::DEFAULT_BLOCK;
-                               n_descriptor_sets = max(n_descriptor_sets, v.descriptor_set+1);
+                               reflect_data.n_descriptor_sets = max(reflect_data.n_descriptor_sets, v.descriptor_set+1);
                        }
-                       info.data_size = v.struct_type->size;
 
                        string prefix;
                        if(!v.name.empty())
@@ -110,7 +116,7 @@ void Program::collect_uniforms(const SpirVModule &mod)
                        info.location = v.location;
                        if(v.binding>=0)
                                info.binding = v.binding | (v.descriptor_set<<20);
-                       n_descriptor_sets = max(n_descriptor_sets, v.descriptor_set+1);
+                       reflect_data.n_descriptor_sets = max(reflect_data.n_descriptor_sets, v.descriptor_set+1);
                        info.array_size = max(v.array_size, 1U);
                        info.type = v.type;
                }
@@ -138,7 +144,6 @@ void Program::collect_uniforms(const SpirVModule &mod)
                block.update_layout_hash();
        }
 
-       reflect_data.n_descriptor_sets = n_descriptor_sets;
        reflect_data.update_layout_hash();
 }
 
@@ -190,6 +195,8 @@ void Program::collect_attributes(const SpirVModule &mod)
                                        info.type = v->type;
                                }
                }
+
+       sort_member(reflect_data.attributes, &ReflectData::AttributeInfo::name);
 }
 
 void Program::collect_builtins(const SpirVModule &mod)