diff options
author | John Stiles <johnstiles@google.com> | 2022-03-22 10:32:16 -0400 |
---|---|---|
committer | SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> | 2022-03-24 02:09:39 +0000 |
commit | 3f690607d6d99009fb0c22b7e679c4c83772d1d8 (patch) | |
tree | 7302c654afe3c7b673e719c94bf5125a1e74344b | |
parent | 0162649cc186ec6d5c50138bf8c20bac483f47fe (diff) | |
download | skia-3f690607d6d99009fb0c22b7e679c4c83772d1d8.tar.gz |
Rename ES2 error tests starting with 'S' to .rts.
Change-Id: I1dd481ca47965e933a110a0f0a8ef7616deb034d
Bug: skia:13042
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/523417
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Reviewed-by: Arman Uguray <armansito@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/524102
Reviewed-by: Derek Sollenberger <djsollen@google.com>
-rw-r--r-- | gn/sksl_tests.gni | 30 | ||||
-rw-r--r-- | resources/sksl/errors/SelfReferentialInitializerExpression.rts (renamed from resources/sksl/errors/SelfReferentialInitializerExpression.sksl) | 2 | ||||
-rw-r--r-- | resources/sksl/errors/SpuriousFloat.rts (renamed from resources/sksl/errors/SpuriousFloat.sksl) | 2 | ||||
-rw-r--r-- | resources/sksl/errors/StructMemberReservedName.rts (renamed from resources/sksl/errors/StructMemberReservedName.sksl) | 2 | ||||
-rw-r--r-- | resources/sksl/errors/StructNameWithoutIdentifier.rts (renamed from resources/sksl/errors/StructNameWithoutIdentifier.sksl) | 0 | ||||
-rw-r--r-- | resources/sksl/errors/StructTooDeeplyNested.rts (renamed from resources/sksl/errors/StructTooDeeplyNested.sksl) | 0 | ||||
-rw-r--r-- | resources/sksl/errors/StructVariableReservedName.rts (renamed from resources/sksl/errors/StructVariableReservedName.sksl) | 0 | ||||
-rw-r--r-- | resources/sksl/errors/SwitchDuplicateCase.rts (renamed from resources/sksl/errors/SwitchDuplicateCase.sksl) | 2 | ||||
-rw-r--r-- | resources/sksl/errors/SwitchDuplicateDefault.rts (renamed from resources/sksl/errors/SwitchDuplicateDefault.sksl) | 2 | ||||
-rw-r--r-- | resources/sksl/errors/SwitchTypes.rts (renamed from resources/sksl/errors/SwitchTypes.sksl) | 0 | ||||
-rw-r--r-- | resources/sksl/errors/SwizzleConstantOutput.rts (renamed from resources/sksl/errors/SwizzleConstantOutput.sksl) | 2 | ||||
-rw-r--r-- | resources/sksl/errors/SwizzleDomain.rts (renamed from resources/sksl/errors/SwizzleDomain.sksl) | 0 | ||||
-rw-r--r-- | resources/sksl/errors/SwizzleMatrix.rts (renamed from resources/sksl/errors/SwizzleMatrix.sksl) | 2 | ||||
-rw-r--r-- | resources/sksl/errors/SwizzleOnlyLiterals.rts (renamed from resources/sksl/errors/SwizzleOnlyLiterals.sksl) | 2 | ||||
-rw-r--r-- | resources/sksl/errors/SwizzleOutOfBounds.rts | 5 | ||||
-rw-r--r-- | resources/sksl/errors/SwizzleOutOfBounds.sksl | 5 | ||||
-rw-r--r-- | resources/sksl/errors/SwizzleTooManyComponents.rts (renamed from resources/sksl/errors/SwizzleTooManyComponents.sksl) | 2 |
17 files changed, 29 insertions, 29 deletions
diff --git a/gn/sksl_tests.gni b/gn/sksl_tests.gni index 2863885adb..424988a5e4 100644 --- a/gn/sksl_tests.gni +++ b/gn/sksl_tests.gni @@ -202,28 +202,28 @@ sksl_error_tests = [ "/sksl/errors/ReturnFromVoid.rts", "/sksl/errors/ReturnMissingValue.rts", "/sksl/errors/ReturnTypeMismatch.rts", - "/sksl/errors/SelfReferentialInitializerExpression.sksl", - "/sksl/errors/SpuriousFloat.sksl", + "/sksl/errors/SelfReferentialInitializerExpression.rts", + "/sksl/errors/SpuriousFloat.rts", "/sksl/errors/StaticIfTest.sksl", "/sksl/errors/StaticSwitchConditionalBreak.sksl", "/sksl/errors/StaticSwitchTest.sksl", "/sksl/errors/StaticSwitchWithConditionalBreak.sksl", "/sksl/errors/StaticSwitchWithConditionalContinue.sksl", "/sksl/errors/StaticSwitchWithConditionalReturn.sksl", - "/sksl/errors/StructMemberReservedName.sksl", - "/sksl/errors/StructNameWithoutIdentifier.sksl", - "/sksl/errors/StructTooDeeplyNested.sksl", - "/sksl/errors/StructVariableReservedName.sksl", - "/sksl/errors/SwitchDuplicateCase.sksl", - "/sksl/errors/SwitchDuplicateDefault.sksl", - "/sksl/errors/SwitchTypes.sksl", + "/sksl/errors/StructMemberReservedName.rts", + "/sksl/errors/StructNameWithoutIdentifier.rts", + "/sksl/errors/StructTooDeeplyNested.rts", + "/sksl/errors/StructVariableReservedName.rts", + "/sksl/errors/SwitchDuplicateCase.rts", + "/sksl/errors/SwitchDuplicateDefault.rts", + "/sksl/errors/SwitchTypes.rts", "/sksl/errors/SwitchWithContinueInside.sksl", - "/sksl/errors/SwizzleConstantOutput.sksl", - "/sksl/errors/SwizzleDomain.sksl", - "/sksl/errors/SwizzleMatrix.sksl", - "/sksl/errors/SwizzleOnlyLiterals.sksl", - "/sksl/errors/SwizzleOutOfBounds.sksl", - "/sksl/errors/SwizzleTooManyComponents.sksl", + "/sksl/errors/SwizzleConstantOutput.rts", + "/sksl/errors/SwizzleDomain.rts", + "/sksl/errors/SwizzleMatrix.rts", + "/sksl/errors/SwizzleOnlyLiterals.rts", + "/sksl/errors/SwizzleOutOfBounds.rts", + "/sksl/errors/SwizzleTooManyComponents.rts", "/sksl/errors/TernaryMismatch.sksl", "/sksl/errors/UnassignedOutParameter.sksl", "/sksl/errors/UndeclaredFunction.sksl", diff --git a/resources/sksl/errors/SelfReferentialInitializerExpression.sksl b/resources/sksl/errors/SelfReferentialInitializerExpression.rts index 0fec0a009a..cd6d574fcf 100644 --- a/resources/sksl/errors/SelfReferentialInitializerExpression.sksl +++ b/resources/sksl/errors/SelfReferentialInitializerExpression.rts @@ -1,5 +1,5 @@ float foo(float v) { return v; } -void main() { float x = foo(x); } +void func() { float x = foo(x); } /*%%* unknown identifier 'x' diff --git a/resources/sksl/errors/SpuriousFloat.sksl b/resources/sksl/errors/SpuriousFloat.rts index 488ec76b37..625cbbc772 100644 --- a/resources/sksl/errors/SpuriousFloat.sksl +++ b/resources/sksl/errors/SpuriousFloat.rts @@ -1,4 +1,4 @@ -void main() { +void func() { float x; x = 1.5 2.5; } diff --git a/resources/sksl/errors/StructMemberReservedName.sksl b/resources/sksl/errors/StructMemberReservedName.rts index 030d05f80d..76dc6eb404 100644 --- a/resources/sksl/errors/StructMemberReservedName.sksl +++ b/resources/sksl/errors/StructMemberReservedName.rts @@ -2,7 +2,7 @@ struct S { float float; } s; -float4 main() { +float4 func() { return s.float.xxxx; } diff --git a/resources/sksl/errors/StructNameWithoutIdentifier.sksl b/resources/sksl/errors/StructNameWithoutIdentifier.rts index f0c94f2762..f0c94f2762 100644 --- a/resources/sksl/errors/StructNameWithoutIdentifier.sksl +++ b/resources/sksl/errors/StructNameWithoutIdentifier.rts diff --git a/resources/sksl/errors/StructTooDeeplyNested.sksl b/resources/sksl/errors/StructTooDeeplyNested.rts index 72221b202e..72221b202e 100644 --- a/resources/sksl/errors/StructTooDeeplyNested.sksl +++ b/resources/sksl/errors/StructTooDeeplyNested.rts diff --git a/resources/sksl/errors/StructVariableReservedName.sksl b/resources/sksl/errors/StructVariableReservedName.rts index 2dd206e691..2dd206e691 100644 --- a/resources/sksl/errors/StructVariableReservedName.sksl +++ b/resources/sksl/errors/StructVariableReservedName.rts diff --git a/resources/sksl/errors/SwitchDuplicateCase.sksl b/resources/sksl/errors/SwitchDuplicateCase.rts index 30be7cd063..3338d5962d 100644 --- a/resources/sksl/errors/SwitchDuplicateCase.sksl +++ b/resources/sksl/errors/SwitchDuplicateCase.rts @@ -1,4 +1,4 @@ -void main() { +void func() { switch (1) { case 0: case 1: diff --git a/resources/sksl/errors/SwitchDuplicateDefault.sksl b/resources/sksl/errors/SwitchDuplicateDefault.rts index c18a033c2f..d557fbd9ff 100644 --- a/resources/sksl/errors/SwitchDuplicateDefault.sksl +++ b/resources/sksl/errors/SwitchDuplicateDefault.rts @@ -1,4 +1,4 @@ -void main() { +void func() { switch (1) { default: default: diff --git a/resources/sksl/errors/SwitchTypes.sksl b/resources/sksl/errors/SwitchTypes.rts index d0f182b76c..d0f182b76c 100644 --- a/resources/sksl/errors/SwitchTypes.sksl +++ b/resources/sksl/errors/SwitchTypes.rts diff --git a/resources/sksl/errors/SwizzleConstantOutput.sksl b/resources/sksl/errors/SwizzleConstantOutput.rts index d9d31fffcb..9304c98ac1 100644 --- a/resources/sksl/errors/SwizzleConstantOutput.sksl +++ b/resources/sksl/errors/SwizzleConstantOutput.rts @@ -1,4 +1,4 @@ -void main() { +void func() { float4 test = float4(1); test.xyz0 = float4(1); } diff --git a/resources/sksl/errors/SwizzleDomain.sksl b/resources/sksl/errors/SwizzleDomain.rts index 7ce8ec26c9..7ce8ec26c9 100644 --- a/resources/sksl/errors/SwizzleDomain.sksl +++ b/resources/sksl/errors/SwizzleDomain.rts diff --git a/resources/sksl/errors/SwizzleMatrix.sksl b/resources/sksl/errors/SwizzleMatrix.rts index efd90f1f0d..4c6e0d528d 100644 --- a/resources/sksl/errors/SwizzleMatrix.sksl +++ b/resources/sksl/errors/SwizzleMatrix.rts @@ -1,4 +1,4 @@ -void main() { +void func() { float2x2 x = float2x2(1); float y = x.y; } diff --git a/resources/sksl/errors/SwizzleOnlyLiterals.sksl b/resources/sksl/errors/SwizzleOnlyLiterals.rts index 3f82bed5e0..a2bd6d2f26 100644 --- a/resources/sksl/errors/SwizzleOnlyLiterals.sksl +++ b/resources/sksl/errors/SwizzleOnlyLiterals.rts @@ -1,4 +1,4 @@ -void main() { float x = 1.0; x = x.0; } +void func() { float x = 1.0; x = x.0; } /*%%* swizzle must refer to base expression diff --git a/resources/sksl/errors/SwizzleOutOfBounds.rts b/resources/sksl/errors/SwizzleOutOfBounds.rts new file mode 100644 index 0000000000..2d26c1e82f --- /dev/null +++ b/resources/sksl/errors/SwizzleOutOfBounds.rts @@ -0,0 +1,5 @@ +void func() { float3 test = float2(1).xyz; } + +/*%%* +invalid swizzle component 'z' +*%%*/ diff --git a/resources/sksl/errors/SwizzleOutOfBounds.sksl b/resources/sksl/errors/SwizzleOutOfBounds.sksl deleted file mode 100644 index c21e992191..0000000000 --- a/resources/sksl/errors/SwizzleOutOfBounds.sksl +++ /dev/null @@ -1,5 +0,0 @@ -void main() { float3 test = float2(1).xyz; } - -/*%%* -invalid swizzle component 'z' -*%%*/ diff --git a/resources/sksl/errors/SwizzleTooManyComponents.sksl b/resources/sksl/errors/SwizzleTooManyComponents.rts index f5f1cad3f0..b7991b46e9 100644 --- a/resources/sksl/errors/SwizzleTooManyComponents.sksl +++ b/resources/sksl/errors/SwizzleTooManyComponents.rts @@ -1,4 +1,4 @@ -void main() { float4 test = float2(1).xxxxx; } +void func() { float4 test = float2(1).xxxxx; } /*%%* too many components in swizzle mask |