throw invalid_operation("Program::link");
uniforms.clear();
+ uniform_blocks.clear();
+ attributes.clear();
glLinkProgram(id);
linked = get_program_i(id, GL_LINK_STATUS);
name[len-3] = 0;
UniformInfo &info = uniforms[name];
- info.block = 0;
info.name = name;
info.array_size = size;
- info.array_stride = 0;
- info.matrix_stride = 0;
info.type = from_gl_type(type);
uniforms_by_index[i] = &info;
}
query_uniform_blocks(uniforms_by_index);
UniformBlockInfo &default_block = uniform_blocks[string()];
- default_block.data_size = 0;
- default_block.bind_point = -1;
for(UniformMap::iterator i=uniforms.begin(); i!=uniforms.end(); ++i)
if(!i->second.block)
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);
for(unsigned i=0; i<count; ++i)
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();
+ query_indices.clear();
for(vector<int>::iterator j=indices.begin(); j!=indices.end(); ++j)
if(uniforms_by_index[*j]->array_size>1)
- indices2.push_back(*j);
- if(!indices2.empty())
+ 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();
+ query_indices.clear();
for(vector<int>::iterator j=indices.begin(); j!=indices.end(); ++j)
{
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);
const SpirVModule &mod = static_cast<const SpirVModule &>(*module);
UniformBlockInfo &default_block = uniform_blocks[string()];
- default_block.data_size = 0;
- default_block.bind_point = -1;
const vector<SpirVModule::Variable> &variables = mod.get_variables();
for(vector<SpirVModule::Variable>::const_iterator i=variables.begin(); i!=variables.end(); ++i)
info.block = &default_block;
info.location = i->location;
info.array_size = i->array_size;
- info.array_stride = 0;
- info.matrix_stride = 0;
info.type = i->type;
default_block.uniforms.push_back(&info);
}
{
for(vector<SpirVModule::StructMember>::const_iterator i=strct.members.begin(); i!=strct.members.end(); ++i)
{
+ unsigned offset = base_offset+i->offset;
if(i->struct_type)
{
if(i->array_size)
{
- for(unsigned j=0; j<i->array_size; ++j)
- collect_block_uniforms(block, *i->struct_type, format("%s%s[%d].", prefix, i->name, j), base_offset+i->offset+i->array_stride*j);
+ for(unsigned j=0; j<i->array_size; ++j, offset+=i->array_stride)
+ collect_block_uniforms(block, *i->struct_type, format("%s%s[%d].", prefix, i->name, j), offset);
}
else
- collect_block_uniforms(block, *i->struct_type, prefix+i->name+".", base_offset+i->offset);
+ collect_block_uniforms(block, *i->struct_type, prefix+i->name+".", offset);
}
else
{
UniformInfo &info = uniforms[name];
info.name = name;
info.block = █
- info.location = i->offset;
+ info.offset = offset;
info.array_size = i->array_size;
info.array_stride = i->array_stride;
info.matrix_stride = i->matrix_stride;
if((*j)->storage==SpirVModule::INPUT)
{
AttributeInfo &info = attributes[(*j)->name];
+ info.name = (*j)->name;
info.location = (*j)->location;
info.array_size = (*j)->array_size;
info.type = (*j)->type;
return get_item(uniforms, name);
}
-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);
+ UniformMap::const_iterator i = uniforms.find(name);
if(i==uniforms.end())
return -1;
return get_item(attributes, name);
}
-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);
+ AttributeMap::const_iterator i = attributes.find(name);
return i!=attributes.end() ? i->second.location : -1;
}
}
+Program::UniformInfo::UniformInfo():
+ block(0),
+ location(-1),
+ array_size(0),
+ array_stride(0),
+ matrix_stride(0),
+ type(VOID)
+{ }
+
+
+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)
{