diff --git a/docs/origin-trial-changes.md b/docs/origin-trial-changes.md index fc09c997c0..d6400b2df3 100644 --- a/docs/origin-trial-changes.md +++ b/docs/origin-trial-changes.md @@ -8,6 +8,10 @@ * Deprecated texture builtin functions that accepted a `read` access controlled storage texture have been removed. * Storage textures must now only use the `write` access control. +### Deprecated Features + +* The `ignore()` builtin has been replaced with phony-assignment. [gpuweb#2127](https://github.com/gpuweb/gpuweb/pull/2127) + ### New Features * `any()` and `all()` now support a `bool` parameter. These simply return the passed argument. [tint:1253](https://crbug.com/tint/1253) diff --git a/src/intrinsic_table.inl b/src/intrinsic_table.inl index d6c4842993..861fe97ff8 100644 --- a/src/intrinsic_table.inl +++ b/src/intrinsic_table.inl @@ -7774,7 +7774,7 @@ constexpr OverloadInfo kOverloads[] = { /* parameters */ &kParameters[534], /* return matcher indices */ nullptr, /* supported_stages */ PipelineStageSet(PipelineStage::kVertex, PipelineStage::kFragment, PipelineStage::kCompute), - /* is_deprecated */ false, + /* is_deprecated */ true, }, { /* [250] */ diff --git a/src/intrinsics.def b/src/intrinsics.def index d86827404a..50fea3b2dc 100644 --- a/src/intrinsics.def +++ b/src/intrinsics.def @@ -324,7 +324,7 @@ fn frexp(vec) -> _frexp_result_vec [[stage("fragment")]] fn fwidthCoarse(vec) -> vec [[stage("fragment")]] fn fwidthFine(f32) -> f32 [[stage("fragment")]] fn fwidthFine(vec) -> vec -fn ignore(T) +[[deprecated]] fn ignore(T) fn inverseSqrt(f32) -> f32 fn inverseSqrt(vec) -> vec fn isFinite(f32) -> bool diff --git a/src/transform/decompose_memory_access.cc b/src/transform/decompose_memory_access.cc index aa6b3ad5f2..450f8c07bd 100644 --- a/src/transform/decompose_memory_access.cc +++ b/src/transform/decompose_memory_access.cc @@ -919,7 +919,7 @@ void DecomposeMemoryAccess::Run(CloneContext& ctx, const DataMap&, DataMap&) { if (auto* call_expr = node->As()) { auto* call = sem.Get(call_expr); if (auto* intrinsic = call->Target()->As()) { - if (intrinsic->Type() == sem::IntrinsicType::kIgnore) { + if (intrinsic->Type() == sem::IntrinsicType::kIgnore) { // [DEPRECATED] // ignore(X) // If X is an memory access, don't transform it into a load, as it // may refer to a structure holding a runtime array, which cannot be diff --git a/src/writer/glsl/generator_impl.cc b/src/writer/glsl/generator_impl.cc index c940be8195..d7714f00ad 100644 --- a/src/writer/glsl/generator_impl.cc +++ b/src/writer/glsl/generator_impl.cc @@ -397,7 +397,7 @@ bool GeneratorImpl::EmitCall(std::ostream& out, } else if (intrinsic->Type() == sem::IntrinsicType::kIsNormal) { return EmitIsNormalCall(out, expr, intrinsic); } else if (intrinsic->Type() == sem::IntrinsicType::kIgnore) { - return EmitExpression(out, expr->args[0]); + return EmitExpression(out, expr->args[0]); // [DEPRECATED] } else if (intrinsic->IsDataPacking()) { return EmitDataPackingCall(out, expr, intrinsic); } else if (intrinsic->IsDataUnpacking()) { diff --git a/src/writer/hlsl/generator_impl.cc b/src/writer/hlsl/generator_impl.cc index bedb2ae385..17b83540c4 100644 --- a/src/writer/hlsl/generator_impl.cc +++ b/src/writer/hlsl/generator_impl.cc @@ -610,7 +610,7 @@ bool GeneratorImpl::EmitCall(std::ostream& out, } else if (intrinsic->Type() == sem::IntrinsicType::kIsNormal) { return EmitIsNormalCall(out, expr, intrinsic); } else if (intrinsic->Type() == sem::IntrinsicType::kIgnore) { - return EmitExpression(out, expr->args[0]); + return EmitExpression(out, expr->args[0]); // [DEPRECATED] } else if (intrinsic->IsDataPacking()) { return EmitDataPackingCall(out, expr, intrinsic); } else if (intrinsic->IsDataUnpacking()) { diff --git a/src/writer/msl/generator_impl.cc b/src/writer/msl/generator_impl.cc index 715acd7d38..d280ddb3a6 100644 --- a/src/writer/msl/generator_impl.cc +++ b/src/writer/msl/generator_impl.cc @@ -596,7 +596,7 @@ bool GeneratorImpl::EmitIntrinsicCall(std::ostream& out, out << "threadgroup_barrier(mem_flags::mem_threadgroup)"; return true; } - case sem::IntrinsicType::kIgnore: { + case sem::IntrinsicType::kIgnore: { // [DEPRECATED] out << "(void) "; if (!EmitExpression(out, expr->args[0])) { return false; diff --git a/src/writer/spirv/builder.cc b/src/writer/spirv/builder.cc index bbd6db9807..797bee2e88 100644 --- a/src/writer/spirv/builder.cc +++ b/src/writer/spirv/builder.cc @@ -2436,7 +2436,7 @@ uint32_t Builder::GenerateIntrinsic(const ast::CallExpression* call, case IntrinsicType::kFwidthFine: op = spv::Op::OpFwidthFine; break; - case IntrinsicType::kIgnore: + case IntrinsicType::kIgnore: // [DEPRECATED] // Evaluate the single argument, return the non-zero result_id which isn't // associated with any op (ignore returns void, so this cannot be used in // an expression). diff --git a/test/intrinsics/gen/ignore/2a6ac2.wgsl.expected.hlsl b/test/intrinsics/gen/ignore/2a6ac2.wgsl.expected.hlsl index 37fb93e0b8..47af8a9aa1 100644 --- a/test/intrinsics/gen/ignore/2a6ac2.wgsl.expected.hlsl +++ b/test/intrinsics/gen/ignore/2a6ac2.wgsl.expected.hlsl @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/2a6ac2.wgsl:29:3 warning: use of deprecated intrinsic + ignore(arg_0); + ^^^^^^ + Texture2DMS arg_0 : register(t0, space1); void ignore_2a6ac2() { diff --git a/test/intrinsics/gen/ignore/2a6ac2.wgsl.expected.msl b/test/intrinsics/gen/ignore/2a6ac2.wgsl.expected.msl index 0f71f07beb..9a20adfbbe 100644 --- a/test/intrinsics/gen/ignore/2a6ac2.wgsl.expected.msl +++ b/test/intrinsics/gen/ignore/2a6ac2.wgsl.expected.msl @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/2a6ac2.wgsl:29:3 warning: use of deprecated intrinsic + ignore(arg_0); + ^^^^^^ + #include using namespace metal; diff --git a/test/intrinsics/gen/ignore/2a6ac2.wgsl.expected.spvasm b/test/intrinsics/gen/ignore/2a6ac2.wgsl.expected.spvasm index 6a6003d754..eb692dbcc5 100644 --- a/test/intrinsics/gen/ignore/2a6ac2.wgsl.expected.spvasm +++ b/test/intrinsics/gen/ignore/2a6ac2.wgsl.expected.spvasm @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/2a6ac2.wgsl:29:3 warning: use of deprecated intrinsic + ignore(arg_0); + ^^^^^^ + ; SPIR-V ; Version: 1.3 ; Generator: Google Tint Compiler; 0 diff --git a/test/intrinsics/gen/ignore/2a6ac2.wgsl.expected.wgsl b/test/intrinsics/gen/ignore/2a6ac2.wgsl.expected.wgsl index 7c93736c70..c035b52849 100644 --- a/test/intrinsics/gen/ignore/2a6ac2.wgsl.expected.wgsl +++ b/test/intrinsics/gen/ignore/2a6ac2.wgsl.expected.wgsl @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/2a6ac2.wgsl:29:3 warning: use of deprecated intrinsic + ignore(arg_0); + ^^^^^^ + [[group(1), binding(0)]] var arg_0 : texture_depth_multisampled_2d; fn ignore_2a6ac2() { diff --git a/test/intrinsics/gen/ignore/5016e5.wgsl.expected.hlsl b/test/intrinsics/gen/ignore/5016e5.wgsl.expected.hlsl index ce36295ddc..de7b9a26ed 100644 --- a/test/intrinsics/gen/ignore/5016e5.wgsl.expected.hlsl +++ b/test/intrinsics/gen/ignore/5016e5.wgsl.expected.hlsl @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/5016e5.wgsl:29:3 warning: use of deprecated intrinsic + ignore(arg_0); + ^^^^^^ + SamplerState arg_0 : register(s0, space1); void ignore_5016e5() { diff --git a/test/intrinsics/gen/ignore/5016e5.wgsl.expected.msl b/test/intrinsics/gen/ignore/5016e5.wgsl.expected.msl index c7bf190e1a..23334434bb 100644 --- a/test/intrinsics/gen/ignore/5016e5.wgsl.expected.msl +++ b/test/intrinsics/gen/ignore/5016e5.wgsl.expected.msl @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/5016e5.wgsl:29:3 warning: use of deprecated intrinsic + ignore(arg_0); + ^^^^^^ + #include using namespace metal; diff --git a/test/intrinsics/gen/ignore/5016e5.wgsl.expected.spvasm b/test/intrinsics/gen/ignore/5016e5.wgsl.expected.spvasm index bb23bc6e4b..756cb3a575 100644 --- a/test/intrinsics/gen/ignore/5016e5.wgsl.expected.spvasm +++ b/test/intrinsics/gen/ignore/5016e5.wgsl.expected.spvasm @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/5016e5.wgsl:29:3 warning: use of deprecated intrinsic + ignore(arg_0); + ^^^^^^ + ; SPIR-V ; Version: 1.3 ; Generator: Google Tint Compiler; 0 diff --git a/test/intrinsics/gen/ignore/5016e5.wgsl.expected.wgsl b/test/intrinsics/gen/ignore/5016e5.wgsl.expected.wgsl index d8de83791c..e42269323c 100644 --- a/test/intrinsics/gen/ignore/5016e5.wgsl.expected.wgsl +++ b/test/intrinsics/gen/ignore/5016e5.wgsl.expected.wgsl @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/5016e5.wgsl:29:3 warning: use of deprecated intrinsic + ignore(arg_0); + ^^^^^^ + [[group(1), binding(0)]] var arg_0 : sampler; fn ignore_5016e5() { diff --git a/test/intrinsics/gen/ignore/509355.wgsl.expected.hlsl b/test/intrinsics/gen/ignore/509355.wgsl.expected.hlsl index 4ea37728c6..bb7be67d38 100644 --- a/test/intrinsics/gen/ignore/509355.wgsl.expected.hlsl +++ b/test/intrinsics/gen/ignore/509355.wgsl.expected.hlsl @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/509355.wgsl:29:3 warning: use of deprecated intrinsic + ignore(arg_0); + ^^^^^^ + TextureCube arg_0 : register(t0, space1); void ignore_509355() { diff --git a/test/intrinsics/gen/ignore/509355.wgsl.expected.msl b/test/intrinsics/gen/ignore/509355.wgsl.expected.msl index 3c291f850c..2ce8ae4e2a 100644 --- a/test/intrinsics/gen/ignore/509355.wgsl.expected.msl +++ b/test/intrinsics/gen/ignore/509355.wgsl.expected.msl @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/509355.wgsl:29:3 warning: use of deprecated intrinsic + ignore(arg_0); + ^^^^^^ + #include using namespace metal; diff --git a/test/intrinsics/gen/ignore/509355.wgsl.expected.spvasm b/test/intrinsics/gen/ignore/509355.wgsl.expected.spvasm index 2a6d176ace..62f678d724 100644 --- a/test/intrinsics/gen/ignore/509355.wgsl.expected.spvasm +++ b/test/intrinsics/gen/ignore/509355.wgsl.expected.spvasm @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/509355.wgsl:29:3 warning: use of deprecated intrinsic + ignore(arg_0); + ^^^^^^ + ; SPIR-V ; Version: 1.3 ; Generator: Google Tint Compiler; 0 diff --git a/test/intrinsics/gen/ignore/509355.wgsl.expected.wgsl b/test/intrinsics/gen/ignore/509355.wgsl.expected.wgsl index caffd89d0e..edfc4af013 100644 --- a/test/intrinsics/gen/ignore/509355.wgsl.expected.wgsl +++ b/test/intrinsics/gen/ignore/509355.wgsl.expected.wgsl @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/509355.wgsl:29:3 warning: use of deprecated intrinsic + ignore(arg_0); + ^^^^^^ + [[group(1), binding(0)]] var arg_0 : texture_depth_cube; fn ignore_509355() { diff --git a/test/intrinsics/gen/ignore/51aeb7.wgsl.expected.hlsl b/test/intrinsics/gen/ignore/51aeb7.wgsl.expected.hlsl index a9112fa944..4ddef13f8c 100644 --- a/test/intrinsics/gen/ignore/51aeb7.wgsl.expected.hlsl +++ b/test/intrinsics/gen/ignore/51aeb7.wgsl.expected.hlsl @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/51aeb7.wgsl:28:3 warning: use of deprecated intrinsic + ignore(1); + ^^^^^^ + void ignore_51aeb7() { 1; } diff --git a/test/intrinsics/gen/ignore/51aeb7.wgsl.expected.msl b/test/intrinsics/gen/ignore/51aeb7.wgsl.expected.msl index d5924e3a8e..73ce8fb238 100644 --- a/test/intrinsics/gen/ignore/51aeb7.wgsl.expected.msl +++ b/test/intrinsics/gen/ignore/51aeb7.wgsl.expected.msl @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/51aeb7.wgsl:28:3 warning: use of deprecated intrinsic + ignore(1); + ^^^^^^ + #include using namespace metal; diff --git a/test/intrinsics/gen/ignore/51aeb7.wgsl.expected.spvasm b/test/intrinsics/gen/ignore/51aeb7.wgsl.expected.spvasm index 02a2131615..0ea7b823b9 100644 --- a/test/intrinsics/gen/ignore/51aeb7.wgsl.expected.spvasm +++ b/test/intrinsics/gen/ignore/51aeb7.wgsl.expected.spvasm @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/51aeb7.wgsl:28:3 warning: use of deprecated intrinsic + ignore(1); + ^^^^^^ + ; SPIR-V ; Version: 1.3 ; Generator: Google Tint Compiler; 0 diff --git a/test/intrinsics/gen/ignore/51aeb7.wgsl.expected.wgsl b/test/intrinsics/gen/ignore/51aeb7.wgsl.expected.wgsl index 4e080d76b4..8d35e83f3e 100644 --- a/test/intrinsics/gen/ignore/51aeb7.wgsl.expected.wgsl +++ b/test/intrinsics/gen/ignore/51aeb7.wgsl.expected.wgsl @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/51aeb7.wgsl:28:3 warning: use of deprecated intrinsic + ignore(1); + ^^^^^^ + fn ignore_51aeb7() { ignore(1); } diff --git a/test/intrinsics/gen/ignore/5c9edf.wgsl.expected.hlsl b/test/intrinsics/gen/ignore/5c9edf.wgsl.expected.hlsl index fd9bab270b..2672489696 100644 --- a/test/intrinsics/gen/ignore/5c9edf.wgsl.expected.hlsl +++ b/test/intrinsics/gen/ignore/5c9edf.wgsl.expected.hlsl @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/5c9edf.wgsl:29:3 warning: use of deprecated intrinsic + ignore(arg_0); + ^^^^^^ + Texture2D arg_0 : register(t0, space1); void ignore_5c9edf() { diff --git a/test/intrinsics/gen/ignore/5c9edf.wgsl.expected.msl b/test/intrinsics/gen/ignore/5c9edf.wgsl.expected.msl index 6ee9b3b4eb..f7f3fd0fee 100644 --- a/test/intrinsics/gen/ignore/5c9edf.wgsl.expected.msl +++ b/test/intrinsics/gen/ignore/5c9edf.wgsl.expected.msl @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/5c9edf.wgsl:29:3 warning: use of deprecated intrinsic + ignore(arg_0); + ^^^^^^ + #include using namespace metal; diff --git a/test/intrinsics/gen/ignore/5c9edf.wgsl.expected.spvasm b/test/intrinsics/gen/ignore/5c9edf.wgsl.expected.spvasm index fcfbbb3a35..d2e6dce29c 100644 --- a/test/intrinsics/gen/ignore/5c9edf.wgsl.expected.spvasm +++ b/test/intrinsics/gen/ignore/5c9edf.wgsl.expected.spvasm @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/5c9edf.wgsl:29:3 warning: use of deprecated intrinsic + ignore(arg_0); + ^^^^^^ + ; SPIR-V ; Version: 1.3 ; Generator: Google Tint Compiler; 0 diff --git a/test/intrinsics/gen/ignore/5c9edf.wgsl.expected.wgsl b/test/intrinsics/gen/ignore/5c9edf.wgsl.expected.wgsl index 040e4012e4..d078cac7c8 100644 --- a/test/intrinsics/gen/ignore/5c9edf.wgsl.expected.wgsl +++ b/test/intrinsics/gen/ignore/5c9edf.wgsl.expected.wgsl @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/5c9edf.wgsl:29:3 warning: use of deprecated intrinsic + ignore(arg_0); + ^^^^^^ + [[group(1), binding(0)]] var arg_0 : texture_external; fn ignore_5c9edf() { diff --git a/test/intrinsics/gen/ignore/6698df.wgsl.expected.hlsl b/test/intrinsics/gen/ignore/6698df.wgsl.expected.hlsl index 00a4aca2f1..1e6df5ec11 100644 --- a/test/intrinsics/gen/ignore/6698df.wgsl.expected.hlsl +++ b/test/intrinsics/gen/ignore/6698df.wgsl.expected.hlsl @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/6698df.wgsl:28:3 warning: use of deprecated intrinsic + ignore(1u); + ^^^^^^ + void ignore_6698df() { 1u; } diff --git a/test/intrinsics/gen/ignore/6698df.wgsl.expected.msl b/test/intrinsics/gen/ignore/6698df.wgsl.expected.msl index 7e1f379154..adb2f8439a 100644 --- a/test/intrinsics/gen/ignore/6698df.wgsl.expected.msl +++ b/test/intrinsics/gen/ignore/6698df.wgsl.expected.msl @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/6698df.wgsl:28:3 warning: use of deprecated intrinsic + ignore(1u); + ^^^^^^ + #include using namespace metal; diff --git a/test/intrinsics/gen/ignore/6698df.wgsl.expected.spvasm b/test/intrinsics/gen/ignore/6698df.wgsl.expected.spvasm index 69465644ac..41705ca063 100644 --- a/test/intrinsics/gen/ignore/6698df.wgsl.expected.spvasm +++ b/test/intrinsics/gen/ignore/6698df.wgsl.expected.spvasm @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/6698df.wgsl:28:3 warning: use of deprecated intrinsic + ignore(1u); + ^^^^^^ + ; SPIR-V ; Version: 1.3 ; Generator: Google Tint Compiler; 0 diff --git a/test/intrinsics/gen/ignore/6698df.wgsl.expected.wgsl b/test/intrinsics/gen/ignore/6698df.wgsl.expected.wgsl index e4e0b21ca0..af3f6b5b91 100644 --- a/test/intrinsics/gen/ignore/6698df.wgsl.expected.wgsl +++ b/test/intrinsics/gen/ignore/6698df.wgsl.expected.wgsl @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/6698df.wgsl:28:3 warning: use of deprecated intrinsic + ignore(1u); + ^^^^^^ + fn ignore_6698df() { ignore(1u); } diff --git a/test/intrinsics/gen/ignore/ad88be.wgsl.expected.hlsl b/test/intrinsics/gen/ignore/ad88be.wgsl.expected.hlsl index c2b9e678a9..1d14d76f03 100644 --- a/test/intrinsics/gen/ignore/ad88be.wgsl.expected.hlsl +++ b/test/intrinsics/gen/ignore/ad88be.wgsl.expected.hlsl @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/ad88be.wgsl:29:3 warning: use of deprecated intrinsic + ignore(arg_0); + ^^^^^^ + TextureCubeArray arg_0 : register(t0, space1); void ignore_ad88be() { diff --git a/test/intrinsics/gen/ignore/ad88be.wgsl.expected.msl b/test/intrinsics/gen/ignore/ad88be.wgsl.expected.msl index c609818836..44aa6663d1 100644 --- a/test/intrinsics/gen/ignore/ad88be.wgsl.expected.msl +++ b/test/intrinsics/gen/ignore/ad88be.wgsl.expected.msl @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/ad88be.wgsl:29:3 warning: use of deprecated intrinsic + ignore(arg_0); + ^^^^^^ + #include using namespace metal; diff --git a/test/intrinsics/gen/ignore/ad88be.wgsl.expected.spvasm b/test/intrinsics/gen/ignore/ad88be.wgsl.expected.spvasm index a706caa4d0..0a90072c03 100644 --- a/test/intrinsics/gen/ignore/ad88be.wgsl.expected.spvasm +++ b/test/intrinsics/gen/ignore/ad88be.wgsl.expected.spvasm @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/ad88be.wgsl:29:3 warning: use of deprecated intrinsic + ignore(arg_0); + ^^^^^^ + ; SPIR-V ; Version: 1.3 ; Generator: Google Tint Compiler; 0 diff --git a/test/intrinsics/gen/ignore/ad88be.wgsl.expected.wgsl b/test/intrinsics/gen/ignore/ad88be.wgsl.expected.wgsl index 42565e166f..a371726dc8 100644 --- a/test/intrinsics/gen/ignore/ad88be.wgsl.expected.wgsl +++ b/test/intrinsics/gen/ignore/ad88be.wgsl.expected.wgsl @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/ad88be.wgsl:29:3 warning: use of deprecated intrinsic + ignore(arg_0); + ^^^^^^ + [[group(1), binding(0)]] var arg_0 : texture_depth_cube_array; fn ignore_ad88be() { diff --git a/test/intrinsics/gen/ignore/b469af.wgsl.expected.hlsl b/test/intrinsics/gen/ignore/b469af.wgsl.expected.hlsl index f2d39350ea..94f74f81ca 100644 --- a/test/intrinsics/gen/ignore/b469af.wgsl.expected.hlsl +++ b/test/intrinsics/gen/ignore/b469af.wgsl.expected.hlsl @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/b469af.wgsl:29:3 warning: use of deprecated intrinsic + ignore(arg_0); + ^^^^^^ + SamplerComparisonState arg_0 : register(s0, space1); void ignore_b469af() { diff --git a/test/intrinsics/gen/ignore/b469af.wgsl.expected.msl b/test/intrinsics/gen/ignore/b469af.wgsl.expected.msl index fd56b58c89..8b5c563fe3 100644 --- a/test/intrinsics/gen/ignore/b469af.wgsl.expected.msl +++ b/test/intrinsics/gen/ignore/b469af.wgsl.expected.msl @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/b469af.wgsl:29:3 warning: use of deprecated intrinsic + ignore(arg_0); + ^^^^^^ + #include using namespace metal; diff --git a/test/intrinsics/gen/ignore/b469af.wgsl.expected.spvasm b/test/intrinsics/gen/ignore/b469af.wgsl.expected.spvasm index f8886eb86c..55b665a2b6 100644 --- a/test/intrinsics/gen/ignore/b469af.wgsl.expected.spvasm +++ b/test/intrinsics/gen/ignore/b469af.wgsl.expected.spvasm @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/b469af.wgsl:29:3 warning: use of deprecated intrinsic + ignore(arg_0); + ^^^^^^ + ; SPIR-V ; Version: 1.3 ; Generator: Google Tint Compiler; 0 diff --git a/test/intrinsics/gen/ignore/b469af.wgsl.expected.wgsl b/test/intrinsics/gen/ignore/b469af.wgsl.expected.wgsl index cc4f3d07a1..d2270a8583 100644 --- a/test/intrinsics/gen/ignore/b469af.wgsl.expected.wgsl +++ b/test/intrinsics/gen/ignore/b469af.wgsl.expected.wgsl @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/b469af.wgsl:29:3 warning: use of deprecated intrinsic + ignore(arg_0); + ^^^^^^ + [[group(1), binding(0)]] var arg_0 : sampler_comparison; fn ignore_b469af() { diff --git a/test/intrinsics/gen/ignore/c8a0ee.wgsl.expected.hlsl b/test/intrinsics/gen/ignore/c8a0ee.wgsl.expected.hlsl index 123a8a0a75..15c8874b3d 100644 --- a/test/intrinsics/gen/ignore/c8a0ee.wgsl.expected.hlsl +++ b/test/intrinsics/gen/ignore/c8a0ee.wgsl.expected.hlsl @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/c8a0ee.wgsl:29:3 warning: use of deprecated intrinsic + ignore(arg_0); + ^^^^^^ + Texture2DArray arg_0 : register(t0, space1); void ignore_c8a0ee() { diff --git a/test/intrinsics/gen/ignore/c8a0ee.wgsl.expected.msl b/test/intrinsics/gen/ignore/c8a0ee.wgsl.expected.msl index bf3ca69dbe..82003942ef 100644 --- a/test/intrinsics/gen/ignore/c8a0ee.wgsl.expected.msl +++ b/test/intrinsics/gen/ignore/c8a0ee.wgsl.expected.msl @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/c8a0ee.wgsl:29:3 warning: use of deprecated intrinsic + ignore(arg_0); + ^^^^^^ + #include using namespace metal; diff --git a/test/intrinsics/gen/ignore/c8a0ee.wgsl.expected.spvasm b/test/intrinsics/gen/ignore/c8a0ee.wgsl.expected.spvasm index 766ca58618..df6bb4ed30 100644 --- a/test/intrinsics/gen/ignore/c8a0ee.wgsl.expected.spvasm +++ b/test/intrinsics/gen/ignore/c8a0ee.wgsl.expected.spvasm @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/c8a0ee.wgsl:29:3 warning: use of deprecated intrinsic + ignore(arg_0); + ^^^^^^ + ; SPIR-V ; Version: 1.3 ; Generator: Google Tint Compiler; 0 diff --git a/test/intrinsics/gen/ignore/c8a0ee.wgsl.expected.wgsl b/test/intrinsics/gen/ignore/c8a0ee.wgsl.expected.wgsl index 2e3cd9916f..abb1ae98a1 100644 --- a/test/intrinsics/gen/ignore/c8a0ee.wgsl.expected.wgsl +++ b/test/intrinsics/gen/ignore/c8a0ee.wgsl.expected.wgsl @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/c8a0ee.wgsl:29:3 warning: use of deprecated intrinsic + ignore(arg_0); + ^^^^^^ + [[group(1), binding(0)]] var arg_0 : texture_depth_2d_array; fn ignore_c8a0ee() { diff --git a/test/intrinsics/gen/ignore/d91a2f.wgsl.expected.hlsl b/test/intrinsics/gen/ignore/d91a2f.wgsl.expected.hlsl index 467fe189e0..8e83bc0e7a 100644 --- a/test/intrinsics/gen/ignore/d91a2f.wgsl.expected.hlsl +++ b/test/intrinsics/gen/ignore/d91a2f.wgsl.expected.hlsl @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/d91a2f.wgsl:28:3 warning: use of deprecated intrinsic + ignore(1.0); + ^^^^^^ + void ignore_d91a2f() { 1.0f; } diff --git a/test/intrinsics/gen/ignore/d91a2f.wgsl.expected.msl b/test/intrinsics/gen/ignore/d91a2f.wgsl.expected.msl index fefc1de119..4e1cb504c6 100644 --- a/test/intrinsics/gen/ignore/d91a2f.wgsl.expected.msl +++ b/test/intrinsics/gen/ignore/d91a2f.wgsl.expected.msl @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/d91a2f.wgsl:28:3 warning: use of deprecated intrinsic + ignore(1.0); + ^^^^^^ + #include using namespace metal; diff --git a/test/intrinsics/gen/ignore/d91a2f.wgsl.expected.spvasm b/test/intrinsics/gen/ignore/d91a2f.wgsl.expected.spvasm index 2d672975f0..10b65e229a 100644 --- a/test/intrinsics/gen/ignore/d91a2f.wgsl.expected.spvasm +++ b/test/intrinsics/gen/ignore/d91a2f.wgsl.expected.spvasm @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/d91a2f.wgsl:28:3 warning: use of deprecated intrinsic + ignore(1.0); + ^^^^^^ + ; SPIR-V ; Version: 1.3 ; Generator: Google Tint Compiler; 0 diff --git a/test/intrinsics/gen/ignore/d91a2f.wgsl.expected.wgsl b/test/intrinsics/gen/ignore/d91a2f.wgsl.expected.wgsl index a3f2201c3a..d1d3f3eaaf 100644 --- a/test/intrinsics/gen/ignore/d91a2f.wgsl.expected.wgsl +++ b/test/intrinsics/gen/ignore/d91a2f.wgsl.expected.wgsl @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/d91a2f.wgsl:28:3 warning: use of deprecated intrinsic + ignore(1.0); + ^^^^^^ + fn ignore_d91a2f() { ignore(1.0); } diff --git a/test/intrinsics/gen/ignore/e0187b.wgsl.expected.hlsl b/test/intrinsics/gen/ignore/e0187b.wgsl.expected.hlsl index 08e8da673b..c9a27c42e8 100644 --- a/test/intrinsics/gen/ignore/e0187b.wgsl.expected.hlsl +++ b/test/intrinsics/gen/ignore/e0187b.wgsl.expected.hlsl @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/e0187b.wgsl:29:3 warning: use of deprecated intrinsic + ignore(arg_0); + ^^^^^^ + Texture2D arg_0 : register(t0, space1); void ignore_e0187b() { diff --git a/test/intrinsics/gen/ignore/e0187b.wgsl.expected.msl b/test/intrinsics/gen/ignore/e0187b.wgsl.expected.msl index 1af6d522f6..9783c87bf2 100644 --- a/test/intrinsics/gen/ignore/e0187b.wgsl.expected.msl +++ b/test/intrinsics/gen/ignore/e0187b.wgsl.expected.msl @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/e0187b.wgsl:29:3 warning: use of deprecated intrinsic + ignore(arg_0); + ^^^^^^ + #include using namespace metal; diff --git a/test/intrinsics/gen/ignore/e0187b.wgsl.expected.spvasm b/test/intrinsics/gen/ignore/e0187b.wgsl.expected.spvasm index aa1955645f..83b961656a 100644 --- a/test/intrinsics/gen/ignore/e0187b.wgsl.expected.spvasm +++ b/test/intrinsics/gen/ignore/e0187b.wgsl.expected.spvasm @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/e0187b.wgsl:29:3 warning: use of deprecated intrinsic + ignore(arg_0); + ^^^^^^ + ; SPIR-V ; Version: 1.3 ; Generator: Google Tint Compiler; 0 diff --git a/test/intrinsics/gen/ignore/e0187b.wgsl.expected.wgsl b/test/intrinsics/gen/ignore/e0187b.wgsl.expected.wgsl index c6d56dc243..aca8c1439a 100644 --- a/test/intrinsics/gen/ignore/e0187b.wgsl.expected.wgsl +++ b/test/intrinsics/gen/ignore/e0187b.wgsl.expected.wgsl @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/e0187b.wgsl:29:3 warning: use of deprecated intrinsic + ignore(arg_0); + ^^^^^^ + [[group(1), binding(0)]] var arg_0 : texture_depth_2d; fn ignore_e0187b() { diff --git a/test/intrinsics/gen/ignore/f414a6.wgsl.expected.hlsl b/test/intrinsics/gen/ignore/f414a6.wgsl.expected.hlsl index 0023d0cccb..53d8986d13 100644 --- a/test/intrinsics/gen/ignore/f414a6.wgsl.expected.hlsl +++ b/test/intrinsics/gen/ignore/f414a6.wgsl.expected.hlsl @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/f414a6.wgsl:28:3 warning: use of deprecated intrinsic + ignore(bool()); + ^^^^^^ + void ignore_f414a6() { false; } diff --git a/test/intrinsics/gen/ignore/f414a6.wgsl.expected.msl b/test/intrinsics/gen/ignore/f414a6.wgsl.expected.msl index 149e8aab2f..9f5a5bcee8 100644 --- a/test/intrinsics/gen/ignore/f414a6.wgsl.expected.msl +++ b/test/intrinsics/gen/ignore/f414a6.wgsl.expected.msl @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/f414a6.wgsl:28:3 warning: use of deprecated intrinsic + ignore(bool()); + ^^^^^^ + #include using namespace metal; diff --git a/test/intrinsics/gen/ignore/f414a6.wgsl.expected.spvasm b/test/intrinsics/gen/ignore/f414a6.wgsl.expected.spvasm index cd952a85b3..478b04c7b6 100644 --- a/test/intrinsics/gen/ignore/f414a6.wgsl.expected.spvasm +++ b/test/intrinsics/gen/ignore/f414a6.wgsl.expected.spvasm @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/f414a6.wgsl:28:3 warning: use of deprecated intrinsic + ignore(bool()); + ^^^^^^ + ; SPIR-V ; Version: 1.3 ; Generator: Google Tint Compiler; 0 diff --git a/test/intrinsics/gen/ignore/f414a6.wgsl.expected.wgsl b/test/intrinsics/gen/ignore/f414a6.wgsl.expected.wgsl index 1bbd6bbf42..389da667b5 100644 --- a/test/intrinsics/gen/ignore/f414a6.wgsl.expected.wgsl +++ b/test/intrinsics/gen/ignore/f414a6.wgsl.expected.wgsl @@ -1,3 +1,7 @@ +intrinsics/gen/ignore/f414a6.wgsl:28:3 warning: use of deprecated intrinsic + ignore(bool()); + ^^^^^^ + fn ignore_f414a6() { ignore(bool()); } diff --git a/test/intrinsics/ignore/call.wgsl.expected.hlsl b/test/intrinsics/ignore/call.wgsl.expected.hlsl index 3d18ac9c64..7bec8e1d91 100644 --- a/test/intrinsics/ignore/call.wgsl.expected.hlsl +++ b/test/intrinsics/ignore/call.wgsl.expected.hlsl @@ -1,3 +1,7 @@ +intrinsics/ignore/call.wgsl:7:5 warning: use of deprecated intrinsic + ignore(f(1, 2, 3)); + ^^^^^^ + int f(int a, int b, int c) { return ((a * b) + c); } diff --git a/test/intrinsics/ignore/call.wgsl.expected.msl b/test/intrinsics/ignore/call.wgsl.expected.msl index c2406f8911..f4a6280cd7 100644 --- a/test/intrinsics/ignore/call.wgsl.expected.msl +++ b/test/intrinsics/ignore/call.wgsl.expected.msl @@ -1,3 +1,7 @@ +intrinsics/ignore/call.wgsl:7:5 warning: use of deprecated intrinsic + ignore(f(1, 2, 3)); + ^^^^^^ + #include using namespace metal; diff --git a/test/intrinsics/ignore/call.wgsl.expected.spvasm b/test/intrinsics/ignore/call.wgsl.expected.spvasm index 0a827292dd..34b55c260e 100644 --- a/test/intrinsics/ignore/call.wgsl.expected.spvasm +++ b/test/intrinsics/ignore/call.wgsl.expected.spvasm @@ -1,3 +1,7 @@ +intrinsics/ignore/call.wgsl:7:5 warning: use of deprecated intrinsic + ignore(f(1, 2, 3)); + ^^^^^^ + ; SPIR-V ; Version: 1.3 ; Generator: Google Tint Compiler; 0 diff --git a/test/intrinsics/ignore/call.wgsl.expected.wgsl b/test/intrinsics/ignore/call.wgsl.expected.wgsl index 2f6402e9a3..4ab9b94daf 100644 --- a/test/intrinsics/ignore/call.wgsl.expected.wgsl +++ b/test/intrinsics/ignore/call.wgsl.expected.wgsl @@ -1,3 +1,7 @@ +intrinsics/ignore/call.wgsl:7:5 warning: use of deprecated intrinsic + ignore(f(1, 2, 3)); + ^^^^^^ + fn f(a : i32, b : i32, c : i32) -> i32 { return ((a * b) + c); } diff --git a/test/intrinsics/ignore/runtime_array.wgsl.expected.hlsl b/test/intrinsics/ignore/runtime_array.wgsl.expected.hlsl index 3f323c7f2d..dbc885362d 100644 --- a/test/intrinsics/ignore/runtime_array.wgsl.expected.hlsl +++ b/test/intrinsics/ignore/runtime_array.wgsl.expected.hlsl @@ -1,3 +1,7 @@ +intrinsics/ignore/runtime_array.wgsl:10:5 warning: use of deprecated intrinsic + ignore(s.arr); + ^^^^^^ + RWByteAddressBuffer s : register(u0, space0); [numthreads(1, 1, 1)] diff --git a/test/intrinsics/ignore/runtime_array.wgsl.expected.msl b/test/intrinsics/ignore/runtime_array.wgsl.expected.msl index 760ed4238f..e9f8a97082 100644 --- a/test/intrinsics/ignore/runtime_array.wgsl.expected.msl +++ b/test/intrinsics/ignore/runtime_array.wgsl.expected.msl @@ -1,3 +1,7 @@ +intrinsics/ignore/runtime_array.wgsl:10:5 warning: use of deprecated intrinsic + ignore(s.arr); + ^^^^^^ + #include using namespace metal; diff --git a/test/intrinsics/ignore/runtime_array.wgsl.expected.spvasm b/test/intrinsics/ignore/runtime_array.wgsl.expected.spvasm index 8a335943f5..3d32726003 100644 --- a/test/intrinsics/ignore/runtime_array.wgsl.expected.spvasm +++ b/test/intrinsics/ignore/runtime_array.wgsl.expected.spvasm @@ -1,3 +1,7 @@ +intrinsics/ignore/runtime_array.wgsl:10:5 warning: use of deprecated intrinsic + ignore(s.arr); + ^^^^^^ + ; SPIR-V ; Version: 1.3 ; Generator: Google Tint Compiler; 0 diff --git a/test/intrinsics/ignore/runtime_array.wgsl.expected.wgsl b/test/intrinsics/ignore/runtime_array.wgsl.expected.wgsl index 77835c28c6..fd0b75c2ad 100644 --- a/test/intrinsics/ignore/runtime_array.wgsl.expected.wgsl +++ b/test/intrinsics/ignore/runtime_array.wgsl.expected.wgsl @@ -1,3 +1,7 @@ +intrinsics/ignore/runtime_array.wgsl:10:5 warning: use of deprecated intrinsic + ignore(s.arr); + ^^^^^^ + [[block]] struct S { arr : array; diff --git a/test/intrinsics/ignore/storage_buffer.wgsl.expected.hlsl b/test/intrinsics/ignore/storage_buffer.wgsl.expected.hlsl index 179f697cd0..414002626a 100644 --- a/test/intrinsics/ignore/storage_buffer.wgsl.expected.hlsl +++ b/test/intrinsics/ignore/storage_buffer.wgsl.expected.hlsl @@ -1,3 +1,11 @@ +intrinsics/ignore/storage_buffer.wgsl:10:5 warning: use of deprecated intrinsic + ignore(s); + ^^^^^^ + +intrinsics/ignore/storage_buffer.wgsl:11:5 warning: use of deprecated intrinsic + ignore(s.i); + ^^^^^^ + RWByteAddressBuffer s : register(u0, space0); [numthreads(1, 1, 1)] diff --git a/test/intrinsics/ignore/storage_buffer.wgsl.expected.msl b/test/intrinsics/ignore/storage_buffer.wgsl.expected.msl index 968ab7058c..f61d5a5d16 100644 --- a/test/intrinsics/ignore/storage_buffer.wgsl.expected.msl +++ b/test/intrinsics/ignore/storage_buffer.wgsl.expected.msl @@ -1,3 +1,11 @@ +intrinsics/ignore/storage_buffer.wgsl:10:5 warning: use of deprecated intrinsic + ignore(s); + ^^^^^^ + +intrinsics/ignore/storage_buffer.wgsl:11:5 warning: use of deprecated intrinsic + ignore(s.i); + ^^^^^^ + #include using namespace metal; diff --git a/test/intrinsics/ignore/storage_buffer.wgsl.expected.spvasm b/test/intrinsics/ignore/storage_buffer.wgsl.expected.spvasm index 18661fef64..206dd03415 100644 --- a/test/intrinsics/ignore/storage_buffer.wgsl.expected.spvasm +++ b/test/intrinsics/ignore/storage_buffer.wgsl.expected.spvasm @@ -1,3 +1,11 @@ +intrinsics/ignore/storage_buffer.wgsl:10:5 warning: use of deprecated intrinsic + ignore(s); + ^^^^^^ + +intrinsics/ignore/storage_buffer.wgsl:11:5 warning: use of deprecated intrinsic + ignore(s.i); + ^^^^^^ + ; SPIR-V ; Version: 1.3 ; Generator: Google Tint Compiler; 0 diff --git a/test/intrinsics/ignore/storage_buffer.wgsl.expected.wgsl b/test/intrinsics/ignore/storage_buffer.wgsl.expected.wgsl index 526bc3bfc2..f0a5cd143b 100644 --- a/test/intrinsics/ignore/storage_buffer.wgsl.expected.wgsl +++ b/test/intrinsics/ignore/storage_buffer.wgsl.expected.wgsl @@ -1,3 +1,11 @@ +intrinsics/ignore/storage_buffer.wgsl:10:5 warning: use of deprecated intrinsic + ignore(s); + ^^^^^^ + +intrinsics/ignore/storage_buffer.wgsl:11:5 warning: use of deprecated intrinsic + ignore(s.i); + ^^^^^^ + [[block]] struct S { i : i32; diff --git a/test/intrinsics/ignore/uniform_buffer.wgsl.expected.hlsl b/test/intrinsics/ignore/uniform_buffer.wgsl.expected.hlsl index 0b0aa2d0fe..43fa9fb5ba 100644 --- a/test/intrinsics/ignore/uniform_buffer.wgsl.expected.hlsl +++ b/test/intrinsics/ignore/uniform_buffer.wgsl.expected.hlsl @@ -1,3 +1,11 @@ +intrinsics/ignore/uniform_buffer.wgsl:10:5 warning: use of deprecated intrinsic + ignore(u); + ^^^^^^ + +intrinsics/ignore/uniform_buffer.wgsl:11:5 warning: use of deprecated intrinsic + ignore(u.i); + ^^^^^^ + cbuffer cbuffer_u : register(b0, space0) { uint4 u[1]; }; diff --git a/test/intrinsics/ignore/uniform_buffer.wgsl.expected.msl b/test/intrinsics/ignore/uniform_buffer.wgsl.expected.msl index 922024765e..e9955b0a42 100644 --- a/test/intrinsics/ignore/uniform_buffer.wgsl.expected.msl +++ b/test/intrinsics/ignore/uniform_buffer.wgsl.expected.msl @@ -1,3 +1,11 @@ +intrinsics/ignore/uniform_buffer.wgsl:10:5 warning: use of deprecated intrinsic + ignore(u); + ^^^^^^ + +intrinsics/ignore/uniform_buffer.wgsl:11:5 warning: use of deprecated intrinsic + ignore(u.i); + ^^^^^^ + #include using namespace metal; diff --git a/test/intrinsics/ignore/uniform_buffer.wgsl.expected.spvasm b/test/intrinsics/ignore/uniform_buffer.wgsl.expected.spvasm index e18af14b8d..cb533d8f83 100644 --- a/test/intrinsics/ignore/uniform_buffer.wgsl.expected.spvasm +++ b/test/intrinsics/ignore/uniform_buffer.wgsl.expected.spvasm @@ -1,3 +1,11 @@ +intrinsics/ignore/uniform_buffer.wgsl:10:5 warning: use of deprecated intrinsic + ignore(u); + ^^^^^^ + +intrinsics/ignore/uniform_buffer.wgsl:11:5 warning: use of deprecated intrinsic + ignore(u.i); + ^^^^^^ + ; SPIR-V ; Version: 1.3 ; Generator: Google Tint Compiler; 0 diff --git a/test/intrinsics/ignore/uniform_buffer.wgsl.expected.wgsl b/test/intrinsics/ignore/uniform_buffer.wgsl.expected.wgsl index f0aacfdb0d..ae04bdcef7 100644 --- a/test/intrinsics/ignore/uniform_buffer.wgsl.expected.wgsl +++ b/test/intrinsics/ignore/uniform_buffer.wgsl.expected.wgsl @@ -1,3 +1,11 @@ +intrinsics/ignore/uniform_buffer.wgsl:10:5 warning: use of deprecated intrinsic + ignore(u); + ^^^^^^ + +intrinsics/ignore/uniform_buffer.wgsl:11:5 warning: use of deprecated intrinsic + ignore(u.i); + ^^^^^^ + [[block]] struct S { i : i32;