add_glsl_stages(static_cast<const GlslModule &>(mod), spec_values, transient);
break;
case Module::SPIR_V:
- add_spirv_stages(static_cast<const SpirVModule &>(mod), spec_values, transient);
+ add_spirv_stages(static_cast<const SpirVModule &>(mod), spec_values);
break;
default:
throw invalid_argument("Program::add_stages");
if(mod.get_format()==Module::SPIR_V)
{
- collect_uniforms(static_cast<const SpirVModule &>(mod), transient.spec_values);
- collect_attributes(static_cast<const SpirVModule &>(mod));
+ const SpirVModule &spirv_mod = static_cast<const SpirVModule &>(mod);
+ vector<uint8_t> used_variables = collect_used_variables(spirv_mod, spec_values);
+ collect_uniforms(spirv_mod, used_variables);
+ collect_attributes(spirv_mod, used_variables);
+ collect_builtins(spirv_mod);
}
finalize_uniforms();
require_type(a.type);
}
-void Program::collect_uniforms(const SpirVModule &mod, const map<unsigned, int> &spec_values)
+vector<uint8_t> Program::collect_used_variables(const SpirVModule &mod, const map<string, int> &spec_values)
+{
+ std::map<unsigned, int> spec_values_by_id;
+ for(const SpirVModule::Constant &c: mod.get_spec_constants())
+ {
+ auto i = spec_values.find(c.name);
+ if(i!=spec_values.end())
+ spec_values_by_id[c.constant_id] = i->second;
+ }
+
+ const vector<SpirVModule::InstructionBlock> &blocks = mod.get_blocks();
+ vector<uint8_t> visited(blocks.size(), 4);
+ for(unsigned i=0; i<blocks.size(); ++i)
+ {
+ const SpirVModule::InstructionBlock &b = blocks[i];
+
+ bool cond = true;
+ if(b.condition)
+ {
+ cond = b.condition->i_value;
+ auto j = spec_values_by_id.find(b.condition->constant_id);
+ if(j!=spec_values_by_id.end())
+ cond = j->second;
+ if(b.negate_condition)
+ cond = !cond;
+ }
+
+ visited[i] |= cond*2;
+ for(const SpirVModule::InstructionBlock *s: b.successors)
+ visited[s-blocks.data()] &= 3;
+ }
+
+ for(unsigned i=0; i<blocks.size(); ++i)
+ if(visited[i]&4)
+ collect_visited_blocks(blocks, i, visited);
+
+ const vector<SpirVModule::Variable> &variables = mod.get_variables();
+ vector<uint8_t> used(variables.size());
+ for(unsigned i=0; i<blocks.size(); ++i)
+ if(visited[i]&1)
+ {
+ for(const SpirVModule::Variable *v: blocks[i].accessed_variables)
+ used[v-variables.data()] = 1;
+ }
+
+ return used;
+}
+
+void Program::collect_visited_blocks(const vector<SpirVModule::InstructionBlock> &blocks, unsigned i, vector<uint8_t> &visited)
+{
+ visited[i] |= 1;
+ for(const SpirVModule::InstructionBlock *s: blocks[i].successors)
+ {
+ unsigned j = s-blocks.data();
+ if((visited[j]&3)==2)
+ collect_visited_blocks(blocks, j, visited);
+ }
+}
+
+void Program::collect_uniforms(const SpirVModule &mod, const vector<uint8_t> &used_variables)
{
// Prepare the default block
- reflect_data.uniform_blocks.push_back(ReflectData::UniformBlockInfo());
+ reflect_data.uniform_blocks.emplace_back();
vector<vector<string> > block_uniform_names(1);
- for(const SpirVModule::Variable &v: mod.get_variables())
+ const vector<SpirVModule::Variable> &variables = mod.get_variables();
+ unsigned n_descriptor_sets = 0;
+ for(unsigned i=0; i<variables.size(); ++i)
{
- if(v.storage==SpirVModule::UNIFORM && v.struct_type)
+ if(!used_variables[i])
+ continue;
+
+ const SpirVModule::Variable &v = variables[i];
+ if((v.storage==SpirVModule::UNIFORM || v.storage==SpirVModule::PUSH_CONSTANT) && v.struct_type)
{
- reflect_data.uniform_blocks.push_back(ReflectData::UniformBlockInfo());
+ reflect_data.uniform_blocks.emplace_back();
ReflectData::UniformBlockInfo &info = reflect_data.uniform_blocks.back();
info.name = v.struct_type->name;
- info.bind_point = v.binding;
+ if(v.storage==SpirVModule::PUSH_CONSTANT)
+ info.bind_point = ReflectData::PUSH_CONSTANT;
+ 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);
+ }
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, spec_values, block_uniform_names.back());
+ block_uniform_names.emplace_back();
+ collect_block_uniforms(*v.struct_type, prefix, 0, block_uniform_names.back());
}
- else if(v.storage==SpirVModule::UNIFORM_CONSTANT && v.location>=0)
+ else if(v.storage==SpirVModule::UNIFORM_CONSTANT && (v.location>=0 || v.binding>=0))
{
block_uniform_names[0].push_back(v.name);
- reflect_data.uniforms.push_back(ReflectData::UniformInfo());
+ reflect_data.uniforms.emplace_back();
ReflectData::UniformInfo &info = reflect_data.uniforms.back();
info.name = v.name;
info.tag = v.name;
info.location = v.location;
- info.binding = v.binding;
+ if(v.binding>=0)
+ info.binding = v.binding | (v.descriptor_set<<20);
+ n_descriptor_sets = max(n_descriptor_sets, v.descriptor_set+1);
info.array_size = max(v.array_size, 1U);
info.type = v.type;
}
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];
block.update_layout_hash();
}
+ reflect_data.n_descriptor_sets = n_descriptor_sets;
reflect_data.update_layout_hash();
}
-void Program::collect_block_uniforms(const SpirVModule::Structure &strct, const string &prefix, unsigned base_offset, const map<unsigned, int> &spec_values, vector<string> &uniform_names)
+void Program::collect_block_uniforms(const SpirVModule::Structure &strct, const string &prefix, unsigned base_offset, vector<string> &uniform_names)
{
for(const SpirVModule::StructMember &m: strct.members)
{
unsigned offset = base_offset+m.offset;
if(m.struct_type)
{
- unsigned array_size = m.array_size;
- if(m.array_size_spec)
- {
- array_size = m.array_size_spec->i_value;
- auto j = spec_values.find(m.array_size_spec->constant_id);
- if(j!=spec_values.end())
- array_size = j->second;
- }
-
- if(array_size)
+ if(m.array_size)
{
- for(unsigned j=0; j<array_size; ++j, offset+=m.array_stride)
- collect_block_uniforms(*m.struct_type, format("%s%s[%d].", prefix, m.name, j), offset, spec_values, uniform_names);
+ for(unsigned j=0; j<m.array_size; ++j, offset+=m.array_stride)
+ collect_block_uniforms(*m.struct_type, format("%s%s[%d].", prefix, m.name, j), offset, uniform_names);
}
else
- collect_block_uniforms(*m.struct_type, prefix+m.name+".", offset, spec_values, uniform_names);
+ collect_block_uniforms(*m.struct_type, prefix+m.name+".", offset, uniform_names);
}
else
{
string name = prefix+m.name;
uniform_names.push_back(name);
- reflect_data.uniforms.push_back(ReflectData::UniformInfo());
+ reflect_data.uniforms.emplace_back();
ReflectData::UniformInfo &info = reflect_data.uniforms.back();
info.name = name;
info.tag = name;
}
}
-void Program::collect_attributes(const SpirVModule &mod)
+void Program::collect_attributes(const SpirVModule &mod, const vector<uint8_t> &used_variables)
{
+ const vector<SpirVModule::Variable> &variables = mod.get_variables();
for(const SpirVModule::EntryPoint &e: mod.get_entry_points())
if(e.stage==SpirVModule::VERTEX && e.name=="main")
{
for(const SpirVModule::Variable *v: e.globals)
- if(v->storage==SpirVModule::INPUT)
+ if(v->storage==SpirVModule::INPUT && used_variables[v-variables.data()])
{
- reflect_data.attributes.push_back(ReflectData::AttributeInfo());
+ reflect_data.attributes.emplace_back();
ReflectData::AttributeInfo &info = reflect_data.attributes.back();
info.name = v->name;
info.location = v->location;
projects / libs / gl.git / blobdiff