[wgsl] Remove kFunctionHasNoBody validation override This was only used by the HLSL backend. Change-Id: Ifa04a4c58b3239cb3e82eeed266fc037d7f7c65f Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/250815 Auto-Submit: James Price <jrprice@google.com> Reviewed-by: dan sinclair <dsinclair@chromium.org> Commit-Queue: dan sinclair <dsinclair@chromium.org>
diff --git a/src/tint/lang/wgsl/ast/disable_validation_attribute.cc b/src/tint/lang/wgsl/ast/disable_validation_attribute.cc index 5eac848..09aeae1 100644 --- a/src/tint/lang/wgsl/ast/disable_validation_attribute.cc +++ b/src/tint/lang/wgsl/ast/disable_validation_attribute.cc
@@ -46,8 +46,6 @@ return "disable_validation__function_has_no_body"; case DisabledValidation::kBindingPointCollision: return "disable_validation__binding_point_collision"; - case DisabledValidation::kFunctionParameter: - return "disable_validation__function_parameter"; case DisabledValidation::kIgnoreStrideAttribute: return "disable_validation__ignore_stride"; }
diff --git a/src/tint/lang/wgsl/ast/disable_validation_attribute.h b/src/tint/lang/wgsl/ast/disable_validation_attribute.h index b333b7a..f65e214 100644 --- a/src/tint/lang/wgsl/ast/disable_validation_attribute.h +++ b/src/tint/lang/wgsl/ast/disable_validation_attribute.h
@@ -42,8 +42,6 @@ /// When applied to a module-scoped variable, the validator will not complain if two resource /// variables have the same binding points. kBindingPointCollision, - /// When applied to a function parameter, the parameter will not be validated. - kFunctionParameter, /// When applied to a member attribute, a stride attribute may be applied to non-array types. kIgnoreStrideAttribute, };
diff --git a/src/tint/lang/wgsl/resolver/resolver.cc b/src/tint/lang/wgsl/resolver/resolver.cc index 1f9f5b7..b6ed906 100644 --- a/src/tint/lang/wgsl/resolver/resolver.cc +++ b/src/tint/lang/wgsl/resolver/resolver.cc
@@ -992,8 +992,6 @@ if (decl->IsEntryPoint()) { // Determine if the return type has a location - bool permissive = validator_.IsValidationDisabled( - decl->attributes, ast::DisabledValidation::kFunctionParameter); for (auto* attribute : decl->return_type_attributes) { Mark(attribute); enum Status { kSuccess, kErrored, kInvalid }; @@ -1007,17 +1005,6 @@ func->SetReturnLocation(value.Get()); return kSuccess; }, - [&](const ast::BlendSrcAttribute* attr) { - if (!permissive) { - return kInvalid; - } - auto value = BlendSrcAttribute(attr); - if (value != Success) { - return kErrored; - } - func->SetReturnIndex(value.Get()); - return kSuccess; - }, [&](const ast::BuiltinAttribute*) { return kSuccess; }, [&](const ast::InternalAttribute* attr) { return InternalAttribute(attr) ? kSuccess : kErrored; @@ -1026,18 +1013,6 @@ [&](const ast::InvariantAttribute* attr) { return InvariantAttribute(attr) ? kSuccess : kErrored; }, - [&](const ast::BindingAttribute* attr) { - if (!permissive) { - return kInvalid; - } - return BindingAttribute(attr) == Success ? kSuccess : kErrored; - }, - [&](const ast::GroupAttribute* attr) { - if (!permissive) { - return kInvalid; - } - return GroupAttribute(attr) == Success ? kSuccess : kErrored; - }, [&](Default) { return kInvalid; }); switch (res) {
diff --git a/src/tint/lang/wgsl/resolver/validator.cc b/src/tint/lang/wgsl/resolver/validator.cc index 3255ceb..9495cb1 100644 --- a/src/tint/lang/wgsl/resolver/validator.cc +++ b/src/tint/lang/wgsl/resolver/validator.cc
@@ -903,10 +903,6 @@ bool Validator::Parameter(const sem::Variable* var) const { auto* decl = var->Declaration(); - if (IsValidationDisabled(decl->attributes, ast::DisabledValidation::kFunctionParameter)) { - return true; - } - if (auto* ref = var->Type()->As<core::type::Pointer>()) { bool ok = false;