diff options
author | John Stiles <johnstiles@google.com> | 2022-03-22 09:23:32 -0400 |
---|---|---|
committer | SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> | 2022-03-24 02:09:39 +0000 |
commit | a410a95abfd11fe9578ffa3441519e860f28d761 (patch) | |
tree | 1300a453891f6afed7ac53ac898c5c384d82f5c5 | |
parent | a7bf23d17e39895bad0fa690c4ac464e1cb84513 (diff) | |
download | skia-a410a95abfd11fe9578ffa3441519e860f28d761.tar.gz |
Rename ES2 error tests 'O' through 'P' to .rts.
A few tests were divided into a Runtime Effect-compatible .rts test, and
a Runtime Effect-incompatible .sksl test.
Bug: skia:13042
Reviewed-by: Arman Uguray <armansito@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>
Change-Id: I1e30d6b1af02437f1d1c15c2a043b81bc08a6df4
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/524100
Reviewed-by: Derek Sollenberger <djsollen@google.com>
19 files changed, 61 insertions, 56 deletions
diff --git a/gn/sksl_tests.gni b/gn/sksl_tests.gni index 70ca5df716..7cde96e444 100644 --- a/gn/sksl_tests.gni +++ b/gn/sksl_tests.gni @@ -66,6 +66,7 @@ sksl_error_tests = [ "/sksl/errors/IncompleteExpression.rts", "/sksl/errors/IncompleteFunctionCall.rts", "/sksl/errors/InterfaceBlockMemberReservedName.sksl", + "/sksl/errors/InterfaceBlockPrivateType.sksl", "/sksl/errors/InterfaceBlockReservedName.sksl", "/sksl/errors/InterfaceBlockScope.sksl", "/sksl/errors/InterfaceBlockStorageModifiers.sksl", @@ -98,7 +99,7 @@ sksl_error_tests = [ "/sksl/errors/OpaqueTypeInArray.sksl", "/sksl/errors/OpaqueTypeInInterfaceBlock.sksl", "/sksl/errors/OpaqueTypeInStruct.sksl", - "/sksl/errors/OpenArray.sksl", + "/sksl/errors/OpenArray.rts", "/sksl/errors/Ossfuzz26700.sksl", "/sksl/errors/Ossfuzz27614.sksl", "/sksl/errors/Ossfuzz27650.sksl", @@ -134,18 +135,19 @@ sksl_error_tests = [ "/sksl/errors/Ossfuzz44559.sksl", "/sksl/errors/Ossfuzz44561.sksl", "/sksl/errors/Ossfuzz44565.sksl", - "/sksl/errors/OverflowFloatLiteral.sksl", + "/sksl/errors/OverflowFloatLiteral.rts", "/sksl/errors/OverflowInlinedLiteral.sksl", - "/sksl/errors/OverflowIntLiteral.sksl", - "/sksl/errors/OverflowInt64Literal.sksl", - "/sksl/errors/OverflowParamArraySize.sksl", + "/sksl/errors/OverflowInt64Literal.rts", + "/sksl/errors/OverflowIntLiteral.rts", + "/sksl/errors/OverflowParamArraySize.rts", + "/sksl/errors/OverflowShortLiteral.sksl", "/sksl/errors/OverflowUintLiteral.sksl", "/sksl/errors/PrecisionQualifiersDisallowed.sksl", - "/sksl/errors/ProgramTooLarge_Globals.sksl", - "/sksl/errors/ProgramTooLarge_Stack.sksl", - "/sksl/errors/PrototypeInFuncBody.sksl", - "/sksl/errors/PrivateTypes.sksl", - "/sksl/errors/PrivateVariables.sksl", + "/sksl/errors/PrivateTypes.rts", + "/sksl/errors/PrivateVariables.rts", + "/sksl/errors/ProgramTooLarge_Globals.rts", + "/sksl/errors/ProgramTooLarge_Stack.rts", + "/sksl/errors/PrototypeInFuncBody.rts", "/sksl/errors/RedeclareBasicType.sksl", "/sksl/errors/RedeclareSamplerType.sksl", "/sksl/errors/RedeclareStruct.sksl", diff --git a/resources/sksl/errors/InterfaceBlockPrivateType.sksl b/resources/sksl/errors/InterfaceBlockPrivateType.sksl new file mode 100644 index 0000000000..892a947873 --- /dev/null +++ b/resources/sksl/errors/InterfaceBlockPrivateType.sksl @@ -0,0 +1,7 @@ +InterfaceBlock { + $mat g; +}; + +/*%%* +type '$mat' is private +*%%*/ diff --git a/resources/sksl/errors/OpenArray.rts b/resources/sksl/errors/OpenArray.rts new file mode 100644 index 0000000000..11c2c8804e --- /dev/null +++ b/resources/sksl/errors/OpenArray.rts @@ -0,0 +1,7 @@ +half4 main(float2 coords) { + coords.r[ = ( coords.g ); +} + +/*%%* +expected expression, but found '=' +*%%*/ diff --git a/resources/sksl/errors/OpenArray.sksl b/resources/sksl/errors/OpenArray.sksl deleted file mode 100644 index 63de3bb43d..0000000000 --- a/resources/sksl/errors/OpenArray.sksl +++ /dev/null @@ -1,9 +0,0 @@ -void main(inout float4 color) { - color.r[ = ( color.g ); -} - -/*%%* -shader 'main' must be main() or main(float2) -unknown identifier 'color' -expected expression, but found '=' -*%%*/ diff --git a/resources/sksl/errors/OverflowFloatLiteral.sksl b/resources/sksl/errors/OverflowFloatLiteral.rts index 3015135ffa..2d4571f4d4 100644 --- a/resources/sksl/errors/OverflowFloatLiteral.sksl +++ b/resources/sksl/errors/OverflowFloatLiteral.rts @@ -1,5 +1,5 @@ -void main() { - sk_FragColor = half4(3.41e+38); +void func() { + float x = 3.41e+38; } /*%%* diff --git a/resources/sksl/errors/OverflowInt64Literal.sksl b/resources/sksl/errors/OverflowInt64Literal.rts index d6a695b176..d6a695b176 100644 --- a/resources/sksl/errors/OverflowInt64Literal.sksl +++ b/resources/sksl/errors/OverflowInt64Literal.rts diff --git a/resources/sksl/errors/OverflowIntLiteral.sksl b/resources/sksl/errors/OverflowIntLiteral.rts index ba27e6056b..d8a99a0a2a 100644 --- a/resources/sksl/errors/OverflowIntLiteral.sksl +++ b/resources/sksl/errors/OverflowIntLiteral.rts @@ -1,21 +1,11 @@ -// Expect 6 errors - const int intMin = -2147483648; const int intMinMinusOne = -2147483649; // error const int intMax = 2147483647; const int intMaxPlusOne = 2147483648; // error - -short4 s4_neg = short4(-32766, -32767, -32769, -32768); // error -32769 -short4 s4_pos = short4(32765, 32768, 32766, 32767); // error 32768 - int cast_int = int(2147483648.); // error -short cast_short = short(32768.); // error /*%%* integer is out of range for type 'int': -2147483649 integer is out of range for type 'int': 2147483648 -integer is out of range for type 'short': -32769 -integer is out of range for type 'short': 32768 integer is out of range for type 'int': 2147483648 -integer is out of range for type 'short': 32768 *%%*/ diff --git a/resources/sksl/errors/OverflowParamArraySize.sksl b/resources/sksl/errors/OverflowParamArraySize.rts index 4927cedcaf..4927cedcaf 100644 --- a/resources/sksl/errors/OverflowParamArraySize.sksl +++ b/resources/sksl/errors/OverflowParamArraySize.rts diff --git a/resources/sksl/errors/OverflowShortLiteral.sksl b/resources/sksl/errors/OverflowShortLiteral.sksl new file mode 100644 index 0000000000..159e4d241e --- /dev/null +++ b/resources/sksl/errors/OverflowShortLiteral.sksl @@ -0,0 +1,9 @@ +short4 s4_neg = short4(-32766, -32767, -32769, -32768); // error -32769 +short4 s4_pos = short4(32765, 32768, 32766, 32767); // error 32768 +short cast_short = short(32768.); // error + +/*%%* +integer is out of range for type 'short': -32769 +integer is out of range for type 'short': 32768 +integer is out of range for type 'short': 32768 +*%%*/ diff --git a/resources/sksl/errors/PrivateTypes.sksl b/resources/sksl/errors/PrivateTypes.rts index 93a35d7e13..ed6275e9b1 100644 --- a/resources/sksl/errors/PrivateTypes.sksl +++ b/resources/sksl/errors/PrivateTypes.rts @@ -1,7 +1,3 @@ -InterfaceBlock { - $mat g; -}; - struct S { $bvec bv; }; @@ -12,7 +8,6 @@ void ctor_mat_private() { $mat(0); } void ctor_literal_private() { $floatLiteral(0); } /*%%* -type '$mat' is private type '$bvec' is private type '$ivec' is private type '$genType' is private diff --git a/resources/sksl/errors/PrivateVariables.sksl b/resources/sksl/errors/PrivateVariables.rts index 00bd28b875..0c9b17611b 100644 --- a/resources/sksl/errors/PrivateVariables.sksl +++ b/resources/sksl/errors/PrivateVariables.rts @@ -1,5 +1,5 @@ int $a; -void main(float2 $b) { +void func(float2 $b) { float $c[2]; bool4 $d; } diff --git a/resources/sksl/errors/ProgramTooLarge_Globals.sksl b/resources/sksl/errors/ProgramTooLarge_Globals.rts index af0ad17ce7..af0ad17ce7 100644 --- a/resources/sksl/errors/ProgramTooLarge_Globals.sksl +++ b/resources/sksl/errors/ProgramTooLarge_Globals.rts diff --git a/resources/sksl/errors/ProgramTooLarge_Stack.sksl b/resources/sksl/errors/ProgramTooLarge_Stack.rts index 127f0564e0..4f004368a1 100644 --- a/resources/sksl/errors/ProgramTooLarge_Stack.sksl +++ b/resources/sksl/errors/ProgramTooLarge_Stack.rts @@ -5,7 +5,7 @@ struct S { half h; }; -void main() { +void func() { int small; S big_chungus; S no_report; // we don't need to report overflows past the first diff --git a/resources/sksl/errors/PrototypeInFuncBody.sksl b/resources/sksl/errors/PrototypeInFuncBody.rts index b440ad2a2a..6d58b3399e 100644 --- a/resources/sksl/errors/PrototypeInFuncBody.sksl +++ b/resources/sksl/errors/PrototypeInFuncBody.rts @@ -1,4 +1,4 @@ -void main() { +void func() { float x(); } diff --git a/tests/sksl/errors/InterfaceBlockPrivateType.glsl b/tests/sksl/errors/InterfaceBlockPrivateType.glsl new file mode 100644 index 0000000000..42f155d8d3 --- /dev/null +++ b/tests/sksl/errors/InterfaceBlockPrivateType.glsl @@ -0,0 +1,4 @@ +### Compilation failed: + +error: 2: type '$mat' is private +1 error diff --git a/tests/sksl/errors/OpenArray.glsl b/tests/sksl/errors/OpenArray.glsl index 5f76399fe3..ed872172a4 100644 --- a/tests/sksl/errors/OpenArray.glsl +++ b/tests/sksl/errors/OpenArray.glsl @@ -1,6 +1,4 @@ ### Compilation failed: -error: 1: shader 'main' must be main() or main(float2) -error: 2: unknown identifier 'color' error: 2: expected expression, but found '=' -3 errors +1 error diff --git a/tests/sksl/errors/OverflowIntLiteral.glsl b/tests/sksl/errors/OverflowIntLiteral.glsl index 5ac95193da..f951a3db45 100644 --- a/tests/sksl/errors/OverflowIntLiteral.glsl +++ b/tests/sksl/errors/OverflowIntLiteral.glsl @@ -1,9 +1,6 @@ ### Compilation failed: -error: 4: integer is out of range for type 'int': -2147483649 -error: 6: integer is out of range for type 'int': 2147483648 -error: 8: integer is out of range for type 'short': -32769 -error: 9: integer is out of range for type 'short': 32768 -error: 11: integer is out of range for type 'int': 2147483648 -error: 12: integer is out of range for type 'short': 32768 -6 errors +error: 2: integer is out of range for type 'int': -2147483649 +error: 4: integer is out of range for type 'int': 2147483648 +error: 5: integer is out of range for type 'int': 2147483648 +3 errors diff --git a/tests/sksl/errors/OverflowShortLiteral.glsl b/tests/sksl/errors/OverflowShortLiteral.glsl new file mode 100644 index 0000000000..0d2bf1858e --- /dev/null +++ b/tests/sksl/errors/OverflowShortLiteral.glsl @@ -0,0 +1,6 @@ +### Compilation failed: + +error: 1: integer is out of range for type 'short': -32769 +error: 2: integer is out of range for type 'short': 32768 +error: 3: integer is out of range for type 'short': 32768 +3 errors diff --git a/tests/sksl/errors/PrivateTypes.glsl b/tests/sksl/errors/PrivateTypes.glsl index dbb53e36bb..a7b9da57bc 100644 --- a/tests/sksl/errors/PrivateTypes.glsl +++ b/tests/sksl/errors/PrivateTypes.glsl @@ -1,9 +1,8 @@ ### Compilation failed: -error: 2: type '$mat' is private -error: 6: type '$bvec' is private -error: 9: type '$ivec' is private -error: 10: type '$genType' is private -error: 11: type '$mat' is private -error: 12: type '$floatLiteral' is private -6 errors +error: 2: type '$bvec' is private +error: 5: type '$ivec' is private +error: 6: type '$genType' is private +error: 7: type '$mat' is private +error: 8: type '$floatLiteral' is private +5 errors |