if(len && strncmp(name, "gl_", 3))
{
UniformInfo &info = uniforms[name];
+ info.block = 0;
info.name = name;
info.size = size;
+ info.array_stride = 0;
+ info.matrix_stride = 0;
info.type = type;
uniforms_by_index[i] = &info;
}
}
- vector<const UniformInfo *> blockless_uniforms;
-
if(is_supported("GL_ARB_uniform_buffer_object"))
{
glGetObjectParameterivARB(id, GL_ACTIVE_UNIFORM_BLOCKS, &value);
count = value;
- vector<bool> uniforms_in_blocks(uniforms_by_index.size());
for(unsigned i=0; i<count; ++i)
{
char name[128];
if(!uniforms_by_index[*j])
throw logic_error("Program::link");
info.uniforms.push_back(uniforms_by_index[*j]);
- uniforms_in_blocks[*j] = true;
+ uniforms_by_index[*j]->block = &info;
}
vector<unsigned> indices2(indices.begin(), indices.end());
info.bind_point = info.layout_hash%BufferRange::get_n_uniform_buffer_bindings();
glUniformBlockBinding(id, i, info.bind_point);
}
-
- for(unsigned i=0; i<uniforms_by_index.size(); ++i)
- if(uniforms_by_index[i] && !uniforms_in_blocks[i])
- {
- UniformInfo *info = uniforms_by_index[i];
- info->location = glGetUniformLocationARB(id, info->name.c_str());
- blockless_uniforms.push_back(info);
- }
}
- else
- {
- for(UniformMap::iterator i=uniforms.begin(); i!=uniforms.end(); ++i)
+
+ vector<const UniformInfo *> blockless_uniforms;
+ for(UniformMap::iterator i=uniforms.begin(); i!=uniforms.end(); ++i)
+ if(!i->second.block)
{
i->second.location = glGetUniformLocationARB(id, i->second.name.c_str());
blockless_uniforms.push_back(&i->second);
}
- }
uniform_layout_hash = compute_layout_hash(blockless_uniforms);
}
add an offset. */
unsigned offset = lexical_cast<unsigned>(n.substr(open_bracket+1, n.size()-2-open_bracket));
i = uniforms.find(n.substr(0, open_bracket)+"[0]");
- if(i!=uniforms.end() && offset<i->second.size)
+ if(i!=uniforms.end() && !i->second.block && offset<i->second.size)
return i->second.location+offset;
}
}
return -1;
}
- return i->second.location;
+ return i->second.block ? -1 : i->second.location;
}
void Program::bind() const