if(offset>=0)
{
int *layout_offset = 0;
+ bool has_matrix_order = false;
if(var.layout)
{
vector<Layout::Qualifier> &qualifiers = var.layout->qualifiers;
for(vector<Layout::Qualifier>::iterator i=qualifiers.begin(); i!=qualifiers.end(); ++i)
+ {
if(i->name=="offset" && i->has_value)
{
layout_offset = &i->value;
if(i->value>=offset)
offset = i->value;
- break;
}
+ else if(i->name=="column_major" || i->name=="row_major")
+ has_matrix_order = true;
+ }
}
MemoryRequirementsCalculator::Result mem_reqs = MemoryRequirementsCalculator().apply(var);
if(!var.layout)
var.layout = new Layout;
- Layout::Qualifier qual;
- qual.name = "offset";
- qual.has_value = true;
- qual.value = offset;
- var.layout->qualifiers.push_back(qual);
+ var.layout->qualifiers.push_back(Layout::Qualifier("offset", offset));
+ }
+
+ if(!has_matrix_order)
+ {
+ const BasicTypeDeclaration *basic = dynamic_cast<const BasicTypeDeclaration *>(var.type_declaration);
+ while(basic && basic->kind==BasicTypeDeclaration::ARRAY)
+ basic = dynamic_cast<const BasicTypeDeclaration *>(basic->base_type);
+ if(basic && basic->kind==BasicTypeDeclaration::MATRIX)
+ var.layout->qualifiers.push_back(Layout::Qualifier("column_major"));
}
offset += mem_reqs.size;
if(!layout)
layout = new Layout;
- Layout::Qualifier qual;
- qual.name = name;
- qual.has_value = true;
- qual.value = value;
- layout->qualifiers.push_back(qual);
+ layout->qualifiers.push_back(Layout::Qualifier(name, value));
}
void LocationAllocator::visit(VariableDeclaration &var)