encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

validation: location decoration is not valid for compute shaders 

Bug: tint:981
Change-Id: I15024e0cf836af4f3ad7a14b8cd51c24fc3cd536
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/58067
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: James Price <jrprice@google.com>
Commit-Queue: James Price <jrprice@google.com>
Auto-Submit: Sarah Mashayekhi <sarahmashay@google.com>
This commit is contained in:
Sarah 2021-07-16 19:11:54 +00:00 committed by Tint LUCI CQ
parent 5f994247a2
commit c33503069c
2 changed files with 54 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/resolver/decoration_validation_test.cc
View File

@ -146,7 +146,7 @@ TEST_P(FunctionParameterDecorationTest, IsValid) {
if (params.should_pass) { if (params.should_pass) {
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
} else { } else {
EXPECT_FALSE(r()->Resolve()) << r()->error(); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
"error: decoration is not valid for non-entry point function " "error: decoration is not valid for non-entry point function "
"parameters"); "parameters");
@ -184,7 +184,7 @@ TEST_P(EntryPointParameterDecorationTest, IsValid) {
if (params.should_pass) { if (params.should_pass) {
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
} else { } else {
EXPECT_FALSE(r()->Resolve()) << r()->error(); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
"error: decoration is not valid for function parameters"); "error: decoration is not valid for function parameters");
} }
@ -197,7 +197,8 @@ INSTANTIATE_TEST_SUITE_P(
TestParams{DecorationKind::kBuiltin, true}, TestParams{DecorationKind::kBuiltin, true},
TestParams{DecorationKind::kGroup, false}, TestParams{DecorationKind::kGroup, false},
TestParams{DecorationKind::kInterpolate, true}, TestParams{DecorationKind::kInterpolate, true},
TestParams{DecorationKind::kInvariant, false}, // TODO(crbug.com/tint/1008)
// kInvariant tested separately (requires position builtin)
TestParams{DecorationKind::kLocation, true}, TestParams{DecorationKind::kLocation, true},
TestParams{DecorationKind::kOverride, false}, TestParams{DecorationKind::kOverride, false},
TestParams{DecorationKind::kOffset, false}, TestParams{DecorationKind::kOffset, false},
@ -238,6 +239,19 @@ TEST_F(EntryPointParameterDecorationTest, DuplicateInternalDecoration) {
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
} }
TEST_F(EntryPointParameterDecorationTest, ComputeShaderLocation) {
auto* input = Param("input", ty.vec4<f32>(),
ast::DecorationList{Location(Source{{12, 34}}, 1)});
Func("main", {input}, ty.void_(), {},
{Stage(ast::PipelineStage::kCompute),
create<ast::WorkgroupDecoration>(Source{{12, 34}}, Expr(1))});
EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(),
"12:34 error: decoration is not valid for compute shader function "
"parameters");
}
using FunctionReturnTypeDecorationTest = TestWithParams; using FunctionReturnTypeDecorationTest = TestWithParams;
TEST_P(FunctionReturnTypeDecorationTest, IsValid) { TEST_P(FunctionReturnTypeDecorationTest, IsValid) {
auto& params = GetParam(); auto& params = GetParam();
@ -248,7 +262,7 @@ TEST_P(FunctionReturnTypeDecorationTest, IsValid) {
if (params.should_pass) { if (params.should_pass) {
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
} else { } else {
EXPECT_FALSE(r()->Resolve()) << r()->error(); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
"error: decoration is not valid for non-entry point function " "error: decoration is not valid for non-entry point function "
"return types"); "return types");
@ -285,9 +299,16 @@ TEST_P(EntryPointReturnTypeDecorationTest, IsValid) {
if (params.should_pass) { if (params.should_pass) {
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
} else { } else {
EXPECT_FALSE(r()->Resolve()) << r()->error(); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), if (params.kind == DecorationKind::kLocation ||
"error: decoration is not valid for entry point return types"); params.kind == DecorationKind::kInterpolate) {
EXPECT_EQ(r()->error(),
"error: decoration is not valid for compute shader entry point "
"return types");
} else {
EXPECT_EQ(r()->error(),
"error: decoration is not valid for entry point return types");
}
} }
} }
@ -298,9 +319,9 @@ INSTANTIATE_TEST_SUITE_P(
TestParams{DecorationKind::kBinding, false}, TestParams{DecorationKind::kBinding, false},
TestParams{DecorationKind::kBuiltin, true}, TestParams{DecorationKind::kBuiltin, true},
TestParams{DecorationKind::kGroup, false}, TestParams{DecorationKind::kGroup, false},
TestParams{DecorationKind::kInterpolate, true}, TestParams{DecorationKind::kInterpolate, false},
// kInvariant tested separately (requires position builtin) // kInvariant tested separately (requires position builtin)
TestParams{DecorationKind::kLocation, true}, TestParams{DecorationKind::kLocation, false},
TestParams{DecorationKind::kOverride, false}, TestParams{DecorationKind::kOverride, false},
TestParams{DecorationKind::kOffset, false}, TestParams{DecorationKind::kOffset, false},
TestParams{DecorationKind::kSize, false}, TestParams{DecorationKind::kSize, false},
@ -367,7 +388,7 @@ TEST_P(ArrayDecorationTest, IsValid) {
if (params.should_pass) { if (params.should_pass) {
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
} else { } else {
EXPECT_FALSE(r()->Resolve()) << r()->error(); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
"12:34 error: decoration is not valid for array types"); "12:34 error: decoration is not valid for array types");
} }
@ -403,7 +424,7 @@ TEST_P(StructDecorationTest, IsValid) {
if (params.should_pass) { if (params.should_pass) {
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
} else { } else {
EXPECT_FALSE(r()->Resolve()) << r()->error(); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
"12:34 error: decoration is not valid for struct declarations"); "12:34 error: decoration is not valid for struct declarations");
} }
@ -467,7 +488,7 @@ TEST_P(StructMemberDecorationTest, IsValid) {
if (params.should_pass) { if (params.should_pass) {
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
} else { } else {
EXPECT_FALSE(r()->Resolve()) << r()->error(); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
"12:34 error: decoration is not valid for structure members"); "12:34 error: decoration is not valid for structure members");
} }
@ -528,7 +549,7 @@ TEST_P(VariableDecorationTest, IsValid) {
if (params.should_pass) { if (params.should_pass) {
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
} else { } else {
EXPECT_FALSE(r()->Resolve()) << r()->error(); EXPECT_FALSE(r()->Resolve());
if (!IsBindingDecoration(params.kind)) { if (!IsBindingDecoration(params.kind)) {
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
"12:34 error: decoration is not valid for variables"); "12:34 error: decoration is not valid for variables");
@ -582,7 +603,7 @@ TEST_P(ConstantDecorationTest, IsValid) {
if (params.should_pass) { if (params.should_pass) {
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
} else { } else {
EXPECT_FALSE(r()->Resolve()) << r()->error(); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
"12:34 error: decoration is not valid for constants"); "12:34 error: decoration is not valid for constants");
} }
@ -632,7 +653,7 @@ TEST_P(FunctionDecorationTest, IsValid) {
if (params.should_pass) { if (params.should_pass) {
EXPECT_TRUE(r()->Resolve()) << r()->error(); EXPECT_TRUE(r()->Resolve()) << r()->error();
} else { } else {
EXPECT_FALSE(r()->Resolve()) << r()->error(); EXPECT_FALSE(r()->Resolve());
EXPECT_EQ(r()->error(), EXPECT_EQ(r()->error(),
"12:34 error: decoration is not valid for functions"); "12:34 error: decoration is not valid for functions");
} }

22
src/resolver/resolver.cc
View File

@ -1165,7 +1165,14 @@ bool Resolver::ValidateFunctionParameter(const ast::Function* func,
if (!ValidateInterpolateDecoration(interpolate, info->type)) { if (!ValidateInterpolateDecoration(interpolate, info->type)) {
return false; return false;
} }
} else if (!deco->IsAnyOf<ast::LocationDecoration, ast::BuiltinDecoration, } else if (deco->Is<ast::LocationDecoration>()) {
if (func->pipeline_stage() == ast::PipelineStage::kCompute) {
AddError(
"decoration is not valid for compute shader function parameters",
deco->source());
return false;
}
} else if (!deco->IsAnyOf<ast::BuiltinDecoration,
ast::InternalDecoration>() && ast::InternalDecoration>() &&
(IsValidationEnabled( (IsValidationEnabled(
info->declaration->decorations(), info->declaration->decorations(),
@ -1421,9 +1428,16 @@ bool Resolver::ValidateFunction(const ast::Function* func,
if (!ValidateInterpolateDecoration(interpolate, info->return_type)) { if (!ValidateInterpolateDecoration(interpolate, info->return_type)) {
return false; return false;
} }
} else if (!deco->IsAnyOf<ast::LocationDecoration, ast::BuiltinDecoration, } else if (deco->Is<ast::LocationDecoration>()) {
ast::InvariantDecoration, if (func->pipeline_stage() == ast::PipelineStage::kCompute) {
ast::InternalDecoration>() && AddError(
"decoration is not valid for compute shader entry point return "
"types",
deco->source());
return false;
}
} else if (!deco->IsAnyOf<ast::BuiltinDecoration, ast::InternalDecoration,
ast::InvariantDecoration>() &&
(IsValidationEnabled( (IsValidationEnabled(
info->declaration->decorations(), info->declaration->decorations(),
ast::DisabledValidation::kEntryPointParameter) && ast::DisabledValidation::kEntryPointParameter) &&