encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-12-11 14:41:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

tint: Remove support for smoothStep builtin

Browse Source 
The new spelling `smoothstep` was introduced in M102.

Fixed: tint:1483
Change-Id: Ia5e1401f8f09450a3a767b0bb975216bd85be8db
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/93360
Commit-Queue: James Price <jrprice@google.com>
Auto-Submit: James Price <jrprice@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
This commit is contained in:
James Price
2022-06-15 23:32:14 +00:00
committed by Dawn LUCI CQ
parent 446b1a7df1
commit 3e38d7effe
39 changed files with 3288 additions and 4414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/tint/intrinsics.def
View File

@@ -448,8 +448,6 @@ fn sinh(f32) -> f32
fn sinh<N: num>(vec<N, f32>) -> vec<N, f32>
fn smoothstep(f32, f32, f32) -> f32
fn smoothstep<N: num>(vec<N, f32>, vec<N, f32>, vec<N, f32>) -> vec<N, f32>
@deprecated fn smoothStep(f32, f32, f32) -> f32
@deprecated fn smoothStep<N: num>(vec<N, f32>, vec<N, f32>, vec<N, f32>) -> vec<N, f32>
fn sqrt(f32) -> f32
fn sqrt<N: num>(vec<N, f32>) -> vec<N, f32>
fn step(f32, f32) -> f32

1
src/tint/resolver/builtin_test.cc
View File

@@ -1263,7 +1263,6 @@ INSTANTIATE_TEST_SUITE_P(ResolverTest,
ResolverBuiltinTest_ThreeParam,
testing::Values(BuiltinData{"mix", BuiltinType::kMix},
BuiltinData{"smoothstep", BuiltinType::kSmoothstep},
BuiltinData{"smoothStep", BuiltinType::kSmoothStep},
BuiltinData{"fma", BuiltinType::kFma}));
using ResolverBuiltinTest_ThreeParam_FloatOrInt = ResolverTestWithParam<BuiltinData>;

6627
src/tint/resolver/intrinsic_table.inl
View File

File diff suppressed because it is too large Load Diff

1
src/tint/sem/builtin_test.cc
View File

@@ -93,7 +93,6 @@ INSTANTIATE_TEST_SUITE_P(
BuiltinData{"sin", BuiltinType::kSin},
BuiltinData{"sinh", BuiltinType::kSinh},
BuiltinData{"smoothstep", BuiltinType::kSmoothstep},
BuiltinData{"smoothStep", BuiltinType::kSmoothStep},
BuiltinData{"sqrt", BuiltinType::kSqrt},
BuiltinData{"step", BuiltinType::kStep},
BuiltinData{"storageBarrier", BuiltinType::kStorageBarrier},

5
src/tint/sem/builtin_type.cc
View File

@@ -233,9 +233,6 @@ BuiltinType ParseBuiltinType(const std::string& name) {
if (name == "smoothstep") {
return BuiltinType::kSmoothstep;
}
if (name == "smoothStep") {
return BuiltinType::kSmoothStep;
}
if (name == "sqrt") {
return BuiltinType::kSqrt;
}
@@ -493,8 +490,6 @@ const char* str(BuiltinType i) {
return "sinh";
case BuiltinType::kSmoothstep:
return "smoothstep";
case BuiltinType::kSmoothStep:
return "smoothStep";
case BuiltinType::kSqrt:
return "sqrt";
case BuiltinType::kStep:

1
src/tint/sem/builtin_type.h
View File

@@ -101,7 +101,6 @@ enum class BuiltinType {
kSin,
kSinh,
kSmoothstep,
kSmoothStep,
kSqrt,
kStep,
kStorageBarrier,

1
src/tint/writer/glsl/generator_impl.cc
View File

@@ -1701,7 +1701,6 @@ std::string GeneratorImpl::generate_builtin_name(const sem::Builtin* builtin) {
case sem::BuiltinType::kReverseBits:
return "bitfieldReverse";
case sem::BuiltinType::kSmoothstep:
case sem::BuiltinType::kSmoothStep:
return "smoothstep";
case sem::BuiltinType::kUnpack2x16float:
return "unpackHalf2x16";

2
src/tint/writer/glsl/generator_impl_builtin_test.cc
View File

@@ -112,7 +112,6 @@ const ast::CallExpression* GenerateCall(BuiltinType builtin,
case BuiltinType::kMix:
case BuiltinType::kFaceForward:
case BuiltinType::kSmoothstep:
case BuiltinType::kSmoothStep:
return builder->Call(str.str(), "f2", "f2", "f2");
case BuiltinType::kAll:
case BuiltinType::kAny:
@@ -233,7 +232,6 @@ INSTANTIATE_TEST_SUITE_P(
BuiltinData{BuiltinType::kSin, ParamType::kF32, "sin"},
BuiltinData{BuiltinType::kSinh, ParamType::kF32, "sinh"},
BuiltinData{BuiltinType::kSmoothstep, ParamType::kF32, "smoothstep"},
BuiltinData{BuiltinType::kSmoothStep, ParamType::kF32, "smoothstep"},
BuiltinData{BuiltinType::kSqrt, ParamType::kF32, "sqrt"},
BuiltinData{BuiltinType::kStep, ParamType::kF32, "step"},
BuiltinData{BuiltinType::kTan, ParamType::kF32, "tan"},

1
src/tint/writer/hlsl/generator_impl.cc
View File

@@ -2577,7 +2577,6 @@ std::string GeneratorImpl::generate_builtin_name(const sem::Builtin* builtin) {
case sem::BuiltinType::kReverseBits: // uint
return "reversebits";
case sem::BuiltinType::kSmoothstep:
case sem::BuiltinType::kSmoothStep:
return "smoothstep";
default:
diagnostics_.add_error(diag::System::Writer,

2
src/tint/writer/hlsl/generator_impl_builtin_test.cc
View File

@@ -111,7 +111,6 @@ const ast::CallExpression* GenerateCall(BuiltinType builtin,
case BuiltinType::kMix:
case BuiltinType::kFaceForward:
case BuiltinType::kSmoothstep:
case BuiltinType::kSmoothStep:
return builder->Call(str.str(), "f2", "f2", "f2");
case BuiltinType::kAll:
case BuiltinType::kAny:
@@ -232,7 +231,6 @@ INSTANTIATE_TEST_SUITE_P(
BuiltinData{BuiltinType::kSin, ParamType::kF32, "sin"},
BuiltinData{BuiltinType::kSinh, ParamType::kF32, "sinh"},
BuiltinData{BuiltinType::kSmoothstep, ParamType::kF32, "smoothstep"},
BuiltinData{BuiltinType::kSmoothStep, ParamType::kF32, "smoothstep"},
BuiltinData{BuiltinType::kSqrt, ParamType::kF32, "sqrt"},
BuiltinData{BuiltinType::kStep, ParamType::kF32, "step"},
BuiltinData{BuiltinType::kTan, ParamType::kF32, "tan"},

1
src/tint/writer/msl/generator_impl.cc
View File

@@ -1452,7 +1452,6 @@ std::string GeneratorImpl::generate_builtin_name(const sem::Builtin* builtin) {
out += "rint";
break;
case sem::BuiltinType::kSmoothstep:
case sem::BuiltinType::kSmoothStep:
out += "smoothstep";
break;
case sem::BuiltinType::kInverseSqrt:

2
src/tint/writer/msl/generator_impl_builtin_test.cc
View File

@@ -110,7 +110,6 @@ const ast::CallExpression* GenerateCall(BuiltinType builtin,
case BuiltinType::kMix:
case BuiltinType::kFaceForward:
case BuiltinType::kSmoothstep:
case BuiltinType::kSmoothStep:
return builder->Call(str.str(), "f2", "f2", "f2");
case BuiltinType::kAll:
case BuiltinType::kAny:
@@ -262,7 +261,6 @@ INSTANTIATE_TEST_SUITE_P(
BuiltinData{BuiltinType::kSin, ParamType::kF32, "sin"},
BuiltinData{BuiltinType::kSinh, ParamType::kF32, "sinh"},
BuiltinData{BuiltinType::kSmoothstep, ParamType::kF32, "smoothstep"},
BuiltinData{BuiltinType::kSmoothStep, ParamType::kF32, "smoothstep"},
BuiltinData{BuiltinType::kSqrt, ParamType::kF32, "sqrt"},
BuiltinData{BuiltinType::kStep, ParamType::kF32, "step"},
BuiltinData{BuiltinType::kTan, ParamType::kF32, "tan"},

1
src/tint/writer/spirv/builder.cc
View File

@@ -204,7 +204,6 @@ uint32_t builtin_to_glsl_method(const sem::Builtin* builtin) {
case BuiltinType::kSinh:
return GLSLstd450Sinh;
case BuiltinType::kSmoothstep:
case BuiltinType::kSmoothStep:
return GLSLstd450SmoothStep;
case BuiltinType::kSqrt:
return GLSLstd450Sqrt;