#endif
{
if(tied_program)
- tied_program->get_uniform_info(tag);
+ {
+ const Program::UniformInfo &info = tied_program->get_uniform_info(tag);
+ if(is_image(info.type))
+ throw invalid_operation("ProgramData::uniform");
+ }
return true;
}
#ifdef DEBUG
{
const UInt8 *indices = block.get_uniform_indices();
for(unsigned i=0; i<info.uniforms.size(); ++i)
- if(indices[i]!=0xFF)
+ {
+ if(is_image(info.uniforms[i]->type))
+ ; // Temporarily ignore deprecated use of sampler uniforms in ProgramData
+ else if(indices[i]!=0xFF)
block.block->attach(*info.uniforms[i], *uniforms[indices[i]].value);
+ }
}
void ProgramData::apply() const