X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Fmodule.cpp;h=eaed8a45c7b7ed04003e996d28bcd7c85b99e68c;hp=ce540505fdf32d75a71c8430cb564b0537a3ca61;hb=38712d8ecc57d043a2419ffbaeeb57f7a6586f14;hpb=1f71ec73edacd6c1bd230abace3cb791eb2ca759 diff --git a/source/core/module.cpp b/source/core/module.cpp index ce540505..eaed8a45 100644 --- a/source/core/module.cpp +++ b/source/core/module.cpp @@ -1,3 +1,4 @@ +#include #include #include "module.h" #include "resources.h" @@ -100,23 +101,23 @@ SpirVModule &SpirVModule::operator=(const SpirVModule &other) void SpirVModule::remap_pointers_from(const SpirVModule &other) { - for(vector::iterator i=entry_points.begin(); i!=entry_points.end(); ++i) - for(vector::iterator j=i->globals.begin(); j!=i->globals.end(); ++j) - *j = &variables[*j-&other.variables.front()]; + for(EntryPoint &e: entry_points) + for(const Variable *&v: e.globals) + v = &variables[v-&other.variables.front()]; - for(vector::iterator i=variables.begin(); i!=variables.end(); ++i) - if(i->struct_type) - i->struct_type = &structs[i->struct_type-&other.structs.front()]; + for(Variable &v: variables) + if(v.struct_type) + v.struct_type = &structs[v.struct_type-&other.structs.front()]; - for(vector::iterator i=structs.begin(); i!=structs.end(); ++i) - for(vector::iterator j=i->members.begin(); j!=i->members.end(); ++j) - if(j->struct_type) - j->struct_type = &structs[j->struct_type-&other.structs.front()]; + for(Structure &s: structs) + for(StructMember &m: s.members) + if(m.struct_type) + m.struct_type = &structs[m.struct_type-&other.structs.front()]; } void SpirVModule::load_code(IO::Base &io) { - UInt32 buffer[1024]; + uint32_t buffer[1024]; while(1) { unsigned len = io.read(reinterpret_cast(buffer), sizeof(buffer)); @@ -144,8 +145,8 @@ void SpirVModule::reflect() if(code[0]==SPIRV_MAGIC_REVERSED) { - for(vector::iterator i=code.begin(); i!=code.end(); ++i) - *i = ((*i&0xFF)<<24) || ((*i&0xFF00)<<8) | ((*i>>8)&0xFF00) | ((*i>>24)&0xFF); + for(uint32_t &c: code) + c = ((c&0xFF)<<24) || ((c&0xFF00)<<8) | ((c>>8)&0xFF00) | ((c>>24)&0xFF); } else if(code[0]!=SPIRV_MAGIC) throw invalid_module("SPIR-V magic number not found"); @@ -153,106 +154,97 @@ void SpirVModule::reflect() Reflection reflection; reflection.reflect_code(code); + map spec_indices; + for(const auto &kvp: reflection.constants) + if(kvp.second.constant_id>=0) + { + spec_indices[&kvp.second] = spec_constants.size(); + spec_constants.push_back(kvp.second); + } + map struct_indices; structs.reserve(reflection.structs.size()); - for(map::const_iterator i=reflection.structs.begin(); i!=reflection.structs.end(); ++i) + for(const auto &kvp: reflection.structs) { - struct_indices[&i->second] = structs.size(); - structs.push_back(i->second); + struct_indices[&kvp.second] = structs.size(); + structs.push_back(kvp.second); } - for(vector::iterator i=structs.begin(); i!=structs.end(); ++i) + for(Structure &s: structs) { - for(vector::iterator j=i->members.begin(); j!=i->members.end(); ++j) + for(StructMember &m: s.members) { - if(j->struct_type) + if(m.struct_type) + { + auto i = struct_indices.find(m.struct_type); + m.struct_type = (i!=struct_indices.end() ? &structs[i->second] : 0); + } + if(m.array_size_spec) { - map::const_iterator k = struct_indices.find(j->struct_type); - j->struct_type = (k!=struct_indices.end() ? &structs[k->second] : 0); + auto i = spec_indices.find(m.array_size_spec); + m.array_size_spec = (i!=spec_indices.end() ? &spec_constants[i->second] : 0); } } - const StructMember *last_member = &i->members.back(); + const StructMember *last_member = &s.members.back(); unsigned last_offset = last_member->offset; while(last_member->struct_type) { const StructMember *lm = &last_member->struct_type->members.back(); if(last_member->array_size) last_offset += last_member->array_stride*(last_member->array_size-1); + else if(last_member->array_size_spec) + last_offset += last_member->array_stride*(last_member->array_size_spec->i_value-1); last_offset += lm->offset; last_member = lm; } - i->size = last_offset+get_type_size(last_member->type); - i->size = (i->size+15)&~15; + s.size = last_offset+get_type_size(last_member->type); + s.size = (s.size+15)&~15; } map var_indices; variables.reserve(reflection.variables.size()); - for(map::const_iterator i=reflection.variables.begin(); i!=reflection.variables.end(); ++i) + for(const auto &kvp: reflection.variables) { - int dup_index = -1; - for(vector::const_iterator j=variables.begin(); (dup_index<0 && j!=variables.end()); ++j) - if(*j==i->second) - dup_index = j-variables.begin(); - - if(dup_index>=0) - var_indices[&i->second] = dup_index; + auto i = find_if(variables, [&kvp](const Variable &v){ return v==kvp.second; }); + if(i!=variables.end()) + var_indices[&kvp.second] = i-variables.begin(); else { - var_indices[&i->second] = variables.size(); - variables.push_back(i->second); + var_indices[&kvp.second] = variables.size(); + variables.push_back(kvp.second); } } - for(vector::iterator i=variables.begin(); i!=variables.end(); ++i) - if(i->struct_type) + for(Variable &v: variables) + { + if(v.struct_type) + { + auto i = struct_indices.find(v.struct_type); + v.struct_type = (i!=struct_indices.end() ? &structs[i->second] : 0); + } + if(v.array_size_spec) { - map::const_iterator j = struct_indices.find(i->struct_type); - i->struct_type = (j!=struct_indices.end() ? &structs[j->second] : 0); + auto i = spec_indices.find(v.array_size_spec); + v.array_size_spec = (i!=spec_indices.end() ? &spec_constants[i->second] : 0); } + } entry_points.reserve(reflection.entry_points.size()); - for(map::const_iterator i=reflection.entry_points.begin(); i!=reflection.entry_points.end(); ++i) + for(const auto &kvp: reflection.entry_points) { - entry_points.push_back(i->second); + entry_points.push_back(kvp.second); EntryPoint &entry = entry_points.back(); - for(vector::iterator j=entry.globals.begin(); j!=entry.globals.end(); ++j) + for(const Variable *&v: entry.globals) { - map::const_iterator k = var_indices.find(*j); - *j = (k!=var_indices.end() ? &variables[k->second] : 0); + auto i = var_indices.find(v); + v = (i!=var_indices.end() ? &variables[i->second] : 0); } } - - for(map::const_iterator i=reflection.constants.begin(); i!=reflection.constants.end(); ++i) - if(i->second->constant_id>=0) - spec_constants.push_back(i->second); } -SpirVModule::EntryPoint::EntryPoint(): - stage(VERTEX) -{ } - - -SpirVModule::StructMember::StructMember(): - type(VOID), - struct_type(0), - offset(0), - array_size(0), - array_stride(0), - matrix_stride(0) -{ } - - -SpirVModule::Variable::Variable(): - type(VOID), - struct_type(0), - location(-1), - descriptor_set(-1), - binding(-1) -{ } - bool SpirVModule::Variable::operator==(const Variable &other) const { if(storage!=UNIFORM_CONSTANT && storage!=UNIFORM) @@ -265,16 +257,7 @@ bool SpirVModule::Variable::operator==(const Variable &other) const } -SpirVModule::TypeInfo::TypeInfo(): - type(VOID), - struct_type(0), - array_size(0), - array_stride(0), - storage(static_cast(-1)) -{ } - - -UInt32 SpirVModule::Reflection::get_opcode(UInt32 op) +uint32_t SpirVModule::Reflection::get_opcode(uint32_t op) { return op&0xFFFF; } @@ -306,7 +289,7 @@ string SpirVModule::Reflection::read_string(CodeIterator &op, const CodeIterator throw invalid_module("Unterminated SPIR-V string literal"); } -void SpirVModule::Reflection::reflect_code(const vector &code) +void SpirVModule::Reflection::reflect_code(const vector &code) { for(CodeIterator op=code.begin()+5; op!=code.end(); ) { @@ -443,7 +426,9 @@ void SpirVModule::Reflection::reflect_array_type(CodeIterator op) type.struct_type = elem.struct_type; const Constant &size = constants[*(op+3)]; - if(size.type==INT || size.type==UNSIGNED_INT) + if(size.constant_id>=0) + type.array_size_spec = &size; + else if(size.type==INT || size.type==UNSIGNED_INT) type.array_size = size.i_value; } @@ -457,13 +442,14 @@ void SpirVModule::Reflection::reflect_struct_type(CodeIterator op) op += 2; strct.members.resize(op_end-op); - vector::iterator mem = strct.members.begin(); + auto mem = strct.members.begin(); for(; op!=op_end; ++op, ++mem) { TypeInfo &type = types[*op]; mem->type = type.type; mem->struct_type = type.struct_type; mem->array_size = type.array_size; + mem->array_size_spec = type.array_size_spec; mem->array_stride = type.array_stride; } } @@ -501,6 +487,7 @@ void SpirVModule::Reflection::reflect_variable(CodeIterator op) var.type = type.type; var.struct_type = type.struct_type; var.array_size = type.array_size; + var.array_size_spec = type.array_size_spec; } void SpirVModule::Reflection::reflect_decorate(CodeIterator op)