id = glCreateProgram();
module = 0;
- bindings = 0;
+ transient = 0;
linked = false;
}
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)
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);
- 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())
{
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)
}
}
- delete bindings;
- bindings = 0;
+ delete transient;
+ transient = 0;
}
}
else if(module->get_format()==Module::SPIR_V)
}
}
- sort(uniforms, &uniform_tag_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, Tag(uniform_names[i]), &search<UniformInfo, Tag, &UniformInfo::tag>);
+ 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);
}
}
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_tag_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, Tag(*j), &search<UniformInfo, Tag, &UniformInfo::tag>);
+ 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);
}
return uni1->location<uni2->location;
}
-bool Program::uniform_tag_compare(const UniformInfo &uni1, const UniformInfo &uni2)
-{
- return uni1.tag<uni2.tag;
-}
-
-template<typename T, typename A, A T::*member>
-bool Program::search(const T &item, const A &key)
-{
- return item.*member<key;
-}
-
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, Tag(name), &search<UniformInfo, Tag, &UniformInfo::tag>);
+ 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(uniforms, tag, &search<UniformInfo, Tag, &UniformInfo::tag>);
+ 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;
if(name[name.size()-1]==']')
throw invalid_argument("Program::get_uniform_location");
- vector<UniformInfo>::const_iterator i = lower_bound(uniforms, Tag(name), &search<UniformInfo, Tag, &UniformInfo::tag>);
+ 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(uniforms, tag, &search<UniformInfo, Tag, &UniformInfo::tag>);
+ 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, &search<AttributeInfo, string, &AttributeInfo::name>);
+ 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, &search<AttributeInfo, string, &AttributeInfo::name>);
+ 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)
{ }