- 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);