mirror of
https://github.com/encounter/dawn-cmake.git
synced 2025-12-19 09:55:26 +00:00
Add ast::DisableValidationDecoration
An [[internal]] decoration that specifically disables certain validation checks. Begin with a single kFunctionHasNoBody mode. Migrate the Resolver to using this instead of allowing any InternalDecoration to disable the checks for no-body. Bug: tint:797 Change-Id: I213b9a6844a456775ede06d60e456d9f77a449d0 Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/50741 Auto-Submit: Ben Clayton <bclayton@google.com> Reviewed-by: James Price <jrprice@google.com> Commit-Queue: Ben Clayton <bclayton@google.com>
This commit is contained in:
Ben Clayton
committed by
Commit Bot service account
Commit Bot service account
parent
ad393296d5
commit
451f2cc68a
@@ -22,6 +22,7 @@
|
||||
|
||||
#include "src/ast/assignment_statement.h"
|
||||
#include "src/ast/call_statement.h"
|
||||
#include "src/ast/disable_validation_decoration.h"
|
||||
#include "src/ast/scalar_constructor_expression.h"
|
||||
#include "src/ast/type_name.h"
|
||||
#include "src/program_builder.h"
|
||||
@@ -435,7 +436,12 @@ struct DecomposeStorageAccess::State {
|
||||
auto* el_ast_ty = CreateASTTypeFor(&ctx, el_ty);
|
||||
func = ctx.dst->create<ast::Function>(
|
||||
ctx.dst->Sym(), params, el_ast_ty, nullptr,
|
||||
ast::DecorationList{intrinsic}, ast::DecorationList{});
|
||||
ast::DecorationList{
|
||||
intrinsic,
|
||||
ctx.dst->ASTNodes().Create<ast::DisableValidationDecoration>(
|
||||
ctx.dst->ID(), ast::DisabledValidation::kFunctionHasNoBody),
|
||||
},
|
||||
ast::DecorationList{});
|
||||
} else {
|
||||
ast::ExpressionList values;
|
||||
if (auto* mat_ty = el_ty->As<sem::Matrix>()) {
|
||||
@@ -502,7 +508,12 @@ struct DecomposeStorageAccess::State {
|
||||
if (auto* intrinsic = IntrinsicStoreFor(ctx.dst, el_ty)) {
|
||||
func = ctx.dst->create<ast::Function>(
|
||||
ctx.dst->Sym(), params, ctx.dst->ty.void_(), nullptr,
|
||||
ast::DecorationList{intrinsic}, ast::DecorationList{});
|
||||
ast::DecorationList{
|
||||
intrinsic,
|
||||
ctx.dst->ASTNodes().Create<ast::DisableValidationDecoration>(
|
||||
ctx.dst->ID(), ast::DisabledValidation::kFunctionHasNoBody),
|
||||
},
|
||||
ast::DecorationList{});
|
||||
|
||||
} else {
|
||||
ast::StatementList body;
|
||||
|
||||
@@ -106,40 +106,40 @@ struct SB {
|
||||
v : array<vec3<f32>, 2>;
|
||||
};
|
||||
|
||||
[[internal(intrinsic_load_i32)]]
|
||||
[[internal(intrinsic_load_i32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol(buffer : [[access(read_write)]] SB, offset : u32) -> i32
|
||||
|
||||
[[internal(intrinsic_load_u32)]]
|
||||
[[internal(intrinsic_load_u32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol_1(buffer : [[access(read_write)]] SB, offset : u32) -> u32
|
||||
|
||||
[[internal(intrinsic_load_f32)]]
|
||||
[[internal(intrinsic_load_f32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol_2(buffer : [[access(read_write)]] SB, offset : u32) -> f32
|
||||
|
||||
[[internal(intrinsic_load_vec2_i32)]]
|
||||
[[internal(intrinsic_load_vec2_i32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol_3(buffer : [[access(read_write)]] SB, offset : u32) -> vec2<i32>
|
||||
|
||||
[[internal(intrinsic_load_vec2_u32)]]
|
||||
[[internal(intrinsic_load_vec2_u32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol_4(buffer : [[access(read_write)]] SB, offset : u32) -> vec2<u32>
|
||||
|
||||
[[internal(intrinsic_load_vec2_f32)]]
|
||||
[[internal(intrinsic_load_vec2_f32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol_5(buffer : [[access(read_write)]] SB, offset : u32) -> vec2<f32>
|
||||
|
||||
[[internal(intrinsic_load_vec3_i32)]]
|
||||
[[internal(intrinsic_load_vec3_i32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol_6(buffer : [[access(read_write)]] SB, offset : u32) -> vec3<i32>
|
||||
|
||||
[[internal(intrinsic_load_vec3_u32)]]
|
||||
[[internal(intrinsic_load_vec3_u32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol_7(buffer : [[access(read_write)]] SB, offset : u32) -> vec3<u32>
|
||||
|
||||
[[internal(intrinsic_load_vec3_f32)]]
|
||||
[[internal(intrinsic_load_vec3_f32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol_8(buffer : [[access(read_write)]] SB, offset : u32) -> vec3<f32>
|
||||
|
||||
[[internal(intrinsic_load_vec4_i32)]]
|
||||
[[internal(intrinsic_load_vec4_i32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol_9(buffer : [[access(read_write)]] SB, offset : u32) -> vec4<i32>
|
||||
|
||||
[[internal(intrinsic_load_vec4_u32)]]
|
||||
[[internal(intrinsic_load_vec4_u32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol_10(buffer : [[access(read_write)]] SB, offset : u32) -> vec4<u32>
|
||||
|
||||
[[internal(intrinsic_load_vec4_f32)]]
|
||||
[[internal(intrinsic_load_vec4_f32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol_11(buffer : [[access(read_write)]] SB, offset : u32) -> vec4<f32>
|
||||
|
||||
fn tint_symbol_12(buffer : [[access(read_write)]] SB, offset : u32) -> mat2x2<f32> {
|
||||
@@ -300,40 +300,40 @@ struct SB {
|
||||
v : array<vec3<f32>, 2>;
|
||||
};
|
||||
|
||||
[[internal(intrinsic_store_i32)]]
|
||||
[[internal(intrinsic_store_i32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol(buffer : [[access(read_write)]] SB, offset : u32, value : i32)
|
||||
|
||||
[[internal(intrinsic_store_u32)]]
|
||||
[[internal(intrinsic_store_u32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol_1(buffer : [[access(read_write)]] SB, offset : u32, value : u32)
|
||||
|
||||
[[internal(intrinsic_store_f32)]]
|
||||
[[internal(intrinsic_store_f32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol_2(buffer : [[access(read_write)]] SB, offset : u32, value : f32)
|
||||
|
||||
[[internal(intrinsic_store_vec2_u32)]]
|
||||
[[internal(intrinsic_store_vec2_u32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol_3(buffer : [[access(read_write)]] SB, offset : u32, value : vec2<i32>)
|
||||
|
||||
[[internal(intrinsic_store_vec2_f32)]]
|
||||
[[internal(intrinsic_store_vec2_f32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol_4(buffer : [[access(read_write)]] SB, offset : u32, value : vec2<u32>)
|
||||
|
||||
[[internal(intrinsic_store_vec2_i32)]]
|
||||
[[internal(intrinsic_store_vec2_i32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol_5(buffer : [[access(read_write)]] SB, offset : u32, value : vec2<f32>)
|
||||
|
||||
[[internal(intrinsic_store_vec3_u32)]]
|
||||
[[internal(intrinsic_store_vec3_u32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol_6(buffer : [[access(read_write)]] SB, offset : u32, value : vec3<i32>)
|
||||
|
||||
[[internal(intrinsic_store_vec3_f32)]]
|
||||
[[internal(intrinsic_store_vec3_f32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol_7(buffer : [[access(read_write)]] SB, offset : u32, value : vec3<u32>)
|
||||
|
||||
[[internal(intrinsic_store_vec3_i32)]]
|
||||
[[internal(intrinsic_store_vec3_i32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol_8(buffer : [[access(read_write)]] SB, offset : u32, value : vec3<f32>)
|
||||
|
||||
[[internal(intrinsic_store_vec4_u32)]]
|
||||
[[internal(intrinsic_store_vec4_u32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol_9(buffer : [[access(read_write)]] SB, offset : u32, value : vec4<i32>)
|
||||
|
||||
[[internal(intrinsic_store_vec4_f32)]]
|
||||
[[internal(intrinsic_store_vec4_f32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol_10(buffer : [[access(read_write)]] SB, offset : u32, value : vec4<u32>)
|
||||
|
||||
[[internal(intrinsic_store_vec4_i32)]]
|
||||
[[internal(intrinsic_store_vec4_i32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol_11(buffer : [[access(read_write)]] SB, offset : u32, value : vec4<f32>)
|
||||
|
||||
fn tint_symbol_12(buffer : [[access(read_write)]] SB, offset : u32, value : mat2x2<f32>) {
|
||||
@@ -492,40 +492,40 @@ struct SB {
|
||||
v : array<vec3<f32>, 2>;
|
||||
};
|
||||
|
||||
[[internal(intrinsic_load_i32)]]
|
||||
[[internal(intrinsic_load_i32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol(buffer : [[access(read_write)]] SB, offset : u32) -> i32
|
||||
|
||||
[[internal(intrinsic_load_u32)]]
|
||||
[[internal(intrinsic_load_u32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol_1(buffer : [[access(read_write)]] SB, offset : u32) -> u32
|
||||
|
||||
[[internal(intrinsic_load_f32)]]
|
||||
[[internal(intrinsic_load_f32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol_2(buffer : [[access(read_write)]] SB, offset : u32) -> f32
|
||||
|
||||
[[internal(intrinsic_load_vec2_i32)]]
|
||||
[[internal(intrinsic_load_vec2_i32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol_3(buffer : [[access(read_write)]] SB, offset : u32) -> vec2<i32>
|
||||
|
||||
[[internal(intrinsic_load_vec2_u32)]]
|
||||
[[internal(intrinsic_load_vec2_u32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol_4(buffer : [[access(read_write)]] SB, offset : u32) -> vec2<u32>
|
||||
|
||||
[[internal(intrinsic_load_vec2_f32)]]
|
||||
[[internal(intrinsic_load_vec2_f32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol_5(buffer : [[access(read_write)]] SB, offset : u32) -> vec2<f32>
|
||||
|
||||
[[internal(intrinsic_load_vec3_i32)]]
|
||||
[[internal(intrinsic_load_vec3_i32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol_6(buffer : [[access(read_write)]] SB, offset : u32) -> vec3<i32>
|
||||
|
||||
[[internal(intrinsic_load_vec3_u32)]]
|
||||
[[internal(intrinsic_load_vec3_u32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol_7(buffer : [[access(read_write)]] SB, offset : u32) -> vec3<u32>
|
||||
|
||||
[[internal(intrinsic_load_vec3_f32)]]
|
||||
[[internal(intrinsic_load_vec3_f32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol_8(buffer : [[access(read_write)]] SB, offset : u32) -> vec3<f32>
|
||||
|
||||
[[internal(intrinsic_load_vec4_i32)]]
|
||||
[[internal(intrinsic_load_vec4_i32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol_9(buffer : [[access(read_write)]] SB, offset : u32) -> vec4<i32>
|
||||
|
||||
[[internal(intrinsic_load_vec4_u32)]]
|
||||
[[internal(intrinsic_load_vec4_u32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol_10(buffer : [[access(read_write)]] SB, offset : u32) -> vec4<u32>
|
||||
|
||||
[[internal(intrinsic_load_vec4_f32)]]
|
||||
[[internal(intrinsic_load_vec4_f32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol_11(buffer : [[access(read_write)]] SB, offset : u32) -> vec4<f32>
|
||||
|
||||
fn tint_symbol_12(buffer : [[access(read_write)]] SB, offset : u32) -> mat2x2<f32> {
|
||||
@@ -648,40 +648,40 @@ struct SB {
|
||||
v : array<vec3<f32>, 2>;
|
||||
};
|
||||
|
||||
[[internal(intrinsic_store_i32)]]
|
||||
[[internal(intrinsic_store_i32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol(buffer : [[access(read_write)]] SB, offset : u32, value : i32)
|
||||
|
||||
[[internal(intrinsic_store_u32)]]
|
||||
[[internal(intrinsic_store_u32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol_1(buffer : [[access(read_write)]] SB, offset : u32, value : u32)
|
||||
|
||||
[[internal(intrinsic_store_f32)]]
|
||||
[[internal(intrinsic_store_f32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol_2(buffer : [[access(read_write)]] SB, offset : u32, value : f32)
|
||||
|
||||
[[internal(intrinsic_store_vec2_u32)]]
|
||||
[[internal(intrinsic_store_vec2_u32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol_3(buffer : [[access(read_write)]] SB, offset : u32, value : vec2<i32>)
|
||||
|
||||
[[internal(intrinsic_store_vec2_f32)]]
|
||||
[[internal(intrinsic_store_vec2_f32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol_4(buffer : [[access(read_write)]] SB, offset : u32, value : vec2<u32>)
|
||||
|
||||
[[internal(intrinsic_store_vec2_i32)]]
|
||||
[[internal(intrinsic_store_vec2_i32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol_5(buffer : [[access(read_write)]] SB, offset : u32, value : vec2<f32>)
|
||||
|
||||
[[internal(intrinsic_store_vec3_u32)]]
|
||||
[[internal(intrinsic_store_vec3_u32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol_6(buffer : [[access(read_write)]] SB, offset : u32, value : vec3<i32>)
|
||||
|
||||
[[internal(intrinsic_store_vec3_f32)]]
|
||||
[[internal(intrinsic_store_vec3_f32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol_7(buffer : [[access(read_write)]] SB, offset : u32, value : vec3<u32>)
|
||||
|
||||
[[internal(intrinsic_store_vec3_i32)]]
|
||||
[[internal(intrinsic_store_vec3_i32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol_8(buffer : [[access(read_write)]] SB, offset : u32, value : vec3<f32>)
|
||||
|
||||
[[internal(intrinsic_store_vec4_u32)]]
|
||||
[[internal(intrinsic_store_vec4_u32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol_9(buffer : [[access(read_write)]] SB, offset : u32, value : vec4<i32>)
|
||||
|
||||
[[internal(intrinsic_store_vec4_f32)]]
|
||||
[[internal(intrinsic_store_vec4_f32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol_10(buffer : [[access(read_write)]] SB, offset : u32, value : vec4<u32>)
|
||||
|
||||
[[internal(intrinsic_store_vec4_i32)]]
|
||||
[[internal(intrinsic_store_vec4_i32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol_11(buffer : [[access(read_write)]] SB, offset : u32, value : vec4<f32>)
|
||||
|
||||
fn tint_symbol_12(buffer : [[access(read_write)]] SB, offset : u32, value : mat2x2<f32>) {
|
||||
@@ -837,7 +837,7 @@ struct SB {
|
||||
b : [[stride(256)]] array<S2>;
|
||||
};
|
||||
|
||||
[[internal(intrinsic_load_f32)]]
|
||||
[[internal(intrinsic_load_f32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol(buffer : [[access(read_write)]] SB, offset : u32) -> f32
|
||||
|
||||
[[group(0), binding(0)]] var<storage> sb : [[access(read_write)]] SB;
|
||||
@@ -905,7 +905,7 @@ struct SB {
|
||||
b : [[stride(256)]] array<S2>;
|
||||
};
|
||||
|
||||
[[internal(intrinsic_load_f32)]]
|
||||
[[internal(intrinsic_load_f32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol(buffer : [[access(read_write)]] SB, offset : u32) -> f32
|
||||
|
||||
[[group(0), binding(0)]] var<storage> sb : [[access(read_write)]] SB;
|
||||
@@ -992,7 +992,7 @@ struct SB {
|
||||
b : A2_Array;
|
||||
};
|
||||
|
||||
[[internal(intrinsic_load_f32)]]
|
||||
[[internal(intrinsic_load_f32), internal(disable_validation__function_has_no_body)]]
|
||||
fn tint_symbol(buffer : [[access(read_write)]] SB, offset : u32) -> f32
|
||||
|
||||
[[group(0), binding(0)]] var<storage> sb : [[access(read_write)]] SB;
|
||||
|
||||
Reference in New Issue
Block a user