X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fprogram.cpp;h=9b5400a38122073af034eb05a17cdef434ad5820;hb=ca174bb730e3484cc9572013186d83bbc39bac99;hp=9c2968497f302ccad397ea311be277da98d683e5;hpb=171d9bbde3416bcb73339fc4175035817cdf963d;p=libs%2Fgl.git diff --git a/source/core/program.cpp b/source/core/program.cpp index 9c296849..9b5400a3 100644 --- a/source/core/program.cpp +++ b/source/core/program.cpp @@ -1,12 +1,14 @@ -#include #include #include +#include #include #include +#include #include #include #include #include +#include #include #include #include @@ -32,7 +34,7 @@ Program::Program() init(); } -Program::Program(const std::string &source) +Program::Program(const string &source) { init(); @@ -69,6 +71,7 @@ void Program::init() id = glCreateProgram(); module = 0; + bindings = 0; linked = false; } @@ -156,6 +159,11 @@ void Program::add_glsl_stages(const GlslModule &mod, const map &spe compile_glsl_stage(stage_id); } + + if(!bindings) + bindings = new Bindings; + bindings->textures = compiler.get_texture_bindings(); + bindings->blocks = compiler.get_uniform_block_bindings(); } void Program::compile_glsl_stage(unsigned stage_id) @@ -301,6 +309,34 @@ void Program::link() { query_uniforms(); query_attributes(); + if(bindings) + { + for(unsigned i=0; i::const_iterator j = bindings->blocks.find(uniform_blocks[i].name); + if(j!=bindings->blocks.end()) + { + glUniformBlockBinding(id, i, j->second); + uniform_blocks[i].bind_point = j->second; + } + } + + Conditional _bind(!ARB_separate_shader_objects, this); + for(map::const_iterator i=bindings->textures.begin(); i!=bindings->textures.end(); ++i) + { + int location = get_uniform_location(i->first); + if(location>=0) + { + if(ARB_separate_shader_objects) + glProgramUniform1i(id, location, i->second); + else + glUniform1i(location, i->second); + } + } + + delete bindings; + bindings = 0; + } } else if(module->get_format()==Module::SPIR_V) { @@ -308,16 +344,17 @@ void Program::link() collect_attributes(); } - for(UniformMap::const_iterator i=uniforms.begin(); i!=uniforms.end(); ++i) - require_type(i->second.type); - for(AttributeMap::const_iterator i=attributes.begin(); i!=attributes.end(); ++i) - require_type(i->second.type); + 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); } void Program::query_uniforms() { unsigned count = get_program_i(id, GL_ACTIVE_UNIFORMS); - vector uniforms_by_index(count); + uniforms.reserve(count); + vector uniform_names(count); for(unsigned i=0; i3 && !strcmp(name+len-3, "[0]")) name[len-3] = 0; - UniformInfo &info = uniforms[name]; + uniforms.push_back(UniformInfo()); + UniformInfo &info = uniforms.back(); info.name = name; + info.tag = name; info.array_size = size; info.type = from_gl_type(type); - uniforms_by_index[i] = &info; + uniform_names[i] = name; } } + sort_member(uniforms, &UniformInfo::tag); + if(ARB_uniform_buffer_object) + { + vector uniforms_by_index(count); + for(unsigned i=0; isecond.block) + for(vector::iterator i=uniforms.begin(); i!=uniforms.end(); ++i) + if(!i->block) { - i->second.location = glGetUniformLocation(id, i->second.name.c_str()); - i->second.block = &default_block; - default_block.uniforms.push_back(&i->second); + i->location = glGetUniformLocation(id, i->name.c_str()); + i->block = &default_block; + default_block.uniforms.push_back(&*i); + + if(is_image(i->type) && i->location>=0) + glGetUniformiv(id, i->location, &i->binding); } default_block.layout_hash = compute_layout_hash(default_block.uniforms); @@ -360,20 +412,25 @@ void Program::query_uniforms() void Program::query_uniform_blocks(const vector &uniforms_by_index) { - std::set used_bind_points; unsigned count = get_program_i(id, GL_ACTIVE_UNIFORM_BLOCKS); + // Reserve an extra index for the default block + uniform_blocks.reserve(count+1); for(unsigned i=0; i indices(value); glGetActiveUniformBlockiv(id, i, GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES, &indices[0]); @@ -385,51 +442,46 @@ void Program::query_uniform_blocks(const vector &uniforms_by_inde uniforms_by_index[*j]->block = &info; } - vector indices2(indices.begin(), indices.end()); + vector query_indices(indices.begin(), indices.end()); vector values(indices.size()); - glGetActiveUniformsiv(id, indices.size(), &indices2[0], GL_UNIFORM_OFFSET, &values[0]); + glGetActiveUniformsiv(id, query_indices.size(), &query_indices[0], GL_UNIFORM_OFFSET, &values[0]); for(unsigned j=0; jlocation = values[j]; + uniforms_by_index[indices[j]]->offset = values[j]; - indices2.clear(); + query_indices.clear(); for(vector::iterator j=indices.begin(); j!=indices.end(); ++j) if(uniforms_by_index[*j]->array_size>1) - indices2.push_back(*j); - if(!indices2.empty()) + query_indices.push_back(*j); + if(!query_indices.empty()) { - glGetActiveUniformsiv(id, indices2.size(), &indices2[0], GL_UNIFORM_ARRAY_STRIDE, &values[0]); - for(unsigned j=0; jarray_stride = values[j]; + glGetActiveUniformsiv(id, query_indices.size(), &query_indices[0], GL_UNIFORM_ARRAY_STRIDE, &values[0]); + for(unsigned j=0; jarray_stride = values[j]; } - indices2.clear(); + query_indices.clear(); for(vector::iterator j=indices.begin(); j!=indices.end(); ++j) { DataType t = uniforms_by_index[*j]->type; if(is_matrix(t)) - indices2.push_back(*j); + query_indices.push_back(*j); } - if(!indices2.empty()) + if(!query_indices.empty()) { - glGetActiveUniformsiv(id, indices2.size(), &indices2[0], GL_UNIFORM_MATRIX_STRIDE, &values[0]); - for(unsigned j=0; jmatrix_stride = values[j]; + glGetActiveUniformsiv(id, query_indices.size(), &query_indices[0], GL_UNIFORM_MATRIX_STRIDE, &values[0]); + for(unsigned j=0; jmatrix_stride = values[j]; } - sort(info.uniforms.begin(), info.uniforms.end(), uniform_location_compare); + sort(info.uniforms, uniform_location_compare); info.layout_hash = compute_layout_hash(info.uniforms); - unsigned n_bindings = BufferRange::get_n_uniform_buffer_bindings(); - info.bind_point = info.layout_hash%n_bindings; - while(used_bind_points.count(info.bind_point)) - info.bind_point = (info.bind_point+1)%n_bindings; - glUniformBlockBinding(id, i, info.bind_point); - used_bind_points.insert(info.bind_point); } } void Program::query_attributes() { unsigned count = get_program_i(id, GL_ACTIVE_ATTRIBUTES); + attributes.reserve(count); for(unsigned i=0; i3 && !strcmp(name+len-3, "[0]")) name[len-3] = 0; - AttributeInfo &info = attributes[name]; + attributes.push_back(AttributeInfo()); + AttributeInfo &info = attributes.back(); info.name = name; info.location = glGetAttribLocation(id, name); info.array_size = size; @@ -455,14 +508,17 @@ void Program::collect_uniforms() { const SpirVModule &mod = static_cast(*module); - UniformBlockInfo &default_block = uniform_blocks[string()]; + // Prepare the default block + 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) { if(i->storage==SpirVModule::UNIFORM && i->struct_type) { - UniformBlockInfo &info = uniform_blocks[i->struct_type->name]; + 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; @@ -470,53 +526,71 @@ void Program::collect_uniforms() string prefix; if(!i->name.empty()) prefix = i->struct_type->name+"."; - collect_block_uniforms(info, *i->struct_type, prefix, 0); - - info.layout_hash = compute_layout_hash(info.uniforms); + block_uniform_names.push_back(vector()); + collect_block_uniforms(*i->struct_type, prefix, 0, block_uniform_names.back()); } else if(i->storage==SpirVModule::UNIFORM_CONSTANT && i->location>=0) { - UniformInfo &info = uniforms[i->name]; + block_uniform_names[0].push_back(i->name); + uniforms.push_back(UniformInfo()); + UniformInfo &info = uniforms.back(); info.name = i->name; - info.block = &default_block; + info.tag = i->name; info.location = i->location; + info.binding = i->binding; info.array_size = i->array_size; info.type = i->type; - default_block.uniforms.push_back(&info); } } - default_block.layout_hash = compute_layout_hash(default_block.uniforms); + sort_member(uniforms, &UniformInfo::tag); + + for(unsigned i=0; i &names = block_uniform_names[i]; + for(vector::const_iterator j=names.begin(); j!=names.end(); ++j) + { + // The element is already known to be present + UniformInfo &uni = *lower_bound_member(uniforms, Tag(*j), &UniformInfo::tag); + block.uniforms.push_back(&uni); + uni.block = █ + } + sort(block.uniforms, uniform_location_compare); + block.layout_hash = compute_layout_hash(block.uniforms); + } update_layout_hash(); } -void Program::collect_block_uniforms(UniformBlockInfo &block, const SpirVModule::Structure &strct, const string &prefix, unsigned base_offset) +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) { + unsigned offset = base_offset+i->offset; if(i->struct_type) { if(i->array_size) { - for(unsigned j=0; jarray_size; ++j) - collect_block_uniforms(block, *i->struct_type, format("%s%s[%d].", prefix, i->name, j), base_offset+i->offset+i->array_stride*j); + for(unsigned j=0; jarray_size; ++j, offset+=i->array_stride) + collect_block_uniforms(*i->struct_type, format("%s%s[%d].", prefix, i->name, j), offset, uniform_names); } else - collect_block_uniforms(block, *i->struct_type, prefix+i->name+".", base_offset+i->offset); + collect_block_uniforms(*i->struct_type, prefix+i->name+".", offset, uniform_names); } else { string name = prefix+i->name; - UniformInfo &info = uniforms[name]; + uniform_names.push_back(name); + uniforms.push_back(UniformInfo()); + UniformInfo &info = uniforms.back(); info.name = name; - info.block = █ - info.location = i->offset; + 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; - block.uniforms.push_back(&info); } } } @@ -532,7 +606,9 @@ void Program::collect_attributes() for(vector::const_iterator j=i->globals.begin(); j!=i->globals.end(); ++j) if((*j)->storage==SpirVModule::INPUT) { - AttributeInfo &info = attributes[(*j)->name]; + 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; @@ -543,8 +619,8 @@ void Program::collect_attributes() void Program::update_layout_hash() { string layout_descriptor; - for(UniformBlockMap::const_iterator i=uniform_blocks.begin(); i!=uniform_blocks.end(); ++i) - layout_descriptor += format("%d:%x\n", i->second.bind_point, i->second.layout_hash); + 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); uniform_layout_hash = hash32(layout_descriptor); } @@ -572,38 +648,64 @@ string Program::get_info_log() const const Program::UniformBlockInfo &Program::get_uniform_block_info(const string &name) const { - return get_item(uniform_blocks, name); + for(vector::const_iterator i=uniform_blocks.begin(); i!=uniform_blocks.end(); ++i) + if(i->name==name) + return *i; + throw key_error(name); } const Program::UniformInfo &Program::get_uniform_info(const string &name) const { - return get_item(uniforms, name); + vector::const_iterator i = lower_bound_member(uniforms, Tag(name), &UniformInfo::tag); + if(i==uniforms.end() || i->name!=name) + throw key_error(name); + return *i; } -int Program::get_uniform_location(const string &n) const +const Program::UniformInfo &Program::get_uniform_info(Tag tag) const { - if(n[n.size()-1]==']') + vector::const_iterator i = lower_bound_member(uniforms, tag, &UniformInfo::tag); + if(i==uniforms.end() || i->tag!=tag) + throw key_error(tag); + return *i; +} + +int Program::get_uniform_location(const string &name) const +{ + if(name[name.size()-1]==']') throw invalid_argument("Program::get_uniform_location"); - UniformMap::const_iterator i = uniforms.find(n); - if(i==uniforms.end()) - return -1; + vector::const_iterator 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); + return i!=uniforms.end() && i->tag==tag && i->block->bind_point<0 ? i->location : -1; +} - return i->second.block->bind_point<0 ? i->second.location : -1; +int Program::get_uniform_binding(Tag tag) const +{ + vector::const_iterator 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 { - return get_item(attributes, name); + vector::const_iterator i = lower_bound_member(attributes, name, &AttributeInfo::name); + if(i==attributes.end() || i->name!=name) + throw key_error(name); + return *i; } -int Program::get_attribute_location(const string &n) const +int Program::get_attribute_location(const string &name) const { - if(n[n.size()-1]==']') + if(name[name.size()-1]==']') throw invalid_argument("Program::get_attribute_location"); - AttributeMap::const_iterator i = attributes.find(n); - return i!=attributes.end() ? i->second.location : -1; + vector::const_iterator i = lower_bound_member(attributes, name, &AttributeInfo::name); + return i!=attributes.end() && i->name==name ? i->location : -1; } void Program::bind() const @@ -628,11 +730,12 @@ void Program::unbind() Program::UniformInfo::UniformInfo(): block(0), - location(0), + location(-1), array_size(0), array_stride(0), matrix_stride(0), - type(VOID) + type(VOID), + binding(-1) { }