X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Fprogram.cpp;h=acdb20e88a5488063c3778a598af10f411b1b541;hp=8bec2f6f488295474804d641516b825de8ef309a;hb=7ef75a4c4dbfc437e466381dd67c23357e607b82;hpb=b877c737bc5f759e6da25f886ad965e4a274cf2a diff --git a/source/core/program.cpp b/source/core/program.cpp index 8bec2f6f..acdb20e8 100644 --- a/source/core/program.cpp +++ b/source/core/program.cpp @@ -1,62 +1,15 @@ -#include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "buffer.h" #include "error.h" #include "program.h" -#include "resources.h" -#include "glsl/compiler.h" using namespace std; namespace Msp { namespace GL { -Program::Program() -{ - init(); -} - Program::Program(const Module &mod, const map &spec_values) { - init(); add_stages(mod, spec_values); - link(); -} - -void Program::init() -{ - static Require _req(ARB_shader_objects); - - id = glCreateProgram(); - fill(stage_ids, stage_ids+MAX_STAGES, 0); - module = 0; - transient = 0; - linked = false; -} - -Program::~Program() -{ - for(unsigned i=0; i &spec_values) @@ -64,421 +17,62 @@ void Program::add_stages(const Module &mod, const map &spec_values) if(has_stages()) throw invalid_operation("Program::add_stages"); - switch(mod.get_format()) - { - case Module::GLSL: return add_glsl_stages(static_cast(mod), spec_values); - case Module::SPIR_V: return add_spirv_stages(static_cast(mod), spec_values); - default: throw invalid_argument("Program::add_stages"); - } -} - -bool Program::has_stages() const -{ - for(unsigned i=0; i &spec_values) -{ - module = &mod; - - SL::Compiler compiler; - compiler.set_source(mod.get_prepared_source(), ""); - compiler.specialize(spec_values); - compiler.compile(SL::Compiler::PROGRAM); -#ifdef DEBUG - string diagnostics = compiler.get_diagnostics(); - if(!diagnostics.empty()) - IO::print("Program diagnostics:\n%s\n", diagnostics); -#endif - - vector stages = compiler.get_stages(); - for(SL::Stage::Type st: stages) - { - unsigned stage_id = 0; - switch(st) - { - 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(st); - const char *src_ptr = stage_src.data(); - int src_len = stage_src.size(); - glShaderSource(stage_id, 1, &src_ptr, &src_len); - - if(st==SL::Stage::VERTEX) - { - for(const auto &kvp: compiler.get_vertex_attributes()) - glBindAttribLocation(id, kvp.second, kvp.first.c_str()); - } - - if(st==SL::Stage::FRAGMENT && EXT_gpu_shader4) - { - for(const auto &kvp: compiler.get_fragment_outputs()) - glBindFragDataLocation(id, kvp.second, kvp.first.c_str()); - } - - compile_glsl_stage(stage_id); - } - - 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); - int status = 0; - glGetShaderiv(stage_id, GL_COMPILE_STATUS, &status); - - 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(!status) - throw compile_error(info_log); -#ifdef DEBUG - if(!info_log.empty()) - IO::print("Shader compile info log:\n%s", info_log); -#endif -} - -void Program::add_spirv_stages(const SpirVModule &mod, const map &spec_values) -{ - static Require _req(ARB_gl_spirv); - static Require _req2(ARB_ES2_compatibility); + reflect_data = ReflectData(); - module = &mod; - - unsigned n_stages = 0; - unsigned used_stage_ids[MAX_STAGES]; - for(const SpirVModule::EntryPoint &e: mod.get_entry_points()) + TransientData transient; + switch(mod.get_format()) { - unsigned stage_id = 0; - switch(e.stage) - { - 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"); - } - - used_stage_ids[n_stages++] = stage_id; + case Module::GLSL: + add_glsl_stages(static_cast(mod), spec_values, transient); + break; + case Module::SPIR_V: + add_spirv_stages(static_cast(mod), spec_values); + break; + default: + throw invalid_argument("Program::add_stages"); } - 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; + finalize(mod, transient); - 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(const SpirVModule::Constant &c: spec_consts) + if(mod.get_format()==Module::SPIR_V) { - auto i = spec_values.find(c.name); - if(i!=spec_values.end()) - { - spec_id_array.push_back(c.constant_id); - spec_value_array.push_back(i->second); - transient->spec_values[c.constant_id] = i->second; - } + collect_uniforms(static_cast(mod)); + collect_attributes(static_cast(mod)); + collect_builtins(static_cast(mod)); } - 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]); -} + finalize_uniforms(); -void Program::link() -{ - if(!has_stages()) - throw invalid_operation("Program::link"); - - uniforms.clear(); - uniform_blocks.clear(); - attributes.clear(); - - glLinkProgram(id); - int status = 0; - glGetProgramiv(id, GL_LINK_STATUS, &status); - linked = status; - - 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); - if(module && module->get_format()==Module::GLSL) - info_log = static_cast(module)->get_source_map().translate_errors(info_log); - - if(!linked) - throw compile_error(info_log); -#ifdef DEBUG - if(!info_log.empty()) - IO::print("Program link info log:\n%s", info_log); -#endif - - if(module->get_format()==Module::GLSL) - { - query_uniforms(); - query_attributes(); - if(transient) - { - for(unsigned i=0; iblocks.find(uniform_blocks[i].name); - if(j!=transient->blocks.end()) - { - glUniformBlockBinding(id, i, j->second); - uniform_blocks[i].bind_point = j->second; - } - } - - if(!ARB_separate_shader_objects) - glUseProgram(id); - for(const auto &kvp: transient->textures) - { - int location = get_uniform_location(kvp.first); - if(location>=0) - { - if(ARB_separate_shader_objects) - glProgramUniform1i(id, location, kvp.second); - else - glUniform1i(location, kvp.second); - } - } - } - } - else if(module->get_format()==Module::SPIR_V) - { - collect_uniforms(); - collect_attributes(); - } - - delete transient; - transient = 0; - - for(const UniformInfo &u: uniforms) + for(const ReflectData::UniformInfo &u: reflect_data.uniforms) require_type(u.type); - for(const AttributeInfo &a: attributes) + for(const ReflectData::AttributeInfo &a: reflect_data.attributes) require_type(a.type); } -void Program::query_uniforms() -{ - unsigned count = 0; - glGetProgramiv(id, GL_ACTIVE_UNIFORMS, reinterpret_cast(&count)); - 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(); - info.name = name; - info.tag = name; - info.array_size = size; - info.type = from_gl_type(type); - uniform_names[i] = name; - } - } - - sort_member(uniforms, &UniformInfo::tag); - - if(ARB_uniform_buffer_object) - { - vector uniforms_by_index(count); - for(unsigned i=0; i=0) - glGetUniformiv(id, u.location, &u.binding); - } - - default_block.layout_hash = compute_layout_hash(default_block.uniforms); - - update_layout_hash(); -} - -void Program::query_uniform_blocks(const vector &uniforms_by_index) -{ - 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); - for(unsigned i=0; i indices(value); - glGetActiveUniformBlockiv(id, i, GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES, &indices[0]); - for(int j: indices) - { - if(!uniforms_by_index[j]) - throw logic_error("Program::link"); - info.uniforms.push_back(uniforms_by_index[j]); - uniforms_by_index[j]->block = &info; - } - - vector query_indices(indices.begin(), indices.end()); - vector values(indices.size()); - glGetActiveUniformsiv(id, query_indices.size(), &query_indices[0], GL_UNIFORM_OFFSET, &values[0]); - for(unsigned j=0; joffset = values[j]; - - query_indices.clear(); - 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]); - for(unsigned j=0; jarray_stride = values[j]; - } - - query_indices.clear(); - for(int j: indices) - { - DataType t = uniforms_by_index[j]->type; - if(is_matrix(t)) - query_indices.push_back(j); - } - if(!query_indices.empty()) - { - 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, uniform_location_compare); - info.layout_hash = compute_layout_hash(info.uniforms); - } -} - -void Program::query_attributes() -{ - unsigned count = 0; - glGetProgramiv(id, GL_ACTIVE_ATTRIBUTES, reinterpret_cast(&count)); - 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(); - info.name = name; - info.location = glGetAttribLocation(id, name); - info.array_size = size; - info.type = from_gl_type(type); - } - } -} - -void Program::collect_uniforms() +void Program::collect_uniforms(const SpirVModule &mod) { - 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); + unsigned n_descriptor_sets = 0; for(const SpirVModule::Variable &v: mod.get_variables()) { - if(v.storage==SpirVModule::UNIFORM && v.struct_type) + if((v.storage==SpirVModule::UNIFORM || v.storage==SpirVModule::PUSH_CONSTANT) && v.struct_type) { - uniform_blocks.push_back(UniformBlockInfo()); - UniformBlockInfo &info = uniform_blocks.back(); + 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; + 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; @@ -490,34 +84,43 @@ void Program::collect_uniforms() else if(v.storage==SpirVModule::UNIFORM_CONSTANT && v.location>=0) { block_uniform_names[0].push_back(v.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 = v.name; info.tag = v.name; info.location = v.location; - info.binding = v.binding; - info.array_size = v.array_size; + 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(uniforms, &UniformInfo::tag); + 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 &uniform_names) @@ -527,21 +130,9 @@ void Program::collect_block_uniforms(const SpirVModule::Structure &strct, const 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; - 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) + if(m.array_size) { - for(unsigned j=0; j(*module); - 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) { - attributes.push_back(AttributeInfo()); - AttributeInfo &info = attributes.back(); + 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; @@ -584,47 +173,40 @@ void Program::collect_attributes() } } -void Program::update_layout_hash() -{ - string layout_descriptor; - 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) +void Program::collect_builtins(const SpirVModule &mod) { - string layout_descriptor; - 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); + for(const SpirVModule::Variable &v: mod.get_variables()) + if(v.storage==SpirVModule::OUTPUT && v.struct_type) + collect_builtins(*v.struct_type); } -bool Program::uniform_location_compare(const UniformInfo *uni1, const UniformInfo *uni2) +void Program::collect_builtins(const SpirVModule::Structure &strct) { - return uni1->locationlocation; + for(const SpirVModule::StructMember &m: strct.members) + if(m.builtin==SpirVModule::CLIP_DISTANCE) + reflect_data.n_clip_distances = m.array_size; } -const Program::UniformBlockInfo &Program::get_uniform_block_info(const string &name) const +const ReflectData::UniformBlockInfo &Program::get_uniform_block_info(const string &name) const { - auto i = find_member(uniform_blocks, name, &UniformBlockInfo::name); - if(i==uniform_blocks.end()) + 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 { - auto 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 { - auto 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; } @@ -634,26 +216,26 @@ int Program::get_uniform_location(const string &name) const if(name[name.size()-1]==']') throw invalid_argument("Program::get_uniform_location"); - 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; + 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 { - auto 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 { - auto 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 { - auto 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; } @@ -663,72 +245,15 @@ int Program::get_attribute_location(const string &name) const if(name[name.size()-1]==']') throw invalid_argument("Program::get_attribute_location"); - auto i = lower_bound_member(attributes, name, &AttributeInfo::name); - return i!=attributes.end() && i->name==name ? i->location : -1; -} - -void Program::set_debug_name(const string &name) -{ -#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::set_stage_debug_name(unsigned stage_id, Stage type) -{ -#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 + auto i = lower_bound_member(reflect_data.attributes, name, &ReflectData::AttributeInfo::name); + return i!=reflect_data.attributes.end() && i->name==name ? i->location : -1; } -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); -} - -void Program::Loader::finish() -{ - obj.link(); + add("module", &Loader::module); } void Program::Loader::module(const string &n)