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;
- bindings = 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())
}
}
-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);
return stage_id;
unsigned stage_id = 0;
switch(*i)
{
- 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");
}
compile_glsl_stage(stage_id);
}
- if(!bindings)
- bindings = new Bindings;
- bindings->textures = compiler.get_texture_bindings();
- bindings->blocks = compiler.get_uniform_block_bindings();
+ 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)
module = &mod;
const vector<SpirVModule::EntryPoint> &entry_points = mod.get_entry_points();
- std::set<SpirVModule::Stage> stages;
+ 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)
{
- if(stages.count(i->stage))
- throw invalid_argument("Program::add_spirv_stages");
-
+ unsigned stage_id = 0;
switch(i->stage)
{
- case SpirVModule::VERTEX: add_stage(GL_VERTEX_SHADER); break;
- case SpirVModule::GEOMETRY: add_stage(GL_GEOMETRY_SHADER); break;
- case SpirVModule::FRAGMENT: add_stage(GL_FRAGMENT_SHADER); break;
+ 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");
}
- stages.insert(i->stage);
+ used_stage_ids[n_stages++] = stage_id;
}
const vector<UInt32> &code = mod.get_code();
- glShaderBinary(stage_ids.size(), &stage_ids[0], GL_SHADER_BINARY_FORMAT_SPIR_V, &code[0], code.size()*4);
+ 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::SpecConstant> &spec_consts = mod.get_spec_constants();
+ 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(vector<SpirVModule::SpecConstant>::const_iterator i=spec_consts.begin(); i!=spec_consts.end(); ++i)
+ for(vector<SpirVModule::Constant>::const_iterator i=spec_consts.begin(); i!=spec_consts.end(); ++i)
{
map<string, int>::const_iterator j = spec_values.find(i->name);
if(j!=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;
}
}
vector<SpirVModule::EntryPoint>::const_iterator j=entry_points.begin();
- for(vector<unsigned>::const_iterator i=stage_ids.begin(); i!=stage_ids.end(); ++i, ++j)
- glSpecializeShader(*i, j->name.c_str(), spec_id_array.size(), &spec_id_array[0], &spec_value_array[0]);
+ 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
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();
{
query_uniforms();
query_attributes();
- if(bindings)
+ if(transient)
{
for(unsigned i=0; i<uniform_blocks.size(); ++i)
{
- map<string, unsigned>::const_iterator j = bindings->blocks.find(uniform_blocks[i].name);
- if(j!=bindings->blocks.end())
+ map<string, unsigned>::const_iterator 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;
}
Conditional<BindRestore> _bind(!ARB_separate_shader_objects, this);
- for(map<string, unsigned>::const_iterator i=bindings->textures.begin(); i!=bindings->textures.end(); ++i)
+ for(map<string, unsigned>::const_iterator i=transient->textures.begin(); i!=transient->textures.end(); ++i)
{
int location = get_uniform_location(i->first);
if(location>=0)
glUniform1i(location, i->second);
}
}
-
- delete bindings;
- bindings = 0;
}
}
else if(module->get_format()==Module::SPIR_V)
collect_attributes();
}
+ 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)
uniforms.push_back(UniformInfo());
UniformInfo &info = uniforms.back();
info.name = name;
+ info.tag = name;
info.array_size = size;
info.type = from_gl_type(type);
uniform_names[i] = name;
}
}
- sort(uniforms, &uniform_name_compare);
+ sort_member(uniforms, &UniformInfo::tag);
if(ARB_uniform_buffer_object)
{
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(uniforms, uniform_names[i], &name_search<UniformInfo>);
+ uniforms_by_index[i] = &*lower_bound_member(uniforms, Tag(uniform_names[i]), &UniformInfo::tag);
query_uniform_blocks(uniforms_by_index);
}
i->location = glGetUniformLocation(id, i->name.c_str());
i->block = &default_block;
default_block.uniforms.push_back(&*i);
+
+ if(is_image(i->type) && i->location>=0)
+ glGetUniformiv(id, i->location, &i->binding);
}
default_block.layout_hash = compute_layout_hash(default_block.uniforms);
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);
}
}
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;
}
}
- sort(uniforms, &uniform_name_compare);
+ sort_member(uniforms, &UniformInfo::tag);
for(unsigned i=0; i<uniform_blocks.size(); ++i)
{
for(vector<string>::const_iterator j=names.begin(); j!=names.end(); ++j)
{
// The element is already known to be present
- UniformInfo &uni = *lower_bound(uniforms, *j, &name_search<UniformInfo>);
+ UniformInfo &uni = *lower_bound_member(uniforms, Tag(*j), &UniformInfo::tag);
block.uniforms.push_back(&uni);
uni.block = █
}
+ sort(block.uniforms, uniform_location_compare);
block.layout_hash = compute_layout_hash(block.uniforms);
}
unsigned offset = base_offset+i->offset;
if(i->struct_type)
{
- if(i->array_size)
+ unsigned array_size = i->array_size;
+ if(i->array_size_spec)
{
- for(unsigned j=0; j<i->array_size; ++j, offset+=i->array_stride)
+ array_size = i->array_size_spec->i_value;
+ if(transient)
+ {
+ map<unsigned, int>::const_iterator j = transient->spec_values.find(i->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);
}
else
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;
return uni1->location<uni2->location;
}
-bool Program::uniform_name_compare(const UniformInfo &uni1, const UniformInfo &uni2)
-{
- return uni1.name<uni2.name;
-}
-
-template<typename T>
-bool Program::name_search(const T &item, const string &name)
-{
- return item.name<name;
-}
-
string Program::get_info_log() const
{
GLsizei len = get_program_i(id, GL_INFO_LOG_LENGTH);
const Program::UniformInfo &Program::get_uniform_info(const string &name) const
{
- vector<UniformInfo>::const_iterator i = lower_bound(uniforms, name, &name_search<UniformInfo>);
+ vector<UniformInfo>::const_iterator 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);
+ if(i==uniforms.end() || i->tag!=tag)
+ throw key_error(tag);
+ return *i;
+}
+
int Program::get_uniform_location(const string &name) const
{
if(name[name.size()-1]==']')
throw invalid_argument("Program::get_uniform_location");
- vector<UniformInfo>::const_iterator i = lower_bound(uniforms, name, &name_search<UniformInfo>);
+ vector<UniformInfo>::const_iterator 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);
+ 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);
+ 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(attributes, name, &name_search<AttributeInfo>);
+ vector<AttributeInfo>::const_iterator 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(attributes, name, &name_search<AttributeInfo>);
+ vector<AttributeInfo>::const_iterator i = lower_bound_member(attributes, name, &AttributeInfo::name);
return i!=attributes.end() && i->name==name ? i->location : -1;
}
array_size(0),
array_stride(0),
matrix_stride(0),
- type(VOID)
+ type(VOID),
+ binding(-1)
{ }
projects / libs / gl.git / blobdiff