-#include <algorithm>
-#include <cstring>
-#include <set>
-#include <msp/core/hash.h>
-#include <msp/core/maputils.h>
-#include <msp/gl/extensions/arb_shader_objects.h>
-#include <msp/gl/extensions/arb_uniform_buffer_object.h>
-#include <msp/gl/extensions/arb_vertex_shader.h>
-#include <msp/gl/extensions/ext_gpu_shader4.h>
-#include <msp/gl/extensions/nv_non_square_matrices.h>
-#include <msp/io/print.h>
-#include <msp/strings/format.h>
-#include "buffer.h"
+#include <msp/core/algorithm.h>
#include "error.h"
-#include "misc.h"
#include "program.h"
-#include "resources.h"
-#include "shader.h"
-#include "glsl/compiler.h"
using namespace std;
namespace Msp {
namespace GL {
-Program::Program()
+Program::Program(const Module &mod, const map<string, int> &spec_values)
{
- init();
+ add_stages(mod, spec_values);
}
-Program::Program(const std::string &source)
+Program::Program(Program &&other):
+ ProgramBackend(move(other)),
+ reflect_data(move(other.reflect_data)),
+ specialized_spirv(other.specialized_spirv)
{
- init();
-
- SL::Compiler compiler;
- if(source.find(';')==string::npos && source.size()>5 && !source.compare(source.size()-5, 5, ".glsl"))
- {
- if(RefPtr<IO::Seekable> io = Resources::get_builtins().open(source))
- compiler.compile(*io, source);
- else
- throw IO::file_not_found(source);
- }
- else
- compiler.compile(source);
- compiler.add_shaders(*this);
- link();
+ other.specialized_spirv = 0;
}
-Program::Program(const string &vert, const string &frag)
+Program::~Program()
{
- init();
-
- attach_shader_owned(new VertexShader(vert));
- attach_shader_owned(new FragmentShader(frag));
- link();
+ delete specialized_spirv;
}
-void Program::init()
+void Program::add_stages(const Module &mod, const map<string, int> &spec_values)
{
- static Require _req(ARB_shader_objects);
+ if(has_stages())
+ throw invalid_operation("Program::add_stages");
- linked = false;
- id = glCreateProgram();
-}
+ reflect_data = ReflectData();
+ const Module *final_module = &mod;
-Program::~Program()
-{
- for(ShaderList::iterator i=owned_data.begin(); i!=owned_data.end(); ++i)
- delete *i;
- glDeleteProgram(id);
-}
-
-void Program::attach_shader(Shader &shader)
-{
- if(find(shaders.begin(), shaders.end(), &shader)==shaders.end())
+ switch(mod.get_format())
{
- glAttachShader(id, shader.get_id());
- shaders.push_back(&shader);
+ case Module::GLSL:
+ add_glsl_stages(static_cast<const GlslModule &>(mod), spec_values);
+ break;
+ case Module::SPIR_V:
+ if(static_cast<const SpirVModule &>(mod).is_specializable())
+ {
+ specialized_spirv = static_cast<const SpirVModule &>(mod).specialize(spec_values);
+ final_module = specialized_spirv;
+ }
+ add_spirv_stages(*static_cast<const SpirVModule *>(final_module), spec_values);
+ break;
+ default:
+ throw invalid_argument("Program::add_stages");
}
-}
-void Program::attach_shader_owned(Shader *shader)
-{
- attach_shader(*shader);
- if(find(owned_data.begin(), owned_data.end(), shader)==owned_data.end())
- owned_data.push_back(shader);
-}
-
-void Program::detach_shader(Shader &shader)
-{
- ShaderList::iterator i = remove(shaders.begin(), shaders.end(), &shader);
- if(i!=shaders.end())
+ if(final_module->get_format()==Module::SPIR_V)
{
- shaders.erase(i, shaders.end());
- glDetachShader(id, shader.get_id());
+ const SpirVModule &spirv_mod = *static_cast<const SpirVModule *>(final_module);
+ collect_uniforms(spirv_mod);
+ collect_attributes(spirv_mod);
+ collect_builtins(spirv_mod);
+
+ for(const SpirVModule::EntryPoint &e: spirv_mod.get_entry_points())
+ if(e.stage==SpirVModule::COMPUTE)
+ reflect_data.compute_wg_size = e.compute_local_size;
}
-}
-void Program::bind_attribute(unsigned index, const string &name)
-{
- static Require _req(ARB_vertex_shader);
- glBindAttribLocation(id, index, name.c_str());
-}
+ finalize_uniforms();
-void Program::bind_attribute(VertexComponent comp, const string &name)
-{
- bind_attribute(get_component_type(comp), name);
-}
+ reflect_data.update_used_bindings();
-void Program::bind_fragment_data(unsigned index, const string &name)
-{
- static Require _req(EXT_gpu_shader4);
- glBindFragDataLocation(id, index, name.c_str());
-}
-
-void Program::link()
-{
- for(ShaderList::iterator i=shaders.begin(); i!=shaders.end(); ++i)
- if(!(*i)->is_compiled())
- (*i)->compile();
-
- uniforms.clear();
-
- glLinkProgram(id);
- linked = get_program_i(id, GL_LINK_STATUS);
- if(!linked)
- throw compile_error(get_info_log());
-
-#ifdef DEBUG
- std::string info_log = get_info_log();
- if(!info_log.empty())
- IO::print("Program link info log:\n%s", info_log);
-#endif
-
- query_uniforms();
- query_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(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::require_type(GLenum t)
+void Program::collect_uniforms(const SpirVModule &mod)
{
- switch(t)
- {
- case GL_FLOAT_MAT2x3:
- case GL_FLOAT_MAT2x4:
- case GL_FLOAT_MAT3x2:
- case GL_FLOAT_MAT3x4:
- case GL_FLOAT_MAT4x2:
- case GL_FLOAT_MAT4x3:
- { static Require _req(NV_non_square_matrices); }
- break;
- }
-}
+ // Prepare the default block
+ reflect_data.uniform_blocks.emplace_back();
+ vector<vector<string> > block_uniform_names(1);
-void Program::query_uniforms()
-{
- unsigned count = get_program_i(id, GL_ACTIVE_UNIFORMS);
- vector<UniformInfo *> uniforms_by_index(count);
- for(unsigned i=0; i<count; ++i)
+ for(const SpirVModule::Variable &v: mod.get_variables())
{
- char name[128];
- int len = 0;
- int size;
- GLenum type;
- glGetActiveUniform(id, i, sizeof(name), &len, &size, &type, name);
- if(len && strncmp(name, "gl_", 3))
+ if((v.storage==SpirVModule::UNIFORM || v.storage==SpirVModule::PUSH_CONSTANT) && v.struct_type)
{
- /* Some implementations report the first element of a uniform array,
- others report just the name of the array itself. */
- if(len>3 && !strcmp(name+len-3, "[0]"))
- name[len-3] = 0;
-
- UniformInfo &info = uniforms[name];
- info.block = 0;
- info.name = name;
- info.size = size;
- info.array_stride = 0;
- info.matrix_stride = 0;
- info.type = type;
- uniforms_by_index[i] = &info;
+ reflect_data.uniform_blocks.emplace_back();
+ ReflectData::UniformBlockInfo &info = reflect_data.uniform_blocks.back();
+ info.name = v.struct_type->name;
+ info.data_size = v.struct_type->size;
+ if(v.storage==SpirVModule::PUSH_CONSTANT)
+ {
+ info.bind_point = ReflectData::PUSH_CONSTANT;
+ reflect_data.push_constants_size = info.data_size;
+ }
+ else
+ {
+ if(v.binding>=0)
+ info.bind_point = v.binding | (v.descriptor_set<<20);
+ else
+ info.bind_point = ReflectData::DEFAULT_BLOCK;
+ reflect_data.n_descriptor_sets = max(reflect_data.n_descriptor_sets, v.descriptor_set+1);
+ }
+
+ string prefix;
+ if(!v.name.empty())
+ prefix = v.struct_type->name+".";
+ block_uniform_names.emplace_back();
+ collect_block_uniforms(*v.struct_type, prefix, 0, block_uniform_names.back());
+ }
+ else if(v.storage==SpirVModule::UNIFORM_CONSTANT && (v.location>=0 || v.binding>=0))
+ {
+ block_uniform_names[0].push_back(v.name);
+ reflect_data.uniforms.emplace_back();
+ ReflectData::UniformInfo &info = reflect_data.uniforms.back();
+ info.name = v.name;
+ info.tag = v.name;
+ info.location = v.location;
+ if(v.binding>=0)
+ info.binding = v.binding | (v.descriptor_set<<20);
+ reflect_data.n_descriptor_sets = max(reflect_data.n_descriptor_sets, v.descriptor_set+1);
+ info.array_size = max(v.array_size, 1U);
+ info.type = v.type;
}
}
- if(ARB_uniform_buffer_object)
- query_uniform_blocks(uniforms_by_index);
+ sort_member(reflect_data.uniforms, &ReflectData::UniformInfo::tag);
- UniformBlockInfo &default_block = uniform_blocks[string()];
- default_block.data_size = 0;
- default_block.bind_point = -1;
+ 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(UniformMap::iterator i=uniforms.begin(); i!=uniforms.end(); ++i)
- if(!i->second.block)
+ for(unsigned i=0; i<reflect_data.uniform_blocks.size(); ++i)
+ {
+ ReflectData::UniformBlockInfo &block = reflect_data.uniform_blocks[i];
+ for(const string &n: block_uniform_names[i])
{
- i->second.location = glGetUniformLocation(id, i->second.name.c_str());
- i->second.block = &default_block;
- default_block.uniforms.push_back(&i->second);
+ // The element is already known to be present
+ ReflectData::UniformInfo &uni = *lower_bound_member(reflect_data.uniforms, Tag(n), &ReflectData::UniformInfo::tag);
+ block.uniforms.push_back(&uni);
+ uni.block = █
}
+ block.sort_uniforms();
+ block.update_layout_hash();
+ }
- default_block.layout_hash = compute_layout_hash(default_block.uniforms);
-
- 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);
- uniform_layout_hash = hash32(layout_descriptor);
+ reflect_data.update_layout_hash();
}
-void Program::query_uniform_blocks(const vector<UniformInfo *> &uniforms_by_index)
+void Program::collect_block_uniforms(const SpirVModule::Structure &strct, const string &prefix, unsigned base_offset, vector<string> &uniform_names)
{
- uniform_blocks.clear();
-
- std::set<unsigned> used_bind_points;
- unsigned count = get_program_i(id, GL_ACTIVE_UNIFORM_BLOCKS);
- for(unsigned i=0; i<count; ++i)
+ for(const SpirVModule::StructMember &m: strct.members)
{
- char name[128];
- int len;
- glGetActiveUniformBlockName(id, i, sizeof(name), &len, name);
- UniformBlockInfo &info = uniform_blocks[name];
- info.name = name;
-
- int value;
- glGetActiveUniformBlockiv(id, i, GL_UNIFORM_BLOCK_DATA_SIZE, &value);
- info.data_size = value;
-
- glGetActiveUniformBlockiv(id, i, GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS, &value);
- vector<int> indices(value);
- glGetActiveUniformBlockiv(id, i, GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES, &indices[0]);
- for(vector<int>::iterator j=indices.begin(); j!=indices.end(); ++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;
- }
-
- vector<unsigned> indices2(indices.begin(), indices.end());
- vector<int> values(indices.size());
- glGetActiveUniformsiv(id, indices.size(), &indices2[0], GL_UNIFORM_OFFSET, &values[0]);
- for(unsigned j=0; j<indices.size(); ++j)
- uniforms_by_index[indices[j]]->location = values[j];
-
- indices2.clear();
- for(vector<int>::iterator j=indices.begin(); j!=indices.end(); ++j)
- if(uniforms_by_index[*j]->size>1)
- indices2.push_back(*j);
- if(!indices2.empty())
- {
- glGetActiveUniformsiv(id, indices2.size(), &indices2[0], GL_UNIFORM_ARRAY_STRIDE, &values[0]);
- for(unsigned j=0; j<indices2.size(); ++j)
- uniforms_by_index[indices2[j]]->array_stride = values[j];
- }
-
- indices2.clear();
- for(vector<int>::iterator j=indices.begin(); j!=indices.end(); ++j)
+ unsigned offset = base_offset+m.offset;
+ if(m.struct_type)
{
- GLenum t = uniforms_by_index[*j]->type;
- if(t==GL_FLOAT_MAT4 || t==GL_FLOAT_MAT3 || t==GL_FLOAT_MAT2 ||
- t==GL_FLOAT_MAT2x3 || t==GL_FLOAT_MAT2x4 || t==GL_FLOAT_MAT3x2 ||
- t==GL_FLOAT_MAT3x4 || t==GL_FLOAT_MAT4x2 || t==GL_FLOAT_MAT4x3)
- indices2.push_back(*j);
+ if(m.array_size)
+ {
+ for(unsigned j=0; j<m.array_size; ++j, offset+=m.array_stride)
+ collect_block_uniforms(*m.struct_type, format("%s%s[%d].", prefix, m.name, j), offset, uniform_names);
+ }
+ else
+ collect_block_uniforms(*m.struct_type, prefix+m.name+".", offset, uniform_names);
}
- if(!indices2.empty())
+ else
{
- glGetActiveUniformsiv(id, indices2.size(), &indices2[0], GL_UNIFORM_MATRIX_STRIDE, &values[0]);
- for(unsigned j=0; j<indices2.size(); ++j)
- uniforms_by_index[indices2[j]]->matrix_stride = values[j];
+ string name = prefix+m.name;
+ uniform_names.push_back(name);
+ reflect_data.uniforms.emplace_back();
+ ReflectData::UniformInfo &info = reflect_data.uniforms.back();
+ info.name = name;
+ info.tag = name;
+ info.offset = offset;
+ info.array_size = max(m.array_size, 1U);
+ info.array_stride = m.array_stride;
+ info.matrix_stride = m.matrix_stride;
+ info.type = m.type;
}
-
- sort(info.uniforms.begin(), info.uniforms.end(), 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()
+void Program::collect_attributes(const SpirVModule &mod)
{
- unsigned count = get_program_i(id, GL_ACTIVE_ATTRIBUTES);
- for(unsigned i=0; i<count; ++i)
- {
- char name[128];
- int len = 0;
- int size;
- GLenum type;
- glGetActiveAttrib(id, i, sizeof(name), &len, &size, &type, name);
- if(len && strncmp(name, "gl_", 3))
+ for(const SpirVModule::EntryPoint &e: mod.get_entry_points())
+ if(e.stage==SpirVModule::VERTEX && e.name=="main")
{
- if(len>3 && !strcmp(name+len-3, "[0]"))
- name[len-3] = 0;
-
- AttributeInfo &info = attributes[name];
- info.name = name;
- info.location = glGetAttribLocation(id, name);
- info.size = size;
- info.type = type;
+ for(const SpirVModule::Variable *v: e.globals)
+ if(v->storage==SpirVModule::INPUT)
+ {
+ reflect_data.attributes.emplace_back();
+ 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;
+ }
}
- }
+
+ sort_member(reflect_data.attributes, &ReflectData::AttributeInfo::name);
}
-Program::LayoutHash Program::compute_layout_hash(const vector<const UniformInfo *> &uniforms)
+void Program::collect_builtins(const SpirVModule &mod)
{
- string layout_descriptor;
- for(vector<const UniformInfo *>::const_iterator i = uniforms.begin(); i!=uniforms.end(); ++i)
- layout_descriptor += format("%d:%s:%x:%d\n", (*i)->location, (*i)->name, (*i)->type, (*i)->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->location<uni2->location;
+ for(const SpirVModule::StructMember &m: strct.members)
+ if(m.builtin==SpirVModule::CLIP_DISTANCE)
+ reflect_data.n_clip_distances = m.array_size;
}
-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;
+ 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::UniformBlockInfo &Program::get_uniform_block_info(const string &name) const
+const ReflectData::UniformInfo &Program::get_uniform_info(const string &name) const
{
- return get_item(uniform_blocks, 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(const string &name) const
+const ReflectData::UniformInfo &Program::get_uniform_info(Tag tag) const
{
- return get_item(uniforms, name);
+ 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;
}
-int Program::get_uniform_location(const string &n) const
+int Program::get_uniform_location(const string &name) const
{
- if(n[n.size()-1]==']')
+ 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;
-
- return i->second.block->bind_point<0 ? i->second.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;
}
-const Program::AttributeInfo &Program::get_attribute_info(const string &name) const
+int Program::get_uniform_location(Tag tag) const
{
- return get_item(attributes, name);
+ 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_attribute_location(const string &n) const
+int Program::get_uniform_binding(Tag tag) const
{
- if(n[n.size()-1]==']')
- throw invalid_argument("Program::get_attribute_location");
-
- AttributeMap::const_iterator i = attributes.find(n);
- return i!=attributes.end() ? i->second.location : -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;
}
-void Program::bind() const
+bool Program::uses_binding(int binding) const
{
- if(!linked)
- throw invalid_operation("Program::bind");
-
- if(!set_current(this))
- return;
+ auto i = lower_bound(reflect_data.used_bindings, binding);
+ return i!=reflect_data.used_bindings.end() && *i==binding;
+}
- glUseProgram(id);
+const ReflectData::AttributeInfo &Program::get_attribute_info(const string &name) const
+{
+ 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;
}
-void Program::unbind()
+int Program::get_attribute_location(const string &name) const
{
- if(!set_current(0))
- return;
+ if(name[name.size()-1]==']')
+ throw invalid_argument("Program::get_attribute_location");
- glUseProgram(0);
+ 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::Loader::Loader(Program &p):
- DataFile::ObjectLoader<Program>(p)
+Program::Loader::Loader(Program &p, Collection &c):
+ DataFile::CollectionObjectLoader<Program>(p, &c)
{
- add("attribute", &Loader::attribute);
- add("fragment_shader", &Loader::fragment_shader);
- add("geometry_shader", &Loader::geometry_shader);
- add("vertex_shader", &Loader::vertex_shader);
+ add("module", &Loader::module);
}
-void Program::Loader::finish()
+void Program::Loader::module(const string &n)
{
- obj.link();
+ map<string, int> spec_values;
+ SpecializationLoader ldr(spec_values);
+ load_sub_with(ldr);
+ obj.add_stages(get_collection().get<Module>(n), spec_values);
}
-void Program::Loader::attribute(unsigned i, const string &n)
+
+DataFile::Loader::ActionMap Program::SpecializationLoader::shared_actions;
+
+Program::SpecializationLoader::SpecializationLoader(map<string, int> &sv):
+ spec_values(sv)
{
- obj.bind_attribute(i, n);
+ set_actions(shared_actions);
}
-void Program::Loader::fragment_shader(const string &src)
+void Program::SpecializationLoader::init_actions()
{
- obj.attach_shader_owned(new FragmentShader(src));
+ add("specialize", &SpecializationLoader::specialize_bool);
+ add("specialize", &SpecializationLoader::specialize_int);
}
-void Program::Loader::geometry_shader(const string &src)
+void Program::SpecializationLoader::specialize_bool(const string &name, bool value)
{
- obj.attach_shader_owned(new GeometryShader(src));
+ spec_values[name] = value;
}
-void Program::Loader::vertex_shader(const string &src)
+void Program::SpecializationLoader::specialize_int(const string &name, int value)
{
- obj.attach_shader_owned(new VertexShader(src));
+ spec_values[name] = value;
}
} // namespace GL
projects / libs / gl.git / blobdiff