Move all Source constructor params to be the first

This consistency can be utilized by the ast::Builder to inject the source parameter if it isn't provided.

Bug: tint:396
Bug: tint:390
Change-Id: I2f19002131e79daae799b8cbe918eb192d6bfc75
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/35503
Commit-Queue: Ben Clayton <bclayton@google.com>
Reviewed-by: dan sinclair <dsinclair@chromium.org>
This commit is contained in:
Ben Clayton
2020-12-14 21:10:07 +00:00
committed by Commit Bot service account
parent 7b2f8d010f
commit 5aad70a069
72 changed files with 554 additions and 554 deletions

View File

@@ -906,7 +906,7 @@ bool FunctionEmitter::ParseFunctionDeclaration(FunctionDeclaration* decl) {
}
ast::FunctionDecorationList decos;
if (ep_info_ != nullptr) {
decos.emplace_back(create<ast::StageDecoration>(ep_info_->stage, Source{}));
decos.emplace_back(create<ast::StageDecoration>(Source{}, ep_info_->stage));
}
decl->name = name;

View File

@@ -447,7 +447,7 @@ ast::StructMemberDecoration* ParserImpl::ConvertMemberDecoration(
<< ShowType(struct_type_id);
return nullptr;
}
return create<ast::StructMemberOffsetDecoration>(decoration[1], Source{});
return create<ast::StructMemberOffsetDecoration>(Source{}, decoration[1]);
case SpvDecorationNonReadable:
// WGSL doesn't have a member decoration for this. Silently drop it.
return nullptr;
@@ -845,7 +845,7 @@ bool ParserImpl::ParseArrayDecorations(
<< ": multiple ArrayStride decorations";
}
has_array_stride = true;
decorations->push_back(create<ast::StrideDecoration>(stride, Source{}));
decorations->push_back(create<ast::StrideDecoration>(Source{}, stride));
} else {
return Fail() << "invalid array type ID " << type_id
<< ": unknown decoration "
@@ -1072,7 +1072,7 @@ bool ParserImpl::EmitScalarSpecConstants() {
ast::VariableDecorationList spec_id_decos;
for (const auto& deco : GetDecorationsFor(inst.result_id())) {
if ((deco.size() == 2) && (deco[0] == SpvDecorationSpecId)) {
auto* cid = create<ast::ConstantIdDecoration>(deco[1], Source{});
auto* cid = create<ast::ConstantIdDecoration>(Source{}, deco[1]);
spec_id_decos.push_back(cid);
break;
}
@@ -1210,7 +1210,7 @@ bool ParserImpl::EmitModuleScopeVariables() {
enum_converter_.ToStorageClass(builtin_position_.storage_class),
ConvertType(builtin_position_.member_type_id), false, nullptr,
ast::VariableDecorationList{
create<ast::BuiltinDecoration>(ast::Builtin::kPosition, Source{}),
create<ast::BuiltinDecoration>(Source{}, ast::Builtin::kPosition),
});
ast_module_.AddGlobalVariable(var);
@@ -1255,7 +1255,7 @@ ast::Variable* ParserImpl::MakeVariable(
return nullptr;
}
decorations.emplace_back(
create<ast::BuiltinDecoration>(ast_builtin, Source{}));
create<ast::BuiltinDecoration>(Source{}, ast_builtin));
}
if (deco[0] == SpvDecorationLocation) {
if (deco.size() != 2) {
@@ -1264,7 +1264,7 @@ ast::Variable* ParserImpl::MakeVariable(
return nullptr;
}
decorations.emplace_back(
create<ast::LocationDecoration>(deco[1], Source{}));
create<ast::LocationDecoration>(Source{}, deco[1]));
}
if (deco[0] == SpvDecorationDescriptorSet) {
if (deco.size() == 1) {
@@ -1272,7 +1272,7 @@ ast::Variable* ParserImpl::MakeVariable(
<< ": has no operand";
return nullptr;
}
decorations.emplace_back(create<ast::SetDecoration>(deco[1], Source{}));
decorations.emplace_back(create<ast::SetDecoration>(Source{}, deco[1]));
}
if (deco[0] == SpvDecorationBinding) {
if (deco.size() == 1) {
@@ -1281,7 +1281,7 @@ ast::Variable* ParserImpl::MakeVariable(
return nullptr;
}
decorations.emplace_back(
create<ast::BindingDecoration>(deco[1], Source{}));
create<ast::BindingDecoration>(Source{}, deco[1]));
}
}

View File

@@ -2865,7 +2865,7 @@ Maybe<ast::Decoration*> ParserImpl::decoration() {
if (val.errored)
return Failure::kErrored;
return create<ast::AccessDecoration>(val.value, val.source);
return create<ast::AccessDecoration>(val.source, val.value);
});
}
@@ -2876,7 +2876,7 @@ Maybe<ast::Decoration*> ParserImpl::decoration() {
if (val.errored)
return Failure::kErrored;
return create<ast::LocationDecoration>(val.value, val.source);
return create<ast::LocationDecoration>(val.source, val.value);
});
}
@@ -2887,7 +2887,7 @@ Maybe<ast::Decoration*> ParserImpl::decoration() {
if (val.errored)
return Failure::kErrored;
return create<ast::BindingDecoration>(val.value, val.source);
return create<ast::BindingDecoration>(val.source, val.value);
});
}
@@ -2898,7 +2898,7 @@ Maybe<ast::Decoration*> ParserImpl::decoration() {
if (val.errored)
return Failure::kErrored;
return create<ast::SetDecoration>(val.value, val.source);
return create<ast::SetDecoration>(val.source, val.value);
});
}
@@ -2908,7 +2908,7 @@ Maybe<ast::Decoration*> ParserImpl::decoration() {
if (builtin.errored)
return Failure::kErrored;
return create<ast::BuiltinDecoration>(builtin.value, builtin.source);
return create<ast::BuiltinDecoration>(builtin.source, builtin.value);
});
}
@@ -2937,7 +2937,7 @@ Maybe<ast::Decoration*> ParserImpl::decoration() {
}
}
return create<ast::WorkgroupDecoration>(x, y, z, t.source());
return create<ast::WorkgroupDecoration>(t.source(), x, y, z);
});
}
@@ -2947,7 +2947,7 @@ Maybe<ast::Decoration*> ParserImpl::decoration() {
if (stage.errored)
return Failure::kErrored;
return create<ast::StageDecoration>(stage.value, stage.source);
return create<ast::StageDecoration>(stage.source, stage.value);
});
}
@@ -2962,7 +2962,7 @@ Maybe<ast::Decoration*> ParserImpl::decoration() {
if (val.errored)
return Failure::kErrored;
return create<ast::StrideDecoration>(val.value, t.source());
return create<ast::StrideDecoration>(t.source(), val.value);
});
}
@@ -2973,7 +2973,7 @@ Maybe<ast::Decoration*> ParserImpl::decoration() {
if (val.errored)
return Failure::kErrored;
return create<ast::StructMemberOffsetDecoration>(val.value, t.source());
return create<ast::StructMemberOffsetDecoration>(t.source(), val.value);
});
}