X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fcore%2Fprogram.cpp;h=468a40f5c8ba06025fe0729d4fc14bb8a536d227;hb=e9a898f;hp=ed2455f86aa315ec79f97bf2860563f7d40cc243;hpb=bdef3de6559629f25121de2e014383d7f773266b;p=libs%2Fgl.git diff --git a/source/core/program.cpp b/source/core/program.cpp index ed2455f8..468a40f5 100644 --- a/source/core/program.cpp +++ b/source/core/program.cpp @@ -147,10 +147,10 @@ void Program::add_glsl_stages(const GlslModule &mod, const map &spe #endif vector stages = compiler.get_stages(); - for(vector::const_iterator i=stages.begin(); i!=stages.end(); ++i) + for(SL::Stage::Type st: stages) { unsigned stage_id = 0; - switch(*i) + switch(st) { case SL::Stage::VERTEX: stage_id = add_stage(VERTEX); break; case SL::Stage::GEOMETRY: stage_id = add_stage(GEOMETRY); break; @@ -158,23 +158,21 @@ void Program::add_glsl_stages(const GlslModule &mod, const map &spe default: throw invalid_operation("Program::add_glsl_stages"); } - string stage_src = compiler.get_stage_glsl(*i); + string stage_src = compiler.get_stage_glsl(st); const char *src_ptr = stage_src.data(); int src_len = stage_src.size(); glShaderSource(stage_id, 1, &src_ptr, &src_len); - if(*i==SL::Stage::VERTEX) + if(st==SL::Stage::VERTEX) { - const map &attribs = compiler.get_vertex_attributes(); - for(map::const_iterator j=attribs.begin(); j!=attribs.end(); ++j) - glBindAttribLocation(id, j->second, j->first.c_str()); + for(const auto &kvp: compiler.get_vertex_attributes()) + glBindAttribLocation(id, kvp.second, kvp.first.c_str()); } - if(*i==SL::Stage::FRAGMENT && EXT_gpu_shader4) + if(st==SL::Stage::FRAGMENT && EXT_gpu_shader4) { - const map &frag_outs = compiler.get_fragment_outputs(); - for(map::const_iterator j=frag_outs.begin(); j!=frag_outs.end(); ++j) - glBindFragDataLocation(id, j->second, j->first.c_str()); + for(const auto &kvp: compiler.get_fragment_outputs()) + glBindFragDataLocation(id, kvp.second, kvp.first.c_str()); } compile_glsl_stage(stage_id); @@ -213,13 +211,12 @@ void Program::add_spirv_stages(const SpirVModule &mod, const map &s module = &mod; - const vector &entry_points = mod.get_entry_points(); unsigned n_stages = 0; unsigned used_stage_ids[MAX_STAGES]; - for(vector::const_iterator i=entry_points.begin(); i!=entry_points.end(); ++i) + for(const SpirVModule::EntryPoint &e: mod.get_entry_points()) { unsigned stage_id = 0; - switch(i->stage) + switch(e.stage) { case SpirVModule::VERTEX: stage_id = add_stage(VERTEX); break; case SpirVModule::GEOMETRY: stage_id = add_stage(GEOMETRY); break; @@ -241,18 +238,18 @@ void Program::add_spirv_stages(const SpirVModule &mod, const map &s vector spec_value_array; spec_id_array.reserve(spec_consts.size()); spec_value_array.reserve(spec_consts.size()); - for(vector::const_iterator i=spec_consts.begin(); i!=spec_consts.end(); ++i) + for(const SpirVModule::Constant &c: spec_consts) { - map::const_iterator j = spec_values.find(i->name); - if(j!=spec_values.end()) + auto i = spec_values.find(c.name); + if(i!=spec_values.end()) { - spec_id_array.push_back(i->constant_id); - spec_value_array.push_back(j->second); - transient->spec_values[i->constant_id] = j->second; + spec_id_array.push_back(c.constant_id); + spec_value_array.push_back(i->second); + transient->spec_values[c.constant_id] = i->second; } } - vector::const_iterator j=entry_points.begin(); + auto j = mod.get_entry_points().begin(); for(unsigned i=0; iname.c_str(), spec_id_array.size(), &spec_id_array[0], &spec_value_array[0]); @@ -347,7 +344,7 @@ void Program::link() { for(unsigned i=0; i::const_iterator j = transient->blocks.find(uniform_blocks[i].name); + auto j = transient->blocks.find(uniform_blocks[i].name); if(j!=transient->blocks.end()) { glUniformBlockBinding(id, i, j->second); @@ -357,15 +354,15 @@ void Program::link() if(!ARB_separate_shader_objects) glUseProgram(id); - for(map::const_iterator i=transient->textures.begin(); i!=transient->textures.end(); ++i) + for(const auto &kvp: transient->textures) { - int location = get_uniform_location(i->first); + int location = get_uniform_location(kvp.first); if(location>=0) { if(ARB_separate_shader_objects) - glProgramUniform1i(id, location, i->second); + glProgramUniform1i(id, location, kvp.second); else - glUniform1i(location, i->second); + glUniform1i(location, kvp.second); } } } @@ -379,10 +376,10 @@ void Program::link() delete transient; transient = 0; - for(vector::const_iterator i=uniforms.begin(); i!=uniforms.end(); ++i) - require_type(i->type); - for(vector::const_iterator i=attributes.begin(); i!=attributes.end(); ++i) - require_type(i->type); + for(const UniformInfo &u: uniforms) + require_type(u.type); + for(const AttributeInfo &a: attributes) + require_type(a.type); } void Program::query_uniforms() @@ -429,15 +426,15 @@ void Program::query_uniforms() uniform_blocks.push_back(UniformBlockInfo()); UniformBlockInfo &default_block = uniform_blocks.back(); - for(vector::iterator i=uniforms.begin(); i!=uniforms.end(); ++i) - if(!i->block) + for(UniformInfo &u: uniforms) + if(!u.block) { - i->location = glGetUniformLocation(id, i->name.c_str()); - i->block = &default_block; - default_block.uniforms.push_back(&*i); + u.location = glGetUniformLocation(id, u.name.c_str()); + u.block = &default_block; + default_block.uniforms.push_back(&u); - if(is_image(i->type) && i->location>=0) - glGetUniformiv(id, i->location, &i->binding); + if(is_image(u.type) && u.location>=0) + glGetUniformiv(id, u.location, &u.binding); } default_block.layout_hash = compute_layout_hash(default_block.uniforms); @@ -469,12 +466,12 @@ void Program::query_uniform_blocks(const vector &uniforms_by_inde glGetActiveUniformBlockiv(id, i, GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS, &value); vector indices(value); glGetActiveUniformBlockiv(id, i, GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES, &indices[0]); - for(vector::iterator j=indices.begin(); j!=indices.end(); ++j) + for(int j: indices) { - if(!uniforms_by_index[*j]) + if(!uniforms_by_index[j]) throw logic_error("Program::link"); - info.uniforms.push_back(uniforms_by_index[*j]); - uniforms_by_index[*j]->block = &info; + info.uniforms.push_back(uniforms_by_index[j]); + uniforms_by_index[j]->block = &info; } vector query_indices(indices.begin(), indices.end()); @@ -484,9 +481,9 @@ void Program::query_uniform_blocks(const vector &uniforms_by_inde uniforms_by_index[indices[j]]->offset = values[j]; query_indices.clear(); - for(vector::iterator j=indices.begin(); j!=indices.end(); ++j) - if(uniforms_by_index[*j]->array_size>1) - query_indices.push_back(*j); + for(int j: indices) + if(uniforms_by_index[j]->array_size>1) + query_indices.push_back(j); if(!query_indices.empty()) { glGetActiveUniformsiv(id, query_indices.size(), &query_indices[0], GL_UNIFORM_ARRAY_STRIDE, &values[0]); @@ -495,11 +492,11 @@ void Program::query_uniform_blocks(const vector &uniforms_by_inde } query_indices.clear(); - for(vector::iterator j=indices.begin(); j!=indices.end(); ++j) + for(int j: indices) { - DataType t = uniforms_by_index[*j]->type; + DataType t = uniforms_by_index[j]->type; if(is_matrix(t)) - query_indices.push_back(*j); + query_indices.push_back(j); } if(!query_indices.empty()) { @@ -547,34 +544,33 @@ void Program::collect_uniforms() uniform_blocks.push_back(UniformBlockInfo()); vector > block_uniform_names(1); - const vector &variables = mod.get_variables(); - for(vector::const_iterator i=variables.begin(); i!=variables.end(); ++i) + for(const SpirVModule::Variable &v: mod.get_variables()) { - if(i->storage==SpirVModule::UNIFORM && i->struct_type) + if(v.storage==SpirVModule::UNIFORM && v.struct_type) { uniform_blocks.push_back(UniformBlockInfo()); UniformBlockInfo &info = uniform_blocks.back(); - info.name = i->struct_type->name; - info.bind_point = i->binding; - info.data_size = i->struct_type->size; + info.name = v.struct_type->name; + info.bind_point = v.binding; + info.data_size = v.struct_type->size; string prefix; - if(!i->name.empty()) - prefix = i->struct_type->name+"."; + if(!v.name.empty()) + prefix = v.struct_type->name+"."; block_uniform_names.push_back(vector()); - collect_block_uniforms(*i->struct_type, prefix, 0, block_uniform_names.back()); + collect_block_uniforms(*v.struct_type, prefix, 0, block_uniform_names.back()); } - else if(i->storage==SpirVModule::UNIFORM_CONSTANT && i->location>=0) + else if(v.storage==SpirVModule::UNIFORM_CONSTANT && v.location>=0) { - block_uniform_names[0].push_back(i->name); + block_uniform_names[0].push_back(v.name); uniforms.push_back(UniformInfo()); UniformInfo &info = uniforms.back(); - info.name = i->name; - info.tag = i->name; - info.location = i->location; - info.binding = i->binding; - info.array_size = i->array_size; - info.type = i->type; + 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; } } @@ -583,11 +579,10 @@ void Program::collect_uniforms() for(unsigned i=0; i &names = block_uniform_names[i]; - for(vector::const_iterator j=names.begin(); j!=names.end(); ++j) + for(const string &n: block_uniform_names[i]) { // The element is already known to be present - UniformInfo &uni = *lower_bound_member(uniforms, Tag(*j), &UniformInfo::tag); + UniformInfo &uni = *lower_bound_member(uniforms, Tag(n), &UniformInfo::tag); block.uniforms.push_back(&uni); uni.block = █ } @@ -600,18 +595,18 @@ void Program::collect_uniforms() void Program::collect_block_uniforms(const SpirVModule::Structure &strct, const string &prefix, unsigned base_offset, vector &uniform_names) { - for(vector::const_iterator i=strct.members.begin(); i!=strct.members.end(); ++i) + for(const SpirVModule::StructMember &m: strct.members) { - unsigned offset = base_offset+i->offset; - if(i->struct_type) + unsigned offset = base_offset+m.offset; + if(m.struct_type) { - unsigned array_size = i->array_size; - if(i->array_size_spec) + unsigned array_size = m.array_size; + if(m.array_size_spec) { - array_size = i->array_size_spec->i_value; + array_size = m.array_size_spec->i_value; if(transient) { - map::const_iterator j = transient->spec_values.find(i->array_size_spec->constant_id); + auto j = transient->spec_values.find(m.array_size_spec->constant_id); if(j!=transient->spec_values.end()) array_size = j->second; } @@ -619,25 +614,25 @@ void Program::collect_block_uniforms(const SpirVModule::Structure &strct, const if(array_size) { - for(unsigned j=0; jarray_stride) - collect_block_uniforms(*i->struct_type, format("%s%s[%d].", prefix, i->name, j), offset, uniform_names); + for(unsigned j=0; jstruct_type, prefix+i->name+".", offset, uniform_names); + collect_block_uniforms(*m.struct_type, prefix+m.name+".", offset, uniform_names); } else { - string name = prefix+i->name; + string name = prefix+m.name; uniform_names.push_back(name); uniforms.push_back(UniformInfo()); UniformInfo &info = uniforms.back(); info.name = name; info.tag = name; info.offset = offset; - info.array_size = i->array_size; - info.array_stride = i->array_stride; - info.matrix_stride = i->matrix_stride; - info.type = i->type; + info.array_size = m.array_size; + info.array_stride = m.array_stride; + info.matrix_stride = m.matrix_stride; + info.type = m.type; } } } @@ -646,19 +641,18 @@ void Program::collect_attributes() { const SpirVModule &mod = static_cast(*module); - const vector &entry_points = mod.get_entry_points(); - for(vector::const_iterator i=entry_points.begin(); i!=entry_points.end(); ++i) - if(i->stage==SpirVModule::VERTEX && i->name=="main") + for(const SpirVModule::EntryPoint &e: mod.get_entry_points()) + if(e.stage==SpirVModule::VERTEX && e.name=="main") { - for(vector::const_iterator j=i->globals.begin(); j!=i->globals.end(); ++j) - if((*j)->storage==SpirVModule::INPUT) + for(const SpirVModule::Variable *v: e.globals) + if(v->storage==SpirVModule::INPUT) { attributes.push_back(AttributeInfo()); AttributeInfo &info = attributes.back(); - info.name = (*j)->name; - info.location = (*j)->location; - info.array_size = (*j)->array_size; - info.type = (*j)->type; + info.name = v->name; + info.location = v->location; + info.array_size = v->array_size; + info.type = v->type; } } } @@ -666,16 +660,16 @@ void Program::collect_attributes() void Program::update_layout_hash() { string layout_descriptor; - for(vector::const_iterator i=uniform_blocks.begin(); i!=uniform_blocks.end(); ++i) - layout_descriptor += format("%d:%x\n", i->bind_point, i->layout_hash); + for(const UniformBlockInfo &b: uniform_blocks) + layout_descriptor += format("%d:%x\n", b.bind_point, b.layout_hash); uniform_layout_hash = hash32(layout_descriptor); } Program::LayoutHash Program::compute_layout_hash(const vector &uniforms) { string layout_descriptor; - for(vector::const_iterator i = uniforms.begin(); i!=uniforms.end(); ++i) - layout_descriptor += format("%d:%s:%x:%d\n", (*i)->location, (*i)->name, (*i)->type, (*i)->array_size); + for(const UniformInfo *u: uniforms) + layout_descriptor += format("%d:%s:%x:%d\n", u->location, u->name, u->type, u->array_size); return hash32(layout_descriptor); } @@ -695,15 +689,15 @@ string Program::get_info_log() const const Program::UniformBlockInfo &Program::get_uniform_block_info(const string &name) const { - for(vector::const_iterator i=uniform_blocks.begin(); i!=uniform_blocks.end(); ++i) - if(i->name==name) - return *i; - throw key_error(name); + auto i = find_member(uniform_blocks, name, &UniformBlockInfo::name); + if(i==uniform_blocks.end()) + throw key_error(name); + return *i; } const Program::UniformInfo &Program::get_uniform_info(const string &name) const { - vector::const_iterator i = lower_bound_member(uniforms, Tag(name), &UniformInfo::tag); + auto i = lower_bound_member(uniforms, Tag(name), &UniformInfo::tag); if(i==uniforms.end() || i->name!=name) throw key_error(name); return *i; @@ -711,7 +705,7 @@ const Program::UniformInfo &Program::get_uniform_info(const string &name) const const Program::UniformInfo &Program::get_uniform_info(Tag tag) const { - vector::const_iterator i = lower_bound_member(uniforms, tag, &UniformInfo::tag); + auto i = lower_bound_member(uniforms, tag, &UniformInfo::tag); if(i==uniforms.end() || i->tag!=tag) throw key_error(tag); return *i; @@ -722,25 +716,25 @@ int Program::get_uniform_location(const string &name) const if(name[name.size()-1]==']') throw invalid_argument("Program::get_uniform_location"); - vector::const_iterator i = lower_bound_member(uniforms, Tag(name), &UniformInfo::tag); + auto i = lower_bound_member(uniforms, Tag(name), &UniformInfo::tag); return i!=uniforms.end() && i->name==name && i->block->bind_point<0 ? i->location : -1; } int Program::get_uniform_location(Tag tag) const { - vector::const_iterator i = lower_bound_member(uniforms, tag, &UniformInfo::tag); + auto i = lower_bound_member(uniforms, tag, &UniformInfo::tag); return i!=uniforms.end() && i->tag==tag && i->block->bind_point<0 ? i->location : -1; } int Program::get_uniform_binding(Tag tag) const { - vector::const_iterator i = lower_bound_member(uniforms, tag, &UniformInfo::tag); + auto i = lower_bound_member(uniforms, tag, &UniformInfo::tag); return i!=uniforms.end() && i->tag==tag ? i->binding : -1; } const Program::AttributeInfo &Program::get_attribute_info(const string &name) const { - vector::const_iterator i = lower_bound_member(attributes, name, &AttributeInfo::name); + auto i = lower_bound_member(attributes, name, &AttributeInfo::name); if(i==attributes.end() || i->name!=name) throw key_error(name); return *i; @@ -751,7 +745,7 @@ int Program::get_attribute_location(const string &name) const if(name[name.size()-1]==']') throw invalid_argument("Program::get_attribute_location"); - vector::const_iterator i = lower_bound_member(attributes, name, &AttributeInfo::name); + auto i = lower_bound_member(attributes, name, &AttributeInfo::name); return i!=attributes.end() && i->name==name ? i->location : -1; }