X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fprogram.cpp;h=82f438cdbf02112ff3362018b7587b066f251fbd;hb=1b23728908f5ec9beb08b2b70737c3903745fddc;hp=473d8a0b0d2c79e8a147e4b278e02ffbf303cb73;hpb=3a1b9cbe2441ae670a97541dc8ccb0a2860c8302;p=libs%2Fgl.git diff --git a/source/core/program.cpp b/source/core/program.cpp index 473d8a0b..82f438cd 100644 --- a/source/core/program.cpp +++ b/source/core/program.cpp @@ -1,7 +1,6 @@ #include #include #include -#include #include #include #include @@ -16,13 +15,10 @@ #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; @@ -35,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(); @@ -187,16 +159,18 @@ void Program::add_glsl_stages(const GlslModule &mod, const map &spe 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()) @@ -255,74 +229,20 @@ void Program::add_spirv_stages(const SpirVModule &mod, const map &s glSpecializeShader(stage_ids[i], j->name.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"); - - int type; - glGetShaderiv(shader_id, GL_SHADER_TYPE, &type); - switch(type) - { - case GL_VERTEX_SHADER: stage_ids[VERTEX] = shader_id; break; - case GL_GEOMETRY_SHADER: stage_ids[GEOMETRY] = shader_id; break; - case GL_FRAGMENT_SHADER: stage_ids[FRAGMENT] = shader_id; break; - } - - glAttachShader(id, 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(!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); @@ -342,13 +262,13 @@ void Program::link() query_attributes(); if(transient) { - for(unsigned i=0; iblocks.find(uniform_blocks[i].name); + 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; } } @@ -376,16 +296,17 @@ void Program::link() 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 = 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; @@ -411,22 +332,22 @@ 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 &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 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; @@ -541,15 +463,15 @@ 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); for(const SpirVModule::Variable &v: mod.get_variables()) { if(v.storage==SpirVModule::UNIFORM && 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; info.data_size = v.struct_type->size; @@ -563,8 +485,8 @@ 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; @@ -574,23 +496,23 @@ void Program::collect_uniforms() } } - sort_member(uniforms, &UniformInfo::tag); + sort_member(reflect_data.uniforms, &ReflectData::UniformInfo::tag); - for(unsigned i=0; i &uniform_names) @@ -624,8 +546,8 @@ void Program::collect_block_uniforms(const SpirVModule::Structure &strct, const { 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; @@ -647,8 +569,8 @@ void Program::collect_attributes() 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; @@ -657,56 +579,26 @@ 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) -{ - 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); -} - -bool Program::uniform_location_compare(const UniformInfo *uni1, const UniformInfo *uni2) -{ - return uni1->locationlocation; -} - -string Program::get_info_log() const +const ReflectData::UniformBlockInfo &Program::get_uniform_block_info(const string &name) 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 -{ - 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; } @@ -716,26 +608,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; } @@ -745,8 +637,8 @@ 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; + 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::set_debug_name(const string &name) @@ -777,41 +669,10 @@ void Program::set_stage_debug_name(unsigned stage_id, Stage type) } -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() @@ -827,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;