X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fprogram.cpp;h=82f438cdbf02112ff3362018b7587b066f251fbd;hb=1b23728908f5ec9beb08b2b70737c3903745fddc;hp=22626c6543674118737df4e1272785f1db6f9a12;hpb=6f39983060a27634c012f66c82fea0d09fea9774;p=libs%2Fgl.git diff --git a/source/core/program.cpp b/source/core/program.cpp index 22626c65..82f438cd 100644 --- a/source/core/program.cpp +++ b/source/core/program.cpp @@ -1,7 +1,6 @@ #include #include #include -#include #include #include #include @@ -13,15 +12,13 @@ #include #include #include +#include #include #include -#include #include "buffer.h" #include "error.h" -#include "misc.h" #include "program.h" #include "resources.h" -#include "shader.h" #include "glsl/compiler.h" using namespace std; @@ -34,30 +31,6 @@ Program::Program() init(); } -Program::Program(const string &source) -{ - init(); - - GlslModule mod; - mod.set_source(source); - add_stages(mod); - - link(); - module = 0; -} - -Program::Program(const string &vert, const string &frag) -{ - init(); - -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - attach_shader_owned(new VertexShader(vert)); - attach_shader_owned(new FragmentShader(frag)); -#pragma GCC diagnostic pop - link(); -} - Program::Program(const Module &mod, const map &spec_values) { init(); @@ -70,21 +43,23 @@ void Program::init() static Require _req(ARB_shader_objects); id = glCreateProgram(); + fill(stage_ids, stage_ids+MAX_STAGES, 0); module = 0; - bindings = 0; + transient = 0; linked = false; } Program::~Program() { - for(vector::iterator i=stage_ids.begin(); i!=stage_ids.end(); ++i) - glDeleteShader(*i); + for(unsigned i=0; i &spec_values) { - if(!stage_ids.empty()) + if(has_stages()) throw invalid_operation("Program::add_stages"); switch(mod.get_format()) @@ -95,20 +70,37 @@ void Program::add_stages(const Module &mod, const map &spec_values) } } -unsigned Program::add_stage(GLenum type) +bool Program::has_stages() const +{ + for(unsigned i=0; i &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(GL_VERTEX_SHADER); break; - case SL::Stage::GEOMETRY: stage_id = add_stage(GL_GEOMETRY_SHADER); break; - case SL::Stage::FRAGMENT: stage_id = add_stage(GL_FRAGMENT_SHADER); break; + case SL::Stage::VERTEX: stage_id = add_stage(VERTEX); break; + case SL::Stage::GEOMETRY: stage_id = add_stage(GEOMETRY); break; + case SL::Stage::FRAGMENT: stage_id = add_stage(FRAGMENT); break; 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); } - if(!bindings) - bindings = new Bindings; - bindings->textures = compiler.get_texture_bindings(); - bindings->blocks = compiler.get_uniform_block_bindings(); + if(!transient) + transient = new TransientData; + transient->textures = compiler.get_texture_bindings(); + transient->blocks = compiler.get_uniform_block_bindings(); } void Program::compile_glsl_stage(unsigned stage_id) { glCompileShader(stage_id); - bool compiled = get_shader_i(stage_id, GL_COMPILE_STATUS); + int status = 0; + glGetShaderiv(stage_id, GL_COMPILE_STATUS, &status); - GLsizei info_log_len = get_shader_i(stage_id, GL_INFO_LOG_LENGTH); + int info_log_len = 0; + glGetShaderiv(stage_id, GL_INFO_LOG_LENGTH, &info_log_len); string info_log(info_log_len+1, 0); glGetShaderInfoLog(stage_id, info_log_len+1, &info_log_len, &info_log[0]); info_log.erase(info_log_len); if(module && module->get_format()==Module::GLSL) info_log = static_cast(module)->get_source_map().translate_errors(info_log); - if(!compiled) + if(!status) throw compile_error(info_log); #ifdef DEBUG if(!info_log.empty()) @@ -193,105 +185,64 @@ void Program::add_spirv_stages(const SpirVModule &mod, const map &s module = &mod; - const vector &entry_points = mod.get_entry_points(); - std::set stages; - for(vector::const_iterator i=entry_points.begin(); i!=entry_points.end(); ++i) + unsigned n_stages = 0; + unsigned used_stage_ids[MAX_STAGES]; + for(const SpirVModule::EntryPoint &e: mod.get_entry_points()) { - if(stages.count(i->stage)) - throw invalid_argument("Program::add_spirv_stages"); - - switch(i->stage) + unsigned stage_id = 0; + switch(e.stage) { - case SpirVModule::VERTEX: add_stage(GL_VERTEX_SHADER); break; - case SpirVModule::GEOMETRY: add_stage(GL_GEOMETRY_SHADER); break; - case SpirVModule::FRAGMENT: add_stage(GL_FRAGMENT_SHADER); break; + case SpirVModule::VERTEX: stage_id = add_stage(VERTEX); break; + case SpirVModule::GEOMETRY: stage_id = add_stage(GEOMETRY); break; + case SpirVModule::FRAGMENT: stage_id = add_stage(FRAGMENT); break; default: throw invalid_operation("Program::add_spirv_stages"); } - stages.insert(i->stage); + used_stage_ids[n_stages++] = stage_id; } - const vector &code = mod.get_code(); - glShaderBinary(stage_ids.size(), &stage_ids[0], GL_SHADER_BINARY_FORMAT_SPIR_V, &code[0], code.size()*4); + const vector &code = mod.get_code(); + glShaderBinary(n_stages, used_stage_ids, GL_SHADER_BINARY_FORMAT_SPIR_V, &code[0], code.size()*4); + + if(!spec_values.empty() && !transient) + transient = new TransientData; - const vector &spec_consts = mod.get_spec_constants(); + const vector &spec_consts = mod.get_spec_constants(); vector spec_id_array; 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); + 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(); - for(vector::const_iterator i=stage_ids.begin(); i!=stage_ids.end(); ++i, ++j) - glSpecializeShader(*i, j->name.c_str(), spec_id_array.size(), &spec_id_array[0], &spec_value_array[0]); + 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]); } -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" -void Program::attach_shader(Shader &shader) -{ - unsigned shader_id = shader.steal_id(); - if(!shader_id) - throw invalid_argument("Program::attach_shader"); - stage_ids.push_back(shader_id); - compile_glsl_stage(shader_id); -} - -void Program::attach_shader_owned(Shader *shader) -{ - attach_shader(*shader); - delete shader; -} - -void Program::detach_shader(Shader &) -{ -} - -const vector &Program::get_attached_shaders() const -{ - static vector dummy; - return dummy; -} - -void Program::bind_attribute(unsigned index, const string &name) -{ - static Require _req(ARB_vertex_shader); - glBindAttribLocation(id, index, name.c_str()); -} - -void Program::bind_attribute(VertexAttribute attr, const string &name) -{ - bind_attribute(get_attribute_semantic(attr), name); -} - -void Program::bind_fragment_data(unsigned index, const string &name) -{ - static Require _req(EXT_gpu_shader4); - glBindFragDataLocation(id, index, name.c_str()); -} -#pragma GCC diagnostic pop - void Program::link() { - if(stage_ids.empty()) + if(!has_stages()) throw invalid_operation("Program::link"); - uniforms.clear(); - uniform_blocks.clear(); - attributes.clear(); + reflect_data = ReflectData(); glLinkProgram(id); - linked = get_program_i(id, GL_LINK_STATUS); + int status = 0; + glGetProgramiv(id, GL_LINK_STATUS, &status); + linked = status; - GLsizei info_log_len = get_program_i(id, GL_INFO_LOG_LENGTH); + int info_log_len = 0; + glGetProgramiv(id, GL_INFO_LOG_LENGTH, &info_log_len); string info_log(info_log_len+1, 0); glGetProgramInfoLog(id, info_log_len+1, &info_log_len, &info_log[0]); info_log.erase(info_log_len); @@ -309,33 +260,31 @@ void Program::link() { query_uniforms(); query_attributes(); - if(bindings) + if(transient) { - for(unsigned i=0; i::const_iterator j = bindings->blocks.find(uniform_blocks[i].name); - if(j!=bindings->blocks.end()) + auto j = transient->blocks.find(reflect_data.uniform_blocks[i].name); + if(j!=transient->blocks.end()) { glUniformBlockBinding(id, i, j->second); - uniform_blocks[i].bind_point = j->second; + reflect_data.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) + if(!ARB_separate_shader_objects) + glUseProgram(id); + 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); } } - - delete bindings; - bindings = 0; } } else if(module->get_format()==Module::SPIR_V) @@ -344,16 +293,20 @@ void Program::link() collect_attributes(); } - 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); + delete transient; + transient = 0; + + for(const ReflectData::UniformInfo &u: reflect_data.uniforms) + require_type(u.type); + for(const ReflectData::AttributeInfo &a: reflect_data.attributes) + require_type(a.type); } void Program::query_uniforms() { - unsigned count = get_program_i(id, GL_ACTIVE_UNIFORMS); - uniforms.reserve(count); + unsigned count = 0; + glGetProgramiv(id, GL_ACTIVE_UNIFORMS, reinterpret_cast(&count)); + reflect_data.uniforms.reserve(count); vector uniform_names(count); for(unsigned i=0; i3 && !strcmp(name+len-3, "[0]")) name[len-3] = 0; - uniforms.push_back(UniformInfo()); - UniformInfo &info = uniforms.back(); + reflect_data.uniforms.push_back(ReflectData::UniformInfo()); + ReflectData::UniformInfo &info = reflect_data.uniforms.back(); info.name = name; info.tag = name; info.array_size = size; @@ -379,49 +332,49 @@ void Program::query_uniforms() } } - sort_member(uniforms, &UniformInfo::tag); + sort_member(reflect_data.uniforms, &ReflectData::UniformInfo::tag); if(ARB_uniform_buffer_object) { - vector uniforms_by_index(count); + vector uniforms_by_index(count); for(unsigned i=0; i::iterator i=uniforms.begin(); i!=uniforms.end(); ++i) - if(!i->block) + for(ReflectData::UniformInfo &u: reflect_data.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); - - update_layout_hash(); + default_block.update_layout_hash(); + reflect_data.update_layout_hash(); } -void Program::query_uniform_blocks(const vector &uniforms_by_index) +void Program::query_uniform_blocks(const vector &uniforms_by_index) { - unsigned count = get_program_i(id, GL_ACTIVE_UNIFORM_BLOCKS); + unsigned count = 0; + glGetProgramiv(id, GL_ACTIVE_UNIFORM_BLOCKS, reinterpret_cast(&count)); // Reserve an extra index for the default block - uniform_blocks.reserve(count+1); + reflect_data.uniform_blocks.reserve(count+1); for(unsigned i=0; i &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()); @@ -449,9 +402,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]); @@ -460,11 +413,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()) { @@ -473,15 +426,16 @@ void Program::query_uniform_blocks(const vector &uniforms_by_inde uniforms_by_index[query_indices[j]]->matrix_stride = values[j]; } - sort(info.uniforms, uniform_location_compare); - info.layout_hash = compute_layout_hash(info.uniforms); + info.sort_uniforms(); + info.update_layout_hash(); } } void Program::query_attributes() { - unsigned count = get_program_i(id, GL_ACTIVE_ATTRIBUTES); - attributes.reserve(count); + unsigned count = 0; + glGetProgramiv(id, GL_ACTIVE_ATTRIBUTES, reinterpret_cast(&count)); + reflect_data.attributes.reserve(count); for(unsigned i=0; i3 && !strcmp(name+len-3, "[0]")) name[len-3] = 0; - attributes.push_back(AttributeInfo()); - AttributeInfo &info = attributes.back(); + reflect_data.attributes.push_back(ReflectData::AttributeInfo()); + ReflectData::AttributeInfo &info = reflect_data.attributes.back(); info.name = name; info.location = glGetAttribLocation(id, name); info.array_size = size; @@ -509,87 +463,98 @@ void Program::collect_uniforms() const SpirVModule &mod = static_cast(*module); // Prepare the default block - uniform_blocks.push_back(UniformBlockInfo()); + reflect_data.uniform_blocks.push_back(ReflectData::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; + reflect_data.uniform_blocks.push_back(ReflectData::UniformBlockInfo()); + ReflectData::UniformBlockInfo &info = reflect_data.uniform_blocks.back(); + 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); - uniforms.push_back(UniformInfo()); - UniformInfo &info = uniforms.back(); - info.name = i->name; - info.tag = i->name; - info.location = i->location; - info.array_size = i->array_size; - info.type = i->type; + block_uniform_names[0].push_back(v.name); + reflect_data.uniforms.push_back(ReflectData::UniformInfo()); + ReflectData::UniformInfo &info = reflect_data.uniforms.back(); + 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; } } - sort_member(uniforms, &UniformInfo::tag); + sort_member(reflect_data.uniforms, &ReflectData::UniformInfo::tag); - for(unsigned i=0; i &names = block_uniform_names[i]; - for(vector::const_iterator j=names.begin(); j!=names.end(); ++j) + ReflectData::UniformBlockInfo &block = reflect_data.uniform_blocks[i]; + 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); + ReflectData::UniformInfo &uni = *lower_bound_member(reflect_data.uniforms, Tag(n), &ReflectData::UniformInfo::tag); block.uniforms.push_back(&uni); uni.block = █ } - sort(block.uniforms, uniform_location_compare); - block.layout_hash = compute_layout_hash(block.uniforms); + block.sort_uniforms(); + block.update_layout_hash(); } - update_layout_hash(); + reflect_data.update_layout_hash(); } 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) { - if(i->array_size) + unsigned array_size = m.array_size; + if(m.array_size_spec) { - 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); + array_size = m.array_size_spec->i_value; + if(transient) + { + auto j = transient->spec_values.find(m.array_size_spec->constant_id); + if(j!=transient->spec_values.end()) + array_size = j->second; + } + } + + if(array_size) + { + 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(); + reflect_data.uniforms.push_back(ReflectData::UniformInfo()); + ReflectData::UniformInfo &info = reflect_data.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; } } } @@ -598,73 +563,42 @@ 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; + reflect_data.attributes.push_back(ReflectData::AttributeInfo()); + ReflectData::AttributeInfo &info = reflect_data.attributes.back(); + info.name = v->name; + info.location = v->location; + info.array_size = v->array_size; + info.type = v->type; } } } -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); - 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); - return hash32(layout_descriptor); -} - -bool Program::uniform_location_compare(const UniformInfo *uni1, const UniformInfo *uni2) -{ - return uni1->locationlocation; -} - -string Program::get_info_log() const -{ - GLsizei len = get_program_i(id, GL_INFO_LOG_LENGTH); - string log(len+1, 0); - glGetProgramInfoLog(id, len+1, &len, &log[0]); - log.erase(len); - return log; -} - -const Program::UniformBlockInfo &Program::get_uniform_block_info(const string &name) const +const ReflectData::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(reflect_data.uniform_blocks, name, &ReflectData::UniformBlockInfo::name); + if(i==reflect_data.uniform_blocks.end()) + throw key_error(name); + return *i; } -const Program::UniformInfo &Program::get_uniform_info(const string &name) const +const ReflectData::UniformInfo &Program::get_uniform_info(const string &name) const { - vector::const_iterator i = lower_bound_member(uniforms, Tag(name), &UniformInfo::tag); - if(i==uniforms.end() || i->name!=name) + auto i = lower_bound_member(reflect_data.uniforms, Tag(name), &ReflectData::UniformInfo::tag); + if(i==reflect_data.uniforms.end() || i->name!=name) throw key_error(name); return *i; } -const Program::UniformInfo &Program::get_uniform_info(Tag tag) const +const ReflectData::UniformInfo &Program::get_uniform_info(Tag tag) const { - vector::const_iterator i = lower_bound_member(uniforms, tag, &UniformInfo::tag); - if(i==uniforms.end() || i->tag!=tag) + auto i = lower_bound_member(reflect_data.uniforms, tag, &ReflectData::UniformInfo::tag); + if(i==reflect_data.uniforms.end() || i->tag!=tag) throw key_error(tag); return *i; } @@ -674,26 +608,26 @@ 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); - return i!=uniforms.end() && i->name==name && i->block->bind_point<0 ? i->location : -1; + auto i = lower_bound_member(reflect_data.uniforms, Tag(name), &ReflectData::UniformInfo::tag); + return i!=reflect_data.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; + auto i = lower_bound_member(reflect_data.uniforms, tag, &ReflectData::UniformInfo::tag); + return i!=reflect_data.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); - return i!=uniforms.end() && i->tag==tag ? i->binding : -1; + auto i = lower_bound_member(reflect_data.uniforms, tag, &ReflectData::UniformInfo::tag); + return i!=reflect_data.uniforms.end() && i->tag==tag ? i->binding : -1; } -const Program::AttributeInfo &Program::get_attribute_info(const string &name) const +const ReflectData::AttributeInfo &Program::get_attribute_info(const string &name) const { - vector::const_iterator i = lower_bound_member(attributes, name, &AttributeInfo::name); - if(i==attributes.end() || i->name!=name) + auto i = lower_bound_member(reflect_data.attributes, name, &ReflectData::AttributeInfo::name); + if(i==reflect_data.attributes.end() || i->name!=name) throw key_error(name); return *i; } @@ -703,65 +637,42 @@ 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); - return i!=attributes.end() && i->name==name ? i->location : -1; + auto i = lower_bound_member(reflect_data.attributes, name, &ReflectData::AttributeInfo::name); + return i!=reflect_data.attributes.end() && i->name==name ? i->location : -1; } -void Program::bind() const +void Program::set_debug_name(const string &name) { - if(!linked) - throw invalid_operation("Program::bind"); - - if(!set_current(this)) - return; - - glUseProgram(id); +#ifdef DEBUG + debug_name = name; + if(KHR_debug) + { + glObjectLabel(GL_PROGRAM, id, name.size(), name.c_str()); + for(unsigned i=0; i(i)); + } +#else + (void)name; +#endif } -void Program::unbind() +void Program::set_stage_debug_name(unsigned stage_id, Stage type) { - if(!set_current(0)) - return; - - glUseProgram(0); +#ifdef DEBUG + static const char *const suffixes[] = { " [VS]", " [GS]", " [FS]" }; + string name = debug_name+suffixes[type]; + glObjectLabel(GL_SHADER, stage_id, name.size(), name.c_str()); +#else + (void)stage_id; (void)type; +#endif } -Program::UniformInfo::UniformInfo(): - block(0), - location(-1), - array_size(0), - array_stride(0), - matrix_stride(0), - type(VOID), - binding(-1) -{ } - - -Program::UniformBlockInfo::UniformBlockInfo(): - data_size(0), - bind_point(-1), - layout_hash(0) -{ } - - -Program::AttributeInfo::AttributeInfo(): - location(-1), - array_size(0), - type(VOID) -{ } - - Program::Loader::Loader(Program &p, Collection &c): DataFile::CollectionObjectLoader(p, &c) { add("module", &Loader::module); - - // Deprecated - add("attribute", &Loader::attribute); - add("fragment_shader", &Loader::fragment_shader); - add("geometry_shader", &Loader::geometry_shader); - add("vertex_shader", &Loader::vertex_shader); } void Program::Loader::finish() @@ -777,29 +688,6 @@ void Program::Loader::module(const string &n) obj.add_stages(get_collection().get(n), spec_values); } -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" -void Program::Loader::attribute(unsigned i, const string &n) -{ - obj.bind_attribute(i, n); -} - -void Program::Loader::fragment_shader(const string &src) -{ - obj.attach_shader_owned(new FragmentShader(src)); -} - -void Program::Loader::geometry_shader(const string &src) -{ - obj.attach_shader_owned(new GeometryShader(src)); -} - -void Program::Loader::vertex_shader(const string &src) -{ - obj.attach_shader_owned(new VertexShader(src)); -} -#pragma GCC diagnostic pop - DataFile::Loader::ActionMap Program::SpecializationLoader::shared_actions;