From d5ceafee1684f855ee4441144e33b764c92fb395 Mon Sep 17 00:00:00 2001 From: Ben Clayton Date: Wed, 21 Apr 2021 22:55:42 +0000 Subject: [PATCH] resolver: Temporarily disable vertex position validation CTS needs updating to fix this validation error, and this is blocking autorolls for tint and dawn. Change-Id: Ie3aaa37f0914fdb39099e7c15e65be0bcca0677a Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/48682 Reviewed-by: James Price Commit-Queue: Ben Clayton Kokoro: Kokoro --- src/resolver/entry_point_validation_test.cc | 4 +++- src/resolver/resolver.cc | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/resolver/entry_point_validation_test.cc b/src/resolver/entry_point_validation_test.cc index 6d9f3425b3..0a5184d02d 100644 --- a/src/resolver/entry_point_validation_test.cc +++ b/src/resolver/entry_point_validation_test.cc @@ -500,7 +500,9 @@ TEST_F(ResolverEntryPointValidationTest, Parameter_Struct_DuplicateLocation) { 12:34 note: while analysing entry point main)"); } -TEST_F(ResolverEntryPointValidationTest, VertexShaderMustReturnPosition) { +// TODO(bclayton): Reenable after CTS is updated +TEST_F(ResolverEntryPointValidationTest, + DISABLED_VertexShaderMustReturnPosition) { // [[stage(vertex)]] // fn main() {} Func(Source{{12, 34}}, "main", {}, ty.void_(), {}, diff --git a/src/resolver/resolver.cc b/src/resolver/resolver.cc index 6532144172..a96c6b7de9 100644 --- a/src/resolver/resolver.cc +++ b/src/resolver/resolver.cc @@ -811,7 +811,8 @@ bool Resolver::ValidateEntryPoint(const ast::Function* func, } } } - if (!found) { + // TODO(bclayton): Reenable after CTS is updated + if (((false)) && !found) { diagnostics_.add_error( "a vertex shader must include the 'position' builtin in its return " "type",