-#include <algorithm>
#include <cstring>
#include <set>
+#include <msp/core/algorithm.h>
#include <msp/core/hash.h>
#include <msp/core/maputils.h>
+#include <msp/core/raii.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 "module.h"
#include "program.h"
#include "resources.h"
#include "shader.h"
init();
}
-Program::Program(const std::string &source)
+Program::Program(const string &source)
{
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(vector<unsigned>::iterator i=stage_ids.begin(); i!=stage_ids.end(); ++i)
- glDeleteShader(*i);
+ for(unsigned i=0; i<MAX_STAGES; ++i)
+ if(stage_ids[i])
+ glDeleteShader(stage_ids[i]);
glDeleteProgram(id);
}
void Program::add_stages(const Module &mod, const map<string, int> &spec_values)
{
- if(!stage_ids.empty())
+ if(has_stages())
throw invalid_operation("Program::add_stages");
switch(mod.get_format())
{
case Module::GLSL: return add_glsl_stages(static_cast<const GlslModule &>(mod), spec_values);
+ case Module::SPIR_V: return add_spirv_stages(static_cast<const SpirVModule &>(mod), spec_values);
default: throw invalid_argument("Program::add_stages");
}
}
-unsigned Program::add_stage(GLenum type)
+bool Program::has_stages() const
{
+ for(unsigned i=0; i<MAX_STAGES; ++i)
+ if(stage_ids[i])
+ return true;
+ return false;
+}
+
+unsigned Program::add_stage(Stage type)
+{
+ GLenum gl_type;
switch(type)
{
- case GL_VERTEX_SHADER: { static Require _req(ARB_vertex_shader); } break;
- case GL_GEOMETRY_SHADER: { static Require _req(ARB_geometry_shader4); } break;
- case GL_FRAGMENT_SHADER: { static Require _req(ARB_fragment_shader); } break;
+ 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");
}
- unsigned stage_id = glCreateShader(type);
- stage_ids.push_back(stage_id);
+ 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;
}
#endif
vector<SL::Stage::Type> stages = compiler.get_stages();
- for(vector<SL::Stage::Type>::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<string, unsigned> &attribs = compiler.get_vertex_attributes();
- for(map<string, unsigned>::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<string, unsigned> &frag_outs = compiler.get_fragment_outputs();
- for(map<string, unsigned>::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(!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)
#endif
}
+void Program::add_spirv_stages(const SpirVModule &mod, const map<string, int> &spec_values)
+{
+ static Require _req(ARB_gl_spirv);
+ static Require _req2(ARB_ES2_compatibility);
+
+ module = &mod;
+
+ 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;
+ }
+
+ 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);
+
+ if(!spec_values.empty() && !transient)
+ transient = new TransientData;
+
+ 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]);
+}
+
#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);
+
+ 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::link()
{
- if(stage_ids.empty())
+ if(!has_stages())
throw invalid_operation("Program::link");
uniforms.clear();
+ uniform_blocks.clear();
+ attributes.clear();
glLinkProgram(id);
linked = get_program_i(id, GL_LINK_STATUS);
IO::print("Program link info log:\n%s", info_log);
#endif
- query_uniforms();
- query_attributes();
+ if(module->get_format()==Module::GLSL)
+ {
+ query_uniforms();
+ query_attributes();
+ if(transient)
+ {
+ for(unsigned i=0; i<uniform_blocks.size(); ++i)
+ {
+ auto j = transient->blocks.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(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 UniformInfo &u: uniforms)
+ require_type(u.type);
+ for(const AttributeInfo &a: attributes)
+ require_type(a.type);
}
void Program::query_uniforms()
{
unsigned count = get_program_i(id, GL_ACTIVE_UNIFORMS);
- vector<UniformInfo *> uniforms_by_index(count);
+ 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;
+ uniforms.push_back(UniformInfo());
+ UniformInfo &info = uniforms.back();
info.name = name;
- info.size = size;
- info.array_stride = 0;
- info.matrix_stride = 0;
+ info.tag = name;
+ info.array_size = size;
info.type = from_gl_type(type);
- uniforms_by_index[i] = &info;
+ uniform_names[i] = name;
}
}
+ sort_member(uniforms, &UniformInfo::tag);
+
if(ARB_uniform_buffer_object)
+ {
+ vector<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(uniforms, Tag(uniform_names[i]), &UniformInfo::tag);
query_uniform_blocks(uniforms_by_index);
+ }
- UniformBlockInfo &default_block = uniform_blocks[string()];
- default_block.data_size = 0;
- default_block.bind_point = -1;
+ uniform_blocks.push_back(UniformBlockInfo());
+ UniformBlockInfo &default_block = uniform_blocks.back();
- for(UniformMap::iterator i=uniforms.begin(); i!=uniforms.end(); ++i)
- if(!i->second.block)
+ for(UniformInfo &u: 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;
+ default_block.uniforms.push_back(&u);
+
+ if(is_image(u.type) && u.location>=0)
+ glGetUniformiv(id, u.location, &u.binding);
}
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);
+ update_layout_hash();
}
void Program::query_uniform_blocks(const vector<UniformInfo *> &uniforms_by_index)
{
- uniform_blocks.clear();
-
- std::set<unsigned> used_bind_points;
unsigned count = get_program_i(id, GL_ACTIVE_UNIFORM_BLOCKS);
+ // Reserve an extra index for the default block
+ 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];
+ uniform_blocks.push_back(UniformBlockInfo());
+ UniformBlockInfo &info = 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)
{
- DataType t = uniforms_by_index[*j]->type;
+ DataType t = uniforms_by_index[j]->type;
if(is_matrix(t))
- indices2.push_back(*j);
+ 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);
+ sort(info.uniforms, 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()
{
unsigned count = get_program_i(id, GL_ACTIVE_ATTRIBUTES);
+ 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];
+ attributes.push_back(AttributeInfo());
+ AttributeInfo &info = attributes.back();
info.name = name;
info.location = glGetAttribLocation(id, name);
- info.size = size;
+ info.array_size = size;
info.type = from_gl_type(type);
}
}
}
+void Program::collect_uniforms()
+{
+ const SpirVModule &mod = static_cast<const SpirVModule &>(*module);
+
+ // Prepare the default block
+ uniform_blocks.push_back(UniformBlockInfo());
+ vector<vector<string> > 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();
+ 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, block_uniform_names.back());
+ }
+ 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();
+ 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);
+
+ for(unsigned i=0; i<uniform_blocks.size(); ++i)
+ {
+ UniformBlockInfo &block = 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(n), &UniformInfo::tag);
+ block.uniforms.push_back(&uni);
+ uni.block = █
+ }
+ sort(block.uniforms, uniform_location_compare);
+ block.layout_hash = compute_layout_hash(block.uniforms);
+ }
+
+ update_layout_hash();
+}
+
+void Program::collect_block_uniforms(const SpirVModule::Structure &strct, const string &prefix, unsigned base_offset, vector<string> &uniform_names)
+{
+ 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;
+ 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; j<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);
+ }
+ else
+ {
+ string name = prefix+m.name;
+ uniform_names.push_back(name);
+ uniforms.push_back(UniformInfo());
+ UniformInfo &info = 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;
+ }
+ }
+}
+
+void Program::collect_attributes()
+{
+ const SpirVModule &mod = static_cast<const SpirVModule &>(*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();
+ 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(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<const UniformInfo *> &uniforms)
{
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);
+ 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);
}
const Program::UniformBlockInfo &Program::get_uniform_block_info(const string &name) const
{
- return get_item(uniform_blocks, name);
+ auto i = find_member(uniform_blocks, name, &UniformBlockInfo::name);
+ if(i==uniform_blocks.end())
+ throw key_error(name);
+ return *i;
}
const Program::UniformInfo &Program::get_uniform_info(const string &name) const
{
- return get_item(uniforms, name);
+ auto i = lower_bound_member(uniforms, Tag(name), &UniformInfo::tag);
+ if(i==uniforms.end() || i->name!=name)
+ throw key_error(name);
+ return *i;
+}
+
+const Program::UniformInfo &Program::get_uniform_info(Tag tag) const
+{
+ auto i = lower_bound_member(uniforms, tag, &UniformInfo::tag);
+ if(i==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;
+ 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;
+}
- return i->second.block->bind_point<0 ? i->second.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;
+}
+
+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;
}
const Program::AttributeInfo &Program::get_attribute_info(const string &name) const
{
- return get_item(attributes, name);
+ auto i = lower_bound_member(attributes, name, &AttributeInfo::name);
+ if(i==attributes.end() || i->name!=name)
+ throw key_error(name);
+ return *i;
}
-int Program::get_attribute_location(const string &n) const
+int Program::get_attribute_location(const string &name) const
{
- if(n[n.size()-1]==']')
+ if(name[name.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(attributes, name, &AttributeInfo::name);
+ return i!=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<MAX_STAGES; ++i)
+ if(stage_ids[i])
+ set_stage_debug_name(stage_ids[i], static_cast<Stage>(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<Program>(p, &c)
{
projects / libs / gl.git / blobdiff