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 471803c5b4ab0edfefcfe9253dafd42cca95f0a5..91f215651b57df64b834315c13aa89b86d57d546 100644 (file)
--- a/source/core/program.cpp
+++ b/source/core/program.cpp
@@ -33,14 +33,13 @@ void Program::add_stages(const Module &mod, const map<string, int> &spec_values)
        reflect_data = ReflectData();
        const Module *final_module = &mod;
 
-       TransientData transient;
        switch(mod.get_format())
        {
        case Module::GLSL:
-               add_glsl_stages(static_cast<const GlslModule &>(mod), spec_values, transient);
+               add_glsl_stages(static_cast<const GlslModule &>(mod), spec_values);
                break;
        case Module::SPIR_V:
-               if(!spec_values.empty())
+               if(static_cast<const SpirVModule &>(mod).is_specializable())
                {
                        specialized_spirv = static_cast<const SpirVModule &>(mod).specialize(spec_values);
                        final_module = specialized_spirv;
@@ -51,18 +50,22 @@ void Program::add_stages(const Module &mod, const map<string, int> &spec_values)
                throw invalid_argument("Program::add_stages");
        }
 
-       finalize(*final_module, transient);
-
        if(final_module->get_format()==Module::SPIR_V)
        {
                const SpirVModule &spirv_mod = *static_cast<const SpirVModule *>(final_module);
                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();
 
+       reflect_data.update_used_bindings();
+
        for(const ReflectData::UniformInfo &u: reflect_data.uniforms)
                require_type(u.type);
        for(const ReflectData::AttributeInfo &a: reflect_data.attributes)
@@ -75,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)
@@ -83,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())
@@ -111,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;
                }
@@ -139,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();
 }
 
@@ -191,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)
@@ -252,6 +258,12 @@ int Program::get_uniform_binding(Tag tag) const
        return i!=reflect_data.uniforms.end() && i->tag==tag ? i->binding : -1;
 }
 
+bool Program::uses_binding(int binding) const
+{
+       auto i = lower_bound(reflect_data.used_bindings, binding);
+       return i!=reflect_data.used_bindings.end() && *i==binding;
+}
+
 const ReflectData::AttributeInfo &Program::get_attribute_info(const string &name) const
 {
        auto i = lower_bound_member(reflect_data.attributes, name, &ReflectData::AttributeInfo::name);