-#include <algorithm>
#include <cstring>
-#include <set>
-#include <msp/core/hash.h>
-#include <msp/core/maputils.h>
+#include <msp/core/algorithm.h>
+#include <msp/gl/extensions/arb_es2_compatibility.h>
+#include <msp/gl/extensions/arb_fragment_shader.h>
+#include <msp/gl/extensions/arb_gl_spirv.h>
+#include <msp/gl/extensions/arb_geometry_shader4.h>
+#include <msp/gl/extensions/arb_separate_shader_objects.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/khr_debug.h>
#include <msp/gl/extensions/nv_non_square_matrices.h>
#include <msp/io/print.h>
-#include <msp/strings/format.h>
-#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;
-namespace Msp {
-namespace GL {
+namespace {
-Program::Program()
+template<typename T, void (*&func)(GLint, GLsizei, const T *)>
+void uniform_wrapper(unsigned index, unsigned count, const void *data)
{
- init();
+ func(index, count, static_cast<const T *>(data));
}
-Program::Program(const std::string &source)
+template<typename T, void (*&func)(GLint, GLsizei, GLboolean, const T *)>
+void uniform_matrix_wrapper(unsigned index, unsigned count, const void *data)
{
- init();
+ func(index, count, false, static_cast<const T *>(data));
+}
- 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();
}
-Program::Program(const string &vert, const string &frag)
+namespace Msp {
+namespace GL {
+
+Program::Program()
{
init();
+}
- attach_shader_owned(new VertexShader(vert));
- attach_shader_owned(new FragmentShader(frag));
- link();
+Program::Program(const Module &mod, const map<string, int> &spec_values)
+{
+ init();
+ add_stages(mod, spec_values);
}
void Program::init()
{
static Require _req(ARB_shader_objects);
- linked = false;
id = glCreateProgram();
+ fill(stage_ids, stage_ids+MAX_STAGES, 0);
+ linked = false;
}
Program::~Program()
{
- for(ShaderList::iterator i=owned_data.begin(); i!=owned_data.end(); ++i)
- delete *i;
+ for(unsigned i=0; i<MAX_STAGES; ++i)
+ if(stage_ids[i])
+ glDeleteShader(stage_ids[i]);
glDeleteProgram(id);
}
-void Program::attach_shader(Shader &shader)
+void Program::add_stages(const Module &mod, const map<string, int> &spec_values)
{
- if(find(shaders.begin(), shaders.end(), &shader)==shaders.end())
+ if(has_stages())
+ throw invalid_operation("Program::add_stages");
+
+ TransientData transient;
+ 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, transient);
+ break;
+ case Module::SPIR_V:
+ add_spirv_stages(static_cast<const SpirVModule &>(mod), spec_values, transient);
+ break;
+ default:
+ throw invalid_argument("Program::add_stages");
}
+
+ finalize(mod, transient);
}
-void Program::attach_shader_owned(Shader *shader)
+bool Program::has_stages() const
{
- attach_shader(*shader);
- if(find(owned_data.begin(), owned_data.end(), shader)==owned_data.end())
- owned_data.push_back(shader);
+ for(unsigned i=0; i<MAX_STAGES; ++i)
+ if(stage_ids[i])
+ return true;
+ return false;
}
-void Program::detach_shader(Shader &shader)
+unsigned Program::add_stage(Stage type)
{
- ShaderList::iterator i = remove(shaders.begin(), shaders.end(), &shader);
- if(i!=shaders.end())
+ GLenum gl_type;
+ switch(type)
{
- shaders.erase(i, shaders.end());
- glDetachShader(id, shader.get_id());
+ case VERTEX: { static Require _req(ARB_vertex_shader); gl_type = GL_VERTEX_SHADER; } break;
+ case GEOMETRY: { static Require _req(ARB_geometry_shader4); gl_type = GL_GEOMETRY_SHADER; } break;
+ case FRAGMENT: { static Require _req(ARB_fragment_shader); gl_type = GL_FRAGMENT_SHADER; } break;
+ default: throw invalid_argument("Program::add_stage");
}
+
+ if(stage_ids[type])
+ throw invalid_operation("Program::add_stage");
+
+ unsigned stage_id = glCreateShader(gl_type);
+ stage_ids[type] = stage_id;
+ glAttachShader(id, stage_id);
+
+#ifdef DEBUG
+ if(!debug_name.empty() && KHR_debug)
+ set_stage_debug_name(stage_id, type);
+#endif
+
+ return stage_id;
}
-void Program::bind_attribute(unsigned index, const string &name)
+void Program::add_glsl_stages(const GlslModule &mod, const map<string, int> &spec_values, TransientData &transient)
{
- static Require _req(ARB_vertex_shader);
- glBindAttribLocation(id, index, name.c_str());
+ SL::Compiler compiler;
+ compiler.set_source(mod.get_prepared_source(), "<module>");
+ 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<SL::Stage::Type> stages = compiler.get_stages();
+ if(stages.empty())
+ throw invalid_argument("Program::add_glsl_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(mod, stage_id);
+ }
+
+ transient.textures = compiler.get_texture_bindings();
+ transient.blocks = compiler.get_uniform_block_bindings();
}
-void Program::bind_attribute(VertexComponent comp, const string &name)
+void Program::compile_glsl_stage(const GlslModule &mod, unsigned stage_id)
{
- bind_attribute(get_component_type(comp), name);
+ 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);
+ info_log = mod.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::bind_fragment_data(unsigned index, const string &name)
+void Program::add_spirv_stages(const SpirVModule &mod, const map<string, int> &spec_values, TransientData &transient)
{
- static Require _req(EXT_gpu_shader4);
- glBindFragDataLocation(id, index, name.c_str());
+ static Require _req(ARB_gl_spirv);
+ static Require _req2(ARB_ES2_compatibility);
+
+ unsigned n_stages = 0;
+ unsigned used_stage_ids[MAX_STAGES];
+ for(const SpirVModule::EntryPoint &e: mod.get_entry_points())
+ {
+ 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;
+ }
+
+ if(!n_stages)
+ throw invalid_argument("Program::add_spirv_stages");
+
+ const vector<uint32_t> &code = mod.get_code();
+ glShaderBinary(n_stages, used_stage_ids, GL_SHADER_BINARY_FORMAT_SPIR_V, &code[0], code.size()*4);
+
+ const vector<SpirVModule::Constant> &spec_consts = mod.get_spec_constants();
+ vector<unsigned> spec_id_array;
+ vector<unsigned> spec_value_array;
+ spec_id_array.reserve(spec_consts.size());
+ spec_value_array.reserve(spec_consts.size());
+ for(const SpirVModule::Constant &c: spec_consts)
+ {
+ 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;
+ }
+ }
+
+ auto j = mod.get_entry_points().begin();
+ for(unsigned i=0; i<MAX_STAGES; ++i)
+ if(stage_ids[i])
+ glSpecializeShader(stage_ids[i], j->name.c_str(), spec_id_array.size(), &spec_id_array[0], &spec_value_array[0]);
}
-void Program::link()
+void Program::finalize(const Module &mod, const TransientData &transient)
{
- for(ShaderList::iterator i=shaders.begin(); i!=shaders.end(); ++i)
- if(!(*i)->is_compiled())
- (*i)->compile();
-
- uniforms.clear();
+ reflect_data = ReflectData();
glLinkProgram(id);
- linked = get_program_i(id, GL_LINK_STATUS);
- if(!linked)
- throw compile_error(get_info_log());
+ 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(mod.get_format()==Module::GLSL)
+ info_log = static_cast<const GlslModule &>(mod).get_source_map().translate_errors(info_log);
+ if(!linked)
+ throw compile_error(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);
-}
+ if(mod.get_format()==Module::GLSL)
+ {
+ query_uniforms();
+ query_attributes();
+ for(unsigned i=0; i<reflect_data.uniform_blocks.size(); ++i)
+ {
+ auto j = transient.blocks.find(reflect_data.uniform_blocks[i].name);
+ if(j!=transient.blocks.end())
+ {
+ glUniformBlockBinding(id, i, j->second);
+ reflect_data.uniform_blocks[i].bind_point = j->second;
+ }
+ }
-void Program::require_type(GLenum t)
-{
- switch(t)
+ 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(mod.get_format()==Module::SPIR_V)
{
- 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;
+ collect_uniforms(static_cast<const SpirVModule &>(mod), transient.spec_values);
+ collect_attributes(static_cast<const SpirVModule &>(mod));
}
+
+ 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);
- vector<UniformInfo *> uniforms_by_index(count);
+ unsigned count = 0;
+ glGetProgramiv(id, GL_ACTIVE_UNIFORMS, reinterpret_cast<int *>(&count));
+ reflect_data.uniforms.reserve(count);
+ vector<string> uniform_names(count);
for(unsigned i=0; i<count; ++i)
{
char name[128];
if(len>3 && !strcmp(name+len-3, "[0]"))
name[len-3] = 0;
- UniformInfo &info = uniforms[name];
- info.block = 0;
+ reflect_data.uniforms.push_back(ReflectData::UniformInfo());
+ ReflectData::UniformInfo &info = reflect_data.uniforms.back();
info.name = name;
- info.size = size;
- info.array_stride = 0;
- info.matrix_stride = 0;
- info.type = type;
- uniforms_by_index[i] = &info;
+ info.tag = name;
+ info.array_size = size;
+ info.type = from_gl_type(type);
+ uniform_names[i] = name;
}
}
+ sort_member(reflect_data.uniforms, &ReflectData::UniformInfo::tag);
+
if(ARB_uniform_buffer_object)
+ {
+ vector<ReflectData::UniformInfo *> uniforms_by_index(count);
+ for(unsigned i=0; i<count; ++i)
+ if(!uniform_names[i].empty())
+ // The element is already known to be present
+ uniforms_by_index[i] = &*lower_bound_member(reflect_data.uniforms, Tag(uniform_names[i]), &ReflectData::UniformInfo::tag);
query_uniform_blocks(uniforms_by_index);
+ }
- UniformBlockInfo &default_block = uniform_blocks[string()];
- default_block.data_size = 0;
- default_block.bind_point = -1;
+ reflect_data.uniform_blocks.push_back(ReflectData::UniformBlockInfo());
+ ReflectData::UniformBlockInfo &default_block = reflect_data.uniform_blocks.back();
- for(UniformMap::iterator i=uniforms.begin(); i!=uniforms.end(); ++i)
- if(!i->second.block)
+ for(ReflectData::UniformInfo &u: reflect_data.uniforms)
+ if(!u.block)
{
- i->second.location = glGetUniformLocation(id, i->second.name.c_str());
- i->second.block = &default_block;
- default_block.uniforms.push_back(&i->second);
+ u.location = glGetUniformLocation(id, u.name.c_str());
+ u.block = &default_block;
+ u.array_stride = get_type_size(u.type);
+ if(is_matrix(u.type))
+ u.matrix_stride = get_type_size(get_matrix_column_type(u.type));
+ default_block.uniforms.push_back(&u);
+
+ if(u.location>=0)
+ {
+ UniformCall::FuncPtr func = 0;
+ if(u.type==FLOAT)
+ func = &uniform_wrapper<float, glUniform1fv>;
+ else if(u.type==FLOAT_VEC2)
+ func = &uniform_wrapper<float, glUniform2fv>;
+ else if(u.type==FLOAT_VEC3)
+ func = &uniform_wrapper<float, glUniform3fv>;
+ else if(u.type==FLOAT_VEC4)
+ func = &uniform_wrapper<float, glUniform4fv>;
+ else if(u.type==INT)
+ func = &uniform_wrapper<int, glUniform1iv>;
+ else if(u.type==INT_VEC2)
+ func = &uniform_wrapper<int, glUniform2iv>;
+ else if(u.type==INT_VEC3)
+ func = &uniform_wrapper<int, glUniform3iv>;
+ else if(u.type==INT_VEC4)
+ func = &uniform_wrapper<int, glUniform4iv>;
+ else if(u.type==FLOAT_MAT2)
+ func = &uniform_matrix_wrapper<float, glUniformMatrix2fv>;
+ else if(u.type==FLOAT_MAT3)
+ func = &uniform_matrix_wrapper<float, glUniformMatrix3fv>;
+ else if(u.type==FLOAT_MAT4)
+ func = &uniform_matrix_wrapper<float, glUniformMatrix4fv>;
+ else if(u.type==FLOAT_MAT2x3)
+ func = &uniform_matrix_wrapper<float, glUniformMatrix2x3fv>;
+ else if(u.type==FLOAT_MAT3x2)
+ func = &uniform_matrix_wrapper<float, glUniformMatrix3x2fv>;
+ else if(u.type==FLOAT_MAT2x4)
+ func = &uniform_matrix_wrapper<float, glUniformMatrix2x4fv>;
+ else if(u.type==FLOAT_MAT4x2)
+ func = &uniform_matrix_wrapper<float, glUniformMatrix4x2fv>;
+ else if(u.type==FLOAT_MAT3x4)
+ func = &uniform_matrix_wrapper<float, glUniformMatrix3x4fv>;
+ else if(u.type==FLOAT_MAT4x3)
+ func = &uniform_matrix_wrapper<float, glUniformMatrix4x3fv>;
+ else if(is_image(u.type))
+ glGetUniformiv(id, u.location, &u.binding);
+
+ if(func)
+ uniform_calls.push_back(UniformCall(u.location, u.array_size, func));
+ }
}
- 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);
+ default_block.sort_uniforms();
+ if(!default_block.uniforms.empty())
+ {
+ const ReflectData::UniformInfo &uni = *default_block.uniforms.back();
+ default_block.data_size = uni.location*16+uni.array_size*get_type_size(uni.type);
+ }
+ default_block.update_layout_hash();
+ reflect_data.update_layout_hash();
}
-void Program::query_uniform_blocks(const vector<UniformInfo *> &uniforms_by_index)
+void Program::query_uniform_blocks(const vector<ReflectData::UniformInfo *> &uniforms_by_index)
{
- uniform_blocks.clear();
-
- std::set<unsigned> used_bind_points;
- unsigned count = get_program_i(id, GL_ACTIVE_UNIFORM_BLOCKS);
+ unsigned count = 0;
+ glGetProgramiv(id, GL_ACTIVE_UNIFORM_BLOCKS, reinterpret_cast<int *>(&count));
+ // Reserve an extra index for the default block
+ reflect_data.uniform_blocks.reserve(count+1);
for(unsigned i=0; i<count; ++i)
{
char name[128];
int len;
glGetActiveUniformBlockName(id, i, sizeof(name), &len, name);
- UniformBlockInfo &info = uniform_blocks[name];
+ reflect_data.uniform_blocks.push_back(ReflectData::UniformBlockInfo());
+ ReflectData::UniformBlockInfo &info = reflect_data.uniform_blocks.back();
info.name = name;
int value;
glGetActiveUniformBlockiv(id, i, GL_UNIFORM_BLOCK_DATA_SIZE, &value);
info.data_size = value;
+ glGetActiveUniformBlockiv(id, i, GL_UNIFORM_BLOCK_BINDING, &value);
+ info.bind_point = 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)
+ 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<unsigned> indices2(indices.begin(), indices.end());
+ vector<unsigned> query_indices(indices.begin(), indices.end());
vector<int> 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; j<indices.size(); ++j)
- uniforms_by_index[indices[j]]->location = values[j];
+ uniforms_by_index[indices[j]]->offset = 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())
+ 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, 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];
+ glGetActiveUniformsiv(id, query_indices.size(), &query_indices[0], GL_UNIFORM_ARRAY_STRIDE, &values[0]);
+ for(unsigned j=0; j<query_indices.size(); ++j)
+ uniforms_by_index[query_indices[j]]->array_stride = values[j];
}
- indices2.clear();
- for(vector<int>::iterator j=indices.begin(); j!=indices.end(); ++j)
+ query_indices.clear();
+ for(int j: indices)
{
- 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);
+ DataType t = uniforms_by_index[j]->type;
+ if(is_matrix(t))
+ 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; j<indices2.size(); ++j)
- uniforms_by_index[indices2[j]]->matrix_stride = values[j];
+ glGetActiveUniformsiv(id, query_indices.size(), &query_indices[0], GL_UNIFORM_MATRIX_STRIDE, &values[0]);
+ for(unsigned j=0; j<query_indices.size(); ++j)
+ uniforms_by_index[query_indices[j]]->matrix_stride = values[j];
}
- 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);
+ info.sort_uniforms();
+ info.update_layout_hash();
}
}
void Program::query_attributes()
{
- unsigned count = get_program_i(id, GL_ACTIVE_ATTRIBUTES);
+ unsigned count = 0;
+ glGetProgramiv(id, GL_ACTIVE_ATTRIBUTES, reinterpret_cast<int *>(&count));
+ reflect_data.attributes.reserve(count);
for(unsigned i=0; i<count; ++i)
{
char name[128];
if(len>3 && !strcmp(name+len-3, "[0]"))
name[len-3] = 0;
- AttributeInfo &info = attributes[name];
+ reflect_data.attributes.push_back(ReflectData::AttributeInfo());
+ ReflectData::AttributeInfo &info = reflect_data.attributes.back();
info.name = name;
info.location = glGetAttribLocation(id, name);
- info.size = size;
- info.type = type;
+ info.array_size = size;
+ info.type = from_gl_type(type);
+ }
+ }
+}
+
+void Program::collect_uniforms(const SpirVModule &mod, const map<unsigned, int> &spec_values)
+{
+ // Prepare the default block
+ reflect_data.uniform_blocks.push_back(ReflectData::UniformBlockInfo());
+ vector<vector<string> > block_uniform_names(1);
+
+ for(const SpirVModule::Variable &v: mod.get_variables())
+ {
+ if(v.storage==SpirVModule::UNIFORM && v.struct_type)
+ {
+ 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(!v.name.empty())
+ prefix = v.struct_type->name+".";
+ block_uniform_names.push_back(vector<string>());
+ collect_block_uniforms(*v.struct_type, prefix, 0, spec_values, block_uniform_names.back());
+ }
+ else if(v.storage==SpirVModule::UNIFORM_CONSTANT && v.location>=0)
+ {
+ 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(reflect_data.uniforms, &ReflectData::UniformInfo::tag);
+
+ 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])
+ {
+ // 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();
}
+
+ reflect_data.update_layout_hash();
}
-Program::LayoutHash Program::compute_layout_hash(const vector<const UniformInfo *> &uniforms)
+void Program::collect_block_uniforms(const SpirVModule::Structure &strct, const string &prefix, unsigned base_offset, const map<unsigned, int> &spec_values, vector<string> &uniform_names)
{
- 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::StructMember &m: strct.members)
+ {
+ 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;
+ auto j = spec_values.find(m.array_size_spec->constant_id);
+ if(j!=spec_values.end())
+ array_size = j->second;
+ }
+
+ if(array_size)
+ {
+ for(unsigned j=0; j<array_size; ++j, offset+=m.array_stride)
+ collect_block_uniforms(*m.struct_type, format("%s%s[%d].", prefix, m.name, j), offset, spec_values, uniform_names);
+ }
+ else
+ collect_block_uniforms(*m.struct_type, prefix+m.name+".", offset, spec_values, uniform_names);
+ }
+ else
+ {
+ string name = prefix+m.name;
+ uniform_names.push_back(name);
+ 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 = m.array_size;
+ info.array_stride = m.array_stride;
+ info.matrix_stride = m.matrix_stride;
+ info.type = m.type;
+ }
+ }
}
-bool Program::uniform_location_compare(const UniformInfo *uni1, const UniformInfo *uni2)
+void Program::collect_attributes(const SpirVModule &mod)
{
- return uni1->location<uni2->location;
+ 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)
+ {
+ 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;
+ }
+ }
}
-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
+const ReflectData::AttributeInfo &Program::get_attribute_info(const string &name) const
{
- if(!linked)
- throw invalid_operation("Program::bind");
+ 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;
+}
- if(!set_current(this))
- return;
+int Program::get_attribute_location(const string &name) const
+{
+ if(name[name.size()-1]==']')
+ throw invalid_argument("Program::get_attribute_location");
- glUseProgram(id);
+ 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::unbind()
+void Program::set_debug_name(const string &name)
{
- if(!set_current(0))
- return;
+#ifdef DEBUG
+ debug_name = name;
+ if(KHR_debug)
+ {
+ glObjectLabel(GL_PROGRAM, id, name.size(), name.c_str());
+ for(unsigned i=0; i<MAX_STAGES; ++i)
+ if(stage_ids[i])
+ set_stage_debug_name(stage_ids[i], static_cast<Stage>(i));
+ }
+#else
+ (void)name;
+#endif
+}
- glUseProgram(0);
+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
}
-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