mirror of
https://github.com/encounter/dawn-cmake.git
synced 2025-12-16 08:27:05 +00:00
ast: Move Module function methods to FunctionList
Module will be split into Module (immutable) and ModuleBuilder (mutable). By moving these methods to the FunctionList, we can deduplicate a bunch of common logic. Bug: tint:390 Change-Id: I3fd85200aae4e8dc3d5afce8c9aaa6512809a3a0 Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/38363 Commit-Queue: Ben Clayton <bclayton@google.com> Reviewed-by: dan sinclair <dsinclair@chromium.org>
This commit is contained in:
committed by
Commit Bot service account
parent
281b602f59
commit
6761160dc1
@@ -50,7 +50,7 @@ Inspector::~Inspector() = default;
|
||||
std::vector<EntryPoint> Inspector::GetEntryPoints() {
|
||||
std::vector<EntryPoint> result;
|
||||
|
||||
for (auto* func : module_.functions()) {
|
||||
for (auto* func : module_.Functions()) {
|
||||
if (!func->IsEntryPoint()) {
|
||||
continue;
|
||||
}
|
||||
@@ -278,7 +278,7 @@ std::vector<ResourceBinding> Inspector::GetMultisampledTextureResourceBindings(
|
||||
}
|
||||
|
||||
ast::Function* Inspector::FindEntryPointByName(const std::string& name) {
|
||||
auto* func = module_.FindFunctionBySymbol(module_.GetSymbol(name));
|
||||
auto* func = module_.Functions().Find(module_.GetSymbol(name));
|
||||
if (!func) {
|
||||
error_ += name + " was not found!";
|
||||
return nullptr;
|
||||
|
||||
@@ -701,7 +701,7 @@ TEST_F(InspectorGetEntryPointTest, NoFunctions) {
|
||||
}
|
||||
|
||||
TEST_F(InspectorGetEntryPointTest, NoEntryPoints) {
|
||||
mod->AddFunction(MakeEmptyBodyFunction("foo", {}));
|
||||
mod->Functions().Add(MakeEmptyBodyFunction("foo", {}));
|
||||
|
||||
auto result = inspector()->GetEntryPoints();
|
||||
ASSERT_FALSE(inspector()->has_error()) << inspector()->error();
|
||||
@@ -714,7 +714,7 @@ TEST_F(InspectorGetEntryPointTest, OneEntryPoint) {
|
||||
"foo", ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
|
||||
});
|
||||
mod->AddFunction(foo);
|
||||
mod->Functions().Add(foo);
|
||||
|
||||
// TODO(dsinclair): Update to run the namer transform when available.
|
||||
|
||||
@@ -732,13 +732,13 @@ TEST_F(InspectorGetEntryPointTest, MultipleEntryPoints) {
|
||||
"foo", ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
|
||||
});
|
||||
mod->AddFunction(foo);
|
||||
mod->Functions().Add(foo);
|
||||
|
||||
auto* bar = MakeEmptyBodyFunction(
|
||||
"bar", ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kCompute),
|
||||
});
|
||||
mod->AddFunction(bar);
|
||||
mod->Functions().Add(bar);
|
||||
|
||||
// TODO(dsinclair): Update to run the namer transform when available.
|
||||
|
||||
@@ -756,21 +756,21 @@ TEST_F(InspectorGetEntryPointTest, MultipleEntryPoints) {
|
||||
|
||||
TEST_F(InspectorGetEntryPointTest, MixFunctionsAndEntryPoints) {
|
||||
auto* func = MakeEmptyBodyFunction("func", {});
|
||||
mod->AddFunction(func);
|
||||
mod->Functions().Add(func);
|
||||
|
||||
auto* foo = MakeCallerBodyFunction(
|
||||
"foo", "func",
|
||||
ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
|
||||
});
|
||||
mod->AddFunction(foo);
|
||||
mod->Functions().Add(foo);
|
||||
|
||||
auto* bar = MakeCallerBodyFunction(
|
||||
"bar", "func",
|
||||
ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kFragment),
|
||||
});
|
||||
mod->AddFunction(bar);
|
||||
mod->Functions().Add(bar);
|
||||
|
||||
// TODO(dsinclair): Update to run the namer transform when available.
|
||||
|
||||
@@ -792,7 +792,7 @@ TEST_F(InspectorGetEntryPointTest, DefaultWorkgroupSize) {
|
||||
ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
|
||||
});
|
||||
mod->AddFunction(foo);
|
||||
mod->Functions().Add(foo);
|
||||
|
||||
auto result = inspector()->GetEntryPoints();
|
||||
ASSERT_FALSE(inspector()->has_error()) << inspector()->error();
|
||||
@@ -811,7 +811,7 @@ TEST_F(InspectorGetEntryPointTest, NonDefaultWorkgroupSize) {
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kCompute),
|
||||
create<ast::WorkgroupDecoration>(8u, 2u, 1u),
|
||||
});
|
||||
mod->AddFunction(foo);
|
||||
mod->Functions().Add(foo);
|
||||
|
||||
auto result = inspector()->GetEntryPoints();
|
||||
ASSERT_FALSE(inspector()->has_error()) << inspector()->error();
|
||||
@@ -826,14 +826,14 @@ TEST_F(InspectorGetEntryPointTest, NonDefaultWorkgroupSize) {
|
||||
|
||||
TEST_F(InspectorGetEntryPointTest, NoInOutVariables) {
|
||||
auto* func = MakeEmptyBodyFunction("func", {});
|
||||
mod->AddFunction(func);
|
||||
mod->Functions().Add(func);
|
||||
|
||||
auto* foo = MakeCallerBodyFunction(
|
||||
"foo", "func",
|
||||
ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
|
||||
});
|
||||
mod->AddFunction(foo);
|
||||
mod->Functions().Add(foo);
|
||||
|
||||
auto result = inspector()->GetEntryPoints();
|
||||
ASSERT_FALSE(inspector()->has_error()) << inspector()->error();
|
||||
@@ -851,7 +851,7 @@ TEST_F(InspectorGetEntryPointTest, EntryPointInOutVariables) {
|
||||
ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
|
||||
});
|
||||
mod->AddFunction(foo);
|
||||
mod->Functions().Add(foo);
|
||||
|
||||
ASSERT_TRUE(td()->Determine()) << td()->error();
|
||||
|
||||
@@ -875,14 +875,14 @@ TEST_F(InspectorGetEntryPointTest, FunctionInOutVariables) {
|
||||
|
||||
auto* func =
|
||||
MakeInOutVariableBodyFunction("func", {{"in_var", "out_var"}}, {});
|
||||
mod->AddFunction(func);
|
||||
mod->Functions().Add(func);
|
||||
|
||||
auto* foo = MakeCallerBodyFunction(
|
||||
"foo", "func",
|
||||
ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
|
||||
});
|
||||
mod->AddFunction(foo);
|
||||
mod->Functions().Add(foo);
|
||||
|
||||
ASSERT_TRUE(td()->Determine()) << td()->error();
|
||||
|
||||
@@ -906,14 +906,14 @@ TEST_F(InspectorGetEntryPointTest, RepeatedInOutVariables) {
|
||||
|
||||
auto* func =
|
||||
MakeInOutVariableBodyFunction("func", {{"in_var", "out_var"}}, {});
|
||||
mod->AddFunction(func);
|
||||
mod->Functions().Add(func);
|
||||
|
||||
auto* foo = MakeInOutVariableCallerBodyFunction(
|
||||
"foo", "func", {{"in_var", "out_var"}},
|
||||
ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
|
||||
});
|
||||
mod->AddFunction(foo);
|
||||
mod->Functions().Add(foo);
|
||||
|
||||
ASSERT_TRUE(td()->Determine()) << td()->error();
|
||||
|
||||
@@ -940,7 +940,7 @@ TEST_F(InspectorGetEntryPointTest, EntryPointMultipleInOutVariables) {
|
||||
ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
|
||||
});
|
||||
mod->AddFunction(foo);
|
||||
mod->Functions().Add(foo);
|
||||
|
||||
ASSERT_TRUE(td()->Determine()) << td()->error();
|
||||
|
||||
@@ -970,14 +970,14 @@ TEST_F(InspectorGetEntryPointTest, FunctionMultipleInOutVariables) {
|
||||
|
||||
auto* func = MakeInOutVariableBodyFunction(
|
||||
"func", {{"in_var", "out_var"}, {"in2_var", "out2_var"}}, {});
|
||||
mod->AddFunction(func);
|
||||
mod->Functions().Add(func);
|
||||
|
||||
auto* foo = MakeCallerBodyFunction(
|
||||
"foo", "func",
|
||||
ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
|
||||
});
|
||||
mod->AddFunction(foo);
|
||||
mod->Functions().Add(foo);
|
||||
|
||||
ASSERT_TRUE(td()->Determine()) << td()->error();
|
||||
|
||||
@@ -1011,14 +1011,14 @@ TEST_F(InspectorGetEntryPointTest, MultipleEntryPointsInOutVariables) {
|
||||
ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
|
||||
});
|
||||
mod->AddFunction(foo);
|
||||
mod->Functions().Add(foo);
|
||||
|
||||
auto* bar = MakeInOutVariableBodyFunction(
|
||||
"bar", {{"in2_var", "out_var"}},
|
||||
ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kCompute),
|
||||
});
|
||||
mod->AddFunction(bar);
|
||||
mod->Functions().Add(bar);
|
||||
|
||||
ASSERT_TRUE(td()->Determine()) << td()->error();
|
||||
|
||||
@@ -1057,21 +1057,21 @@ TEST_F(InspectorGetEntryPointTest, MultipleEntryPointsSharedInOutVariables) {
|
||||
|
||||
auto* func =
|
||||
MakeInOutVariableBodyFunction("func", {{"in2_var", "out2_var"}}, {});
|
||||
mod->AddFunction(func);
|
||||
mod->Functions().Add(func);
|
||||
|
||||
auto* foo = MakeInOutVariableCallerBodyFunction(
|
||||
"foo", "func", {{"in_var", "out_var"}},
|
||||
ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
|
||||
});
|
||||
mod->AddFunction(foo);
|
||||
mod->Functions().Add(foo);
|
||||
|
||||
auto* bar = MakeCallerBodyFunction(
|
||||
"bar", "func",
|
||||
ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kCompute),
|
||||
});
|
||||
mod->AddFunction(bar);
|
||||
mod->Functions().Add(bar);
|
||||
|
||||
ASSERT_TRUE(td()->Determine()) << td()->error();
|
||||
|
||||
@@ -1125,7 +1125,7 @@ TEST_F(InspectorGetRemappedNameForEntryPointTest, DISABLED_NoFunctions) {
|
||||
// TODO(rharrison): Reenable once GetRemappedNameForEntryPoint isn't a pass
|
||||
// through
|
||||
TEST_F(InspectorGetRemappedNameForEntryPointTest, DISABLED_NoEntryPoints) {
|
||||
mod->AddFunction(MakeEmptyBodyFunction("foo", {}));
|
||||
mod->Functions().Add(MakeEmptyBodyFunction("foo", {}));
|
||||
|
||||
auto result = inspector()->GetRemappedNameForEntryPoint("foo");
|
||||
ASSERT_TRUE(inspector()->has_error());
|
||||
@@ -1140,7 +1140,7 @@ TEST_F(InspectorGetRemappedNameForEntryPointTest, DISABLED_OneEntryPoint) {
|
||||
"foo", ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
|
||||
});
|
||||
mod->AddFunction(foo);
|
||||
mod->Functions().Add(foo);
|
||||
|
||||
// TODO(dsinclair): Update to run the namer transform when available.
|
||||
|
||||
@@ -1158,7 +1158,7 @@ TEST_F(InspectorGetRemappedNameForEntryPointTest,
|
||||
"foo", ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
|
||||
});
|
||||
mod->AddFunction(foo);
|
||||
mod->Functions().Add(foo);
|
||||
|
||||
// TODO(dsinclair): Update to run the namer transform when available.
|
||||
|
||||
@@ -1166,7 +1166,7 @@ TEST_F(InspectorGetRemappedNameForEntryPointTest,
|
||||
"bar", ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kCompute),
|
||||
});
|
||||
mod->AddFunction(bar);
|
||||
mod->Functions().Add(bar);
|
||||
|
||||
{
|
||||
auto result = inspector()->GetRemappedNameForEntryPoint("foo");
|
||||
@@ -1284,14 +1284,14 @@ TEST_F(InspectorGetUniformBufferResourceBindingsTest, NonEntryPointFunc) {
|
||||
|
||||
auto* ub_func = MakeStructVariableReferenceBodyFunction("ub_func", "foo_ub",
|
||||
{{0, ty.i32}});
|
||||
mod->AddFunction(ub_func);
|
||||
mod->Functions().Add(ub_func);
|
||||
|
||||
auto* ep_func = MakeCallerBodyFunction(
|
||||
"ep_func", "ub_func",
|
||||
ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
|
||||
});
|
||||
mod->AddFunction(ep_func);
|
||||
mod->Functions().Add(ep_func);
|
||||
|
||||
ASSERT_TRUE(td()->Determine()) << td()->error();
|
||||
|
||||
@@ -1312,14 +1312,14 @@ TEST_F(InspectorGetUniformBufferResourceBindingsTest, MissingBlockDeco) {
|
||||
|
||||
auto* ub_func = MakeStructVariableReferenceBodyFunction("ub_func", "foo_ub",
|
||||
{{0, ty.i32}});
|
||||
mod->AddFunction(ub_func);
|
||||
mod->Functions().Add(ub_func);
|
||||
|
||||
auto* ep_func = MakeCallerBodyFunction(
|
||||
"ep_func", "ub_func",
|
||||
ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
|
||||
});
|
||||
mod->AddFunction(ep_func);
|
||||
mod->Functions().Add(ep_func);
|
||||
|
||||
ASSERT_TRUE(td()->Determine()) << td()->error();
|
||||
|
||||
@@ -1337,14 +1337,14 @@ TEST_F(InspectorGetUniformBufferResourceBindingsTest, Simple) {
|
||||
|
||||
auto* ub_func = MakeStructVariableReferenceBodyFunction("ub_func", "foo_ub",
|
||||
{{0, ty.i32}});
|
||||
mod->AddFunction(ub_func);
|
||||
mod->Functions().Add(ub_func);
|
||||
|
||||
auto* ep_func = MakeCallerBodyFunction(
|
||||
"ep_func", "ub_func",
|
||||
ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
|
||||
});
|
||||
mod->AddFunction(ep_func);
|
||||
mod->Functions().Add(ep_func);
|
||||
|
||||
ASSERT_TRUE(td()->Determine()) << td()->error();
|
||||
|
||||
@@ -1366,14 +1366,14 @@ TEST_F(InspectorGetUniformBufferResourceBindingsTest, MultipleMembers) {
|
||||
|
||||
auto* ub_func = MakeStructVariableReferenceBodyFunction(
|
||||
"ub_func", "foo_ub", {{0, ty.i32}, {1, ty.u32}, {2, ty.f32}});
|
||||
mod->AddFunction(ub_func);
|
||||
mod->Functions().Add(ub_func);
|
||||
|
||||
auto* ep_func = MakeCallerBodyFunction(
|
||||
"ep_func", "ub_func",
|
||||
ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
|
||||
});
|
||||
mod->AddFunction(ep_func);
|
||||
mod->Functions().Add(ep_func);
|
||||
|
||||
ASSERT_TRUE(td()->Determine()) << td()->error();
|
||||
|
||||
@@ -1399,7 +1399,7 @@ TEST_F(InspectorGetUniformBufferResourceBindingsTest, MultipleUniformBuffers) {
|
||||
const std::string& var_name) {
|
||||
auto* ub_func = MakeStructVariableReferenceBodyFunction(
|
||||
func_name, var_name, {{0, ty.i32}, {1, ty.u32}, {2, ty.f32}});
|
||||
mod->AddFunction(ub_func);
|
||||
mod->Functions().Add(ub_func);
|
||||
};
|
||||
AddReferenceFunc("ub_foo_func", "ub_foo");
|
||||
AddReferenceFunc("ub_bar_func", "ub_bar");
|
||||
@@ -1417,7 +1417,7 @@ TEST_F(InspectorGetUniformBufferResourceBindingsTest, MultipleUniformBuffers) {
|
||||
ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
|
||||
});
|
||||
mod->AddFunction(func);
|
||||
mod->Functions().Add(func);
|
||||
|
||||
ASSERT_TRUE(td()->Determine()) << td()->error();
|
||||
|
||||
@@ -1447,14 +1447,14 @@ TEST_F(InspectorGetUniformBufferResourceBindingsTest, ContainingArray) {
|
||||
|
||||
auto* ub_func = MakeStructVariableReferenceBodyFunction("ub_func", "foo_ub",
|
||||
{{0, ty.i32}});
|
||||
mod->AddFunction(ub_func);
|
||||
mod->Functions().Add(ub_func);
|
||||
|
||||
auto* ep_func = MakeCallerBodyFunction(
|
||||
"ep_func", "ub_func",
|
||||
ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
|
||||
});
|
||||
mod->AddFunction(ep_func);
|
||||
mod->Functions().Add(ep_func);
|
||||
|
||||
ASSERT_TRUE(td()->Determine()) << td()->error();
|
||||
|
||||
@@ -1476,14 +1476,14 @@ TEST_F(InspectorGetStorageBufferResourceBindingsTest, Simple) {
|
||||
|
||||
auto* sb_func = MakeStructVariableReferenceBodyFunction("sb_func", "foo_sb",
|
||||
{{0, ty.i32}});
|
||||
mod->AddFunction(sb_func);
|
||||
mod->Functions().Add(sb_func);
|
||||
|
||||
auto* ep_func = MakeCallerBodyFunction(
|
||||
"ep_func", "sb_func",
|
||||
ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
|
||||
});
|
||||
mod->AddFunction(ep_func);
|
||||
mod->Functions().Add(ep_func);
|
||||
|
||||
ASSERT_TRUE(td()->Determine()) << td()->error();
|
||||
|
||||
@@ -1505,14 +1505,14 @@ TEST_F(InspectorGetStorageBufferResourceBindingsTest, MultipleMembers) {
|
||||
|
||||
auto* sb_func = MakeStructVariableReferenceBodyFunction(
|
||||
"sb_func", "foo_sb", {{0, ty.i32}, {1, ty.u32}, {2, ty.f32}});
|
||||
mod->AddFunction(sb_func);
|
||||
mod->Functions().Add(sb_func);
|
||||
|
||||
auto* ep_func = MakeCallerBodyFunction(
|
||||
"ep_func", "sb_func",
|
||||
ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
|
||||
});
|
||||
mod->AddFunction(ep_func);
|
||||
mod->Functions().Add(ep_func);
|
||||
|
||||
ASSERT_TRUE(td()->Determine()) << td()->error();
|
||||
|
||||
@@ -1538,7 +1538,7 @@ TEST_F(InspectorGetStorageBufferResourceBindingsTest, MultipleStorageBuffers) {
|
||||
const std::string& var_name) {
|
||||
auto* sb_func = MakeStructVariableReferenceBodyFunction(
|
||||
func_name, var_name, {{0, ty.i32}, {1, ty.u32}, {2, ty.f32}});
|
||||
mod->AddFunction(sb_func);
|
||||
mod->Functions().Add(sb_func);
|
||||
};
|
||||
AddReferenceFunc("sb_foo_func", "sb_foo");
|
||||
AddReferenceFunc("sb_bar_func", "sb_bar");
|
||||
@@ -1559,7 +1559,7 @@ TEST_F(InspectorGetStorageBufferResourceBindingsTest, MultipleStorageBuffers) {
|
||||
ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
|
||||
});
|
||||
mod->AddFunction(func);
|
||||
mod->Functions().Add(func);
|
||||
|
||||
ASSERT_TRUE(td()->Determine()) << td()->error();
|
||||
|
||||
@@ -1589,14 +1589,14 @@ TEST_F(InspectorGetStorageBufferResourceBindingsTest, ContainingArray) {
|
||||
|
||||
auto* sb_func = MakeStructVariableReferenceBodyFunction("sb_func", "foo_sb",
|
||||
{{0, ty.i32}});
|
||||
mod->AddFunction(sb_func);
|
||||
mod->Functions().Add(sb_func);
|
||||
|
||||
auto* ep_func = MakeCallerBodyFunction(
|
||||
"ep_func", "sb_func",
|
||||
ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
|
||||
});
|
||||
mod->AddFunction(ep_func);
|
||||
mod->Functions().Add(ep_func);
|
||||
|
||||
ASSERT_TRUE(td()->Determine()) << td()->error();
|
||||
|
||||
@@ -1618,14 +1618,14 @@ TEST_F(InspectorGetStorageBufferResourceBindingsTest, ContainingRuntimeArray) {
|
||||
|
||||
auto* sb_func = MakeStructVariableReferenceBodyFunction("sb_func", "foo_sb",
|
||||
{{0, ty.i32}});
|
||||
mod->AddFunction(sb_func);
|
||||
mod->Functions().Add(sb_func);
|
||||
|
||||
auto* ep_func = MakeCallerBodyFunction(
|
||||
"ep_func", "sb_func",
|
||||
ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
|
||||
});
|
||||
mod->AddFunction(ep_func);
|
||||
mod->Functions().Add(ep_func);
|
||||
|
||||
ASSERT_TRUE(td()->Determine()) << td()->error();
|
||||
|
||||
@@ -1647,14 +1647,14 @@ TEST_F(InspectorGetStorageBufferResourceBindingsTest, SkipReadOnly) {
|
||||
|
||||
auto* sb_func = MakeStructVariableReferenceBodyFunction("sb_func", "foo_sb",
|
||||
{{0, ty.i32}});
|
||||
mod->AddFunction(sb_func);
|
||||
mod->Functions().Add(sb_func);
|
||||
|
||||
auto* ep_func = MakeCallerBodyFunction(
|
||||
"ep_func", "sb_func",
|
||||
ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
|
||||
});
|
||||
mod->AddFunction(ep_func);
|
||||
mod->Functions().Add(ep_func);
|
||||
|
||||
ASSERT_TRUE(td()->Determine()) << td()->error();
|
||||
|
||||
@@ -1672,14 +1672,14 @@ TEST_F(InspectorGetReadOnlyStorageBufferResourceBindingsTest, Simple) {
|
||||
|
||||
auto* sb_func = MakeStructVariableReferenceBodyFunction("sb_func", "foo_sb",
|
||||
{{0, ty.i32}});
|
||||
mod->AddFunction(sb_func);
|
||||
mod->Functions().Add(sb_func);
|
||||
|
||||
auto* ep_func = MakeCallerBodyFunction(
|
||||
"ep_func", "sb_func",
|
||||
ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
|
||||
});
|
||||
mod->AddFunction(ep_func);
|
||||
mod->Functions().Add(ep_func);
|
||||
|
||||
ASSERT_TRUE(td()->Determine()) << td()->error();
|
||||
|
||||
@@ -1707,7 +1707,7 @@ TEST_F(InspectorGetReadOnlyStorageBufferResourceBindingsTest,
|
||||
const std::string& var_name) {
|
||||
auto* sb_func = MakeStructVariableReferenceBodyFunction(
|
||||
func_name, var_name, {{0, ty.i32}, {1, ty.u32}, {2, ty.f32}});
|
||||
mod->AddFunction(sb_func);
|
||||
mod->Functions().Add(sb_func);
|
||||
};
|
||||
AddReferenceFunc("sb_foo_func", "sb_foo");
|
||||
AddReferenceFunc("sb_bar_func", "sb_bar");
|
||||
@@ -1728,7 +1728,7 @@ TEST_F(InspectorGetReadOnlyStorageBufferResourceBindingsTest,
|
||||
ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
|
||||
});
|
||||
mod->AddFunction(func);
|
||||
mod->Functions().Add(func);
|
||||
|
||||
ASSERT_TRUE(td()->Determine()) << td()->error();
|
||||
|
||||
@@ -1759,14 +1759,14 @@ TEST_F(InspectorGetReadOnlyStorageBufferResourceBindingsTest, ContainingArray) {
|
||||
|
||||
auto* sb_func = MakeStructVariableReferenceBodyFunction("sb_func", "foo_sb",
|
||||
{{0, ty.i32}});
|
||||
mod->AddFunction(sb_func);
|
||||
mod->Functions().Add(sb_func);
|
||||
|
||||
auto* ep_func = MakeCallerBodyFunction(
|
||||
"ep_func", "sb_func",
|
||||
ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
|
||||
});
|
||||
mod->AddFunction(ep_func);
|
||||
mod->Functions().Add(ep_func);
|
||||
|
||||
ASSERT_TRUE(td()->Determine()) << td()->error();
|
||||
|
||||
@@ -1790,14 +1790,14 @@ TEST_F(InspectorGetReadOnlyStorageBufferResourceBindingsTest,
|
||||
|
||||
auto* sb_func = MakeStructVariableReferenceBodyFunction("sb_func", "foo_sb",
|
||||
{{0, ty.i32}});
|
||||
mod->AddFunction(sb_func);
|
||||
mod->Functions().Add(sb_func);
|
||||
|
||||
auto* ep_func = MakeCallerBodyFunction(
|
||||
"ep_func", "sb_func",
|
||||
ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
|
||||
});
|
||||
mod->AddFunction(ep_func);
|
||||
mod->Functions().Add(ep_func);
|
||||
|
||||
ASSERT_TRUE(td()->Determine()) << td()->error();
|
||||
|
||||
@@ -1820,14 +1820,14 @@ TEST_F(InspectorGetReadOnlyStorageBufferResourceBindingsTest, SkipNonReadOnly) {
|
||||
|
||||
auto* sb_func = MakeStructVariableReferenceBodyFunction("sb_func", "foo_sb",
|
||||
{{0, ty.i32}});
|
||||
mod->AddFunction(sb_func);
|
||||
mod->Functions().Add(sb_func);
|
||||
|
||||
auto* ep_func = MakeCallerBodyFunction(
|
||||
"ep_func", "sb_func",
|
||||
ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
|
||||
});
|
||||
mod->AddFunction(ep_func);
|
||||
mod->Functions().Add(ep_func);
|
||||
|
||||
ASSERT_TRUE(td()->Determine()) << td()->error();
|
||||
|
||||
@@ -1849,7 +1849,7 @@ TEST_F(InspectorGetSamplerResourceBindingsTest, Simple) {
|
||||
ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
|
||||
});
|
||||
mod->AddFunction(func);
|
||||
mod->Functions().Add(func);
|
||||
|
||||
ASSERT_TRUE(td()->Determine()) << td()->error();
|
||||
|
||||
@@ -1866,7 +1866,7 @@ TEST_F(InspectorGetSamplerResourceBindingsTest, NoSampler) {
|
||||
"ep_func", ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
|
||||
});
|
||||
mod->AddFunction(func);
|
||||
mod->Functions().Add(func);
|
||||
|
||||
ASSERT_TRUE(td()->Determine()) << td()->error();
|
||||
|
||||
@@ -1885,14 +1885,14 @@ TEST_F(InspectorGetSamplerResourceBindingsTest, InFunction) {
|
||||
|
||||
auto* foo_func = MakeSamplerReferenceBodyFunction(
|
||||
"foo_func", "foo_texture", "foo_sampler", "foo_coords", ty.f32, {});
|
||||
mod->AddFunction(foo_func);
|
||||
mod->Functions().Add(foo_func);
|
||||
|
||||
auto* ep_func = MakeCallerBodyFunction(
|
||||
"ep_func", "foo_func",
|
||||
ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
|
||||
});
|
||||
mod->AddFunction(ep_func);
|
||||
mod->Functions().Add(ep_func);
|
||||
|
||||
ASSERT_TRUE(td()->Determine()) << td()->error();
|
||||
|
||||
@@ -1916,7 +1916,7 @@ TEST_F(InspectorGetSamplerResourceBindingsTest, UnknownEntryPoint) {
|
||||
ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
|
||||
});
|
||||
mod->AddFunction(func);
|
||||
mod->Functions().Add(func);
|
||||
|
||||
ASSERT_TRUE(td()->Determine()) << td()->error();
|
||||
|
||||
@@ -1936,7 +1936,7 @@ TEST_F(InspectorGetSamplerResourceBindingsTest, SkipsComparisonSamplers) {
|
||||
ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
|
||||
});
|
||||
mod->AddFunction(func);
|
||||
mod->Functions().Add(func);
|
||||
|
||||
ASSERT_TRUE(td()->Determine()) << td()->error();
|
||||
|
||||
@@ -1958,7 +1958,7 @@ TEST_F(InspectorGetComparisonSamplerResourceBindingsTest, Simple) {
|
||||
ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
|
||||
});
|
||||
mod->AddFunction(func);
|
||||
mod->Functions().Add(func);
|
||||
|
||||
ASSERT_TRUE(td()->Determine()) << td()->error();
|
||||
|
||||
@@ -1975,7 +1975,7 @@ TEST_F(InspectorGetComparisonSamplerResourceBindingsTest, NoSampler) {
|
||||
"ep_func", ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
|
||||
});
|
||||
mod->AddFunction(func);
|
||||
mod->Functions().Add(func);
|
||||
|
||||
ASSERT_TRUE(td()->Determine()) << td()->error();
|
||||
|
||||
@@ -1995,14 +1995,14 @@ TEST_F(InspectorGetComparisonSamplerResourceBindingsTest, InFunction) {
|
||||
auto* foo_func = MakeComparisonSamplerReferenceBodyFunction(
|
||||
"foo_func", "foo_texture", "foo_sampler", "foo_coords", "foo_depth",
|
||||
ty.f32, {});
|
||||
mod->AddFunction(foo_func);
|
||||
mod->Functions().Add(foo_func);
|
||||
|
||||
auto* ep_func = MakeCallerBodyFunction(
|
||||
"ep_func", "foo_func",
|
||||
ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
|
||||
});
|
||||
mod->AddFunction(ep_func);
|
||||
mod->Functions().Add(ep_func);
|
||||
|
||||
ASSERT_TRUE(td()->Determine()) << td()->error();
|
||||
|
||||
@@ -2026,7 +2026,7 @@ TEST_F(InspectorGetComparisonSamplerResourceBindingsTest, UnknownEntryPoint) {
|
||||
ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
|
||||
});
|
||||
mod->AddFunction(func);
|
||||
mod->Functions().Add(func);
|
||||
|
||||
ASSERT_TRUE(td()->Determine()) << td()->error();
|
||||
|
||||
@@ -2046,7 +2046,7 @@ TEST_F(InspectorGetComparisonSamplerResourceBindingsTest, SkipsSamplers) {
|
||||
ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
|
||||
});
|
||||
mod->AddFunction(func);
|
||||
mod->Functions().Add(func);
|
||||
|
||||
ASSERT_TRUE(td()->Determine()) << td()->error();
|
||||
|
||||
@@ -2061,7 +2061,7 @@ TEST_F(InspectorGetSampledTextureResourceBindingsTest, Empty) {
|
||||
"foo", ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
|
||||
});
|
||||
mod->AddFunction(foo);
|
||||
mod->Functions().Add(foo);
|
||||
|
||||
auto result = inspector()->GetSampledTextureResourceBindings("foo");
|
||||
ASSERT_FALSE(inspector()->has_error()) << inspector()->error();
|
||||
@@ -2084,7 +2084,7 @@ TEST_P(InspectorGetSampledTextureResourceBindingsTestWithParam, textureSample) {
|
||||
ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
|
||||
});
|
||||
mod->AddFunction(func);
|
||||
mod->Functions().Add(func);
|
||||
|
||||
ASSERT_TRUE(td()->Determine()) << td()->error();
|
||||
|
||||
@@ -2175,7 +2175,7 @@ TEST_P(InspectorGetSampledArrayTextureResourceBindingsTestWithParam,
|
||||
ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
|
||||
});
|
||||
mod->AddFunction(func);
|
||||
mod->Functions().Add(func);
|
||||
|
||||
ASSERT_TRUE(td()->Determine()) << td()->error();
|
||||
|
||||
@@ -2246,7 +2246,7 @@ TEST_P(InspectorGetMultisampledTextureResourceBindingsTestWithParam,
|
||||
ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
|
||||
});
|
||||
mod->AddFunction(func);
|
||||
mod->Functions().Add(func);
|
||||
|
||||
ASSERT_TRUE(td()->Determine()) << td()->error();
|
||||
|
||||
@@ -2301,7 +2301,7 @@ TEST_F(InspectorGetMultisampledArrayTextureResourceBindingsTest, Empty) {
|
||||
"foo", ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
|
||||
});
|
||||
mod->AddFunction(foo);
|
||||
mod->Functions().Add(foo);
|
||||
|
||||
auto result = inspector()->GetSampledTextureResourceBindings("foo");
|
||||
ASSERT_FALSE(inspector()->has_error()) << inspector()->error();
|
||||
@@ -2326,7 +2326,7 @@ TEST_P(InspectorGetMultisampledArrayTextureResourceBindingsTestWithParam,
|
||||
ast::FunctionDecorationList{
|
||||
create<ast::StageDecoration>(ast::PipelineStage::kVertex),
|
||||
});
|
||||
mod->AddFunction(func);
|
||||
mod->Functions().Add(func);
|
||||
|
||||
ASSERT_TRUE(td()->Determine()) << td()->error();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user