#include "misc.h"
#include "program.h"
#include "resources.h"
-#include "shader.h"
#include "glsl/compiler.h"
using namespace std;
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<string, int> &spec_values)
{
init();
#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(VERTEX); break;
case SL::Stage::GEOMETRY: stage_id = add_stage(GEOMETRY); 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);
module = &mod;
- const vector<SpirVModule::EntryPoint> &entry_points = mod.get_entry_points();
unsigned n_stages = 0;
unsigned used_stage_ids[MAX_STAGES];
- for(vector<SpirVModule::EntryPoint>::const_iterator i=entry_points.begin(); i!=entry_points.end(); ++i)
+ for(const SpirVModule::EntryPoint &e: mod.get_entry_points())
{
unsigned stage_id = 0;
- switch(i->stage)
+ switch(e.stage)
{
case SpirVModule::VERTEX: stage_id = add_stage(VERTEX); break;
case SpirVModule::GEOMETRY: stage_id = add_stage(GEOMETRY); break;
used_stage_ids[n_stages++] = stage_id;
}
- const vector<UInt32> &code = mod.get_code();
+ 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)
vector<unsigned> spec_value_array;
spec_id_array.reserve(spec_consts.size());
spec_value_array.reserve(spec_consts.size());
- for(vector<SpirVModule::Constant>::const_iterator i=spec_consts.begin(); i!=spec_consts.end(); ++i)
+ for(const SpirVModule::Constant &c: spec_consts)
{
- map<string, int>::const_iterator j = spec_values.find(i->name);
- if(j!=spec_values.end())
+ auto i = spec_values.find(c.name);
+ if(i!=spec_values.end())
{
- spec_id_array.push_back(i->constant_id);
- spec_value_array.push_back(j->second);
- transient->spec_values[i->constant_id] = j->second;
+ spec_id_array.push_back(c.constant_id);
+ spec_value_array.push_back(i->second);
+ transient->spec_values[c.constant_id] = i->second;
}
}
- vector<SpirVModule::EntryPoint>::const_iterator j=entry_points.begin();
+ 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");
-
- 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<Shader *> &Program::get_attached_shaders() const
-{
- static vector<Shader *> 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())
{
for(unsigned i=0; i<uniform_blocks.size(); ++i)
{
- map<string, unsigned>::const_iterator j = transient->blocks.find(uniform_blocks[i].name);
+ auto j = transient->blocks.find(uniform_blocks[i].name);
if(j!=transient->blocks.end())
{
glUniformBlockBinding(id, i, j->second);
}
}
- Conditional<BindRestore> _bind(!ARB_separate_shader_objects, this);
- for(map<string, unsigned>::const_iterator i=transient->textures.begin(); i!=transient->textures.end(); ++i)
+ if(!ARB_separate_shader_objects)
+ glUseProgram(id);
+ for(const auto &kvp: transient->textures)
{
- int location = get_uniform_location(i->first);
+ int location = get_uniform_location(kvp.first);
if(location>=0)
{
if(ARB_separate_shader_objects)
- glProgramUniform1i(id, location, i->second);
+ glProgramUniform1i(id, location, kvp.second);
else
- glUniform1i(location, i->second);
+ glUniform1i(location, kvp.second);
}
}
}
delete transient;
transient = 0;
- for(vector<UniformInfo>::const_iterator i=uniforms.begin(); i!=uniforms.end(); ++i)
- require_type(i->type);
- for(vector<AttributeInfo>::const_iterator i=attributes.begin(); i!=attributes.end(); ++i)
- require_type(i->type);
+ for(const UniformInfo &u: uniforms)
+ require_type(u.type);
+ for(const AttributeInfo &a: attributes)
+ require_type(a.type);
}
void Program::query_uniforms()
uniform_blocks.push_back(UniformBlockInfo());
UniformBlockInfo &default_block = uniform_blocks.back();
- for(vector<UniformInfo>::iterator i=uniforms.begin(); i!=uniforms.end(); ++i)
- if(!i->block)
+ for(UniformInfo &u: uniforms)
+ if(!u.block)
{
- i->location = glGetUniformLocation(id, i->name.c_str());
- i->block = &default_block;
- default_block.uniforms.push_back(&*i);
+ u.location = glGetUniformLocation(id, u.name.c_str());
+ u.block = &default_block;
+ default_block.uniforms.push_back(&u);
- if(is_image(i->type) && i->location>=0)
- glGetUniformiv(id, i->location, &i->binding);
+ if(is_image(u.type) && u.location>=0)
+ glGetUniformiv(id, u.location, &u.binding);
}
default_block.layout_hash = compute_layout_hash(default_block.uniforms);
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> query_indices(indices.begin(), indices.end());
uniforms_by_index[indices[j]]->offset = values[j];
query_indices.clear();
- for(vector<int>::iterator j=indices.begin(); j!=indices.end(); ++j)
- if(uniforms_by_index[*j]->array_size>1)
- query_indices.push_back(*j);
+ 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]);
}
query_indices.clear();
- for(vector<int>::iterator j=indices.begin(); j!=indices.end(); ++j)
+ for(int j: indices)
{
- DataType t = uniforms_by_index[*j]->type;
+ DataType t = uniforms_by_index[j]->type;
if(is_matrix(t))
- query_indices.push_back(*j);
+ query_indices.push_back(j);
}
if(!query_indices.empty())
{
uniform_blocks.push_back(UniformBlockInfo());
vector<vector<string> > block_uniform_names(1);
- const vector<SpirVModule::Variable> &variables = mod.get_variables();
- for(vector<SpirVModule::Variable>::const_iterator i=variables.begin(); i!=variables.end(); ++i)
+ for(const SpirVModule::Variable &v: mod.get_variables())
{
- if(i->storage==SpirVModule::UNIFORM && i->struct_type)
+ if(v.storage==SpirVModule::UNIFORM && v.struct_type)
{
uniform_blocks.push_back(UniformBlockInfo());
UniformBlockInfo &info = uniform_blocks.back();
- info.name = i->struct_type->name;
- info.bind_point = i->binding;
- info.data_size = i->struct_type->size;
+ info.name = v.struct_type->name;
+ info.bind_point = v.binding;
+ info.data_size = v.struct_type->size;
string prefix;
- if(!i->name.empty())
- prefix = i->struct_type->name+".";
+ if(!v.name.empty())
+ prefix = v.struct_type->name+".";
block_uniform_names.push_back(vector<string>());
- collect_block_uniforms(*i->struct_type, prefix, 0, block_uniform_names.back());
+ collect_block_uniforms(*v.struct_type, prefix, 0, block_uniform_names.back());
}
- else if(i->storage==SpirVModule::UNIFORM_CONSTANT && i->location>=0)
+ else if(v.storage==SpirVModule::UNIFORM_CONSTANT && v.location>=0)
{
- block_uniform_names[0].push_back(i->name);
+ block_uniform_names[0].push_back(v.name);
uniforms.push_back(UniformInfo());
UniformInfo &info = uniforms.back();
- info.name = i->name;
- info.tag = i->name;
- info.location = i->location;
- info.binding = i->binding;
- info.array_size = i->array_size;
- info.type = i->type;
+ 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;
}
}
for(unsigned i=0; i<uniform_blocks.size(); ++i)
{
UniformBlockInfo &block = uniform_blocks[i];
- const vector<string> &names = block_uniform_names[i];
- for(vector<string>::const_iterator j=names.begin(); j!=names.end(); ++j)
+ for(const string &n: block_uniform_names[i])
{
// The element is already known to be present
- UniformInfo &uni = *lower_bound_member(uniforms, Tag(*j), &UniformInfo::tag);
+ UniformInfo &uni = *lower_bound_member(uniforms, Tag(n), &UniformInfo::tag);
block.uniforms.push_back(&uni);
uni.block = █
}
void Program::collect_block_uniforms(const SpirVModule::Structure &strct, const string &prefix, unsigned base_offset, vector<string> &uniform_names)
{
- for(vector<SpirVModule::StructMember>::const_iterator i=strct.members.begin(); i!=strct.members.end(); ++i)
+ for(const SpirVModule::StructMember &m: strct.members)
{
- unsigned offset = base_offset+i->offset;
- if(i->struct_type)
+ unsigned offset = base_offset+m.offset;
+ if(m.struct_type)
{
- unsigned array_size = i->array_size;
- if(i->array_size_spec)
+ unsigned array_size = m.array_size;
+ if(m.array_size_spec)
{
- array_size = i->array_size_spec->i_value;
+ array_size = m.array_size_spec->i_value;
if(transient)
{
- map<unsigned, int>::const_iterator j = transient->spec_values.find(i->array_size_spec->constant_id);
+ 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+=i->array_stride)
- collect_block_uniforms(*i->struct_type, format("%s%s[%d].", prefix, i->name, j), offset, uniform_names);
+ 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(*i->struct_type, prefix+i->name+".", offset, uniform_names);
+ collect_block_uniforms(*m.struct_type, prefix+m.name+".", offset, uniform_names);
}
else
{
- string name = prefix+i->name;
+ 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 = i->array_size;
- info.array_stride = i->array_stride;
- info.matrix_stride = i->matrix_stride;
- info.type = i->type;
+ info.array_size = m.array_size;
+ info.array_stride = m.array_stride;
+ info.matrix_stride = m.matrix_stride;
+ info.type = m.type;
}
}
}
{
const SpirVModule &mod = static_cast<const SpirVModule &>(*module);
- const vector<SpirVModule::EntryPoint> &entry_points = mod.get_entry_points();
- for(vector<SpirVModule::EntryPoint>::const_iterator i=entry_points.begin(); i!=entry_points.end(); ++i)
- if(i->stage==SpirVModule::VERTEX && i->name=="main")
+ for(const SpirVModule::EntryPoint &e: mod.get_entry_points())
+ if(e.stage==SpirVModule::VERTEX && e.name=="main")
{
- for(vector<const SpirVModule::Variable *>::const_iterator j=i->globals.begin(); j!=i->globals.end(); ++j)
- if((*j)->storage==SpirVModule::INPUT)
+ for(const SpirVModule::Variable *v: e.globals)
+ if(v->storage==SpirVModule::INPUT)
{
attributes.push_back(AttributeInfo());
AttributeInfo &info = attributes.back();
- info.name = (*j)->name;
- info.location = (*j)->location;
- info.array_size = (*j)->array_size;
- info.type = (*j)->type;
+ 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(vector<UniformBlockInfo>::const_iterator i=uniform_blocks.begin(); i!=uniform_blocks.end(); ++i)
- layout_descriptor += format("%d:%x\n", i->bind_point, i->layout_hash);
+ 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)->array_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);
}
return uni1->location<uni2->location;
}
-string Program::get_info_log() 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
{
- for(vector<UniformBlockInfo>::const_iterator i=uniform_blocks.begin(); i!=uniform_blocks.end(); ++i)
- if(i->name==name)
- return *i;
- throw key_error(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
{
- vector<UniformInfo>::const_iterator i = lower_bound_member(uniforms, Tag(name), &UniformInfo::tag);
+ 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
{
- vector<UniformInfo>::const_iterator i = lower_bound_member(uniforms, tag, &UniformInfo::tag);
+ auto i = lower_bound_member(uniforms, tag, &UniformInfo::tag);
if(i==uniforms.end() || i->tag!=tag)
throw key_error(tag);
return *i;
if(name[name.size()-1]==']')
throw invalid_argument("Program::get_uniform_location");
- vector<UniformInfo>::const_iterator i = lower_bound_member(uniforms, Tag(name), &UniformInfo::tag);
+ 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;
}
int Program::get_uniform_location(Tag tag) const
{
- vector<UniformInfo>::const_iterator i = lower_bound_member(uniforms, tag, &UniformInfo::tag);
+ 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
{
- vector<UniformInfo>::const_iterator i = lower_bound_member(uniforms, tag, &UniformInfo::tag);
+ 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
{
- vector<AttributeInfo>::const_iterator i = lower_bound_member(attributes, name, &AttributeInfo::name);
+ auto i = lower_bound_member(attributes, name, &AttributeInfo::name);
if(i==attributes.end() || i->name!=name)
throw key_error(name);
return *i;
if(name[name.size()-1]==']')
throw invalid_argument("Program::get_attribute_location");
- vector<AttributeInfo>::const_iterator i = lower_bound_member(attributes, name, &AttributeInfo::name);
+ auto i = lower_bound_member(attributes, name, &AttributeInfo::name);
return i!=attributes.end() && i->name==name ? i->location : -1;
}
-void Program::bind() const
-{
- if(!linked)
- throw invalid_operation("Program::bind");
-
- if(!set_current(this))
- return;
-
- glUseProgram(id);
-}
-
-void Program::unbind()
-{
- if(!set_current(0))
- return;
-
- glUseProgram(0);
-}
-
void Program::set_debug_name(const string &name)
{
#ifdef DEBUG
DataFile::CollectionObjectLoader<Program>(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()
obj.add_stages(get_collection().get<Module>(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;
projects / libs / gl.git / blobdiff