Rename ES2 error tests starting with 'R' to .rts.

Bug: skia:13042
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>
Change-Id: I3aa94f20ec78a76ab11dde436baeb8ca4c3fff3b
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/524101
Reviewed-by: Derek Sollenberger <djsollen@google.com>

57 files changed, 70 insertions, 60 deletions

diff --git a/gn/sksl_tests.gni b/gn/sksl_tests.gni
index 7cde96e444..2863885adb 100644
--- a/gn/sksl_tests.gni
+++ b/gn/sksl_tests.gni
@@ -148,59 +148,60 @@ sksl_error_tests = [
   "/sksl/errors/ProgramTooLarge_Globals.rts",
   "/sksl/errors/ProgramTooLarge_Stack.rts",
   "/sksl/errors/PrototypeInFuncBody.rts",
-  "/sksl/errors/RedeclareBasicType.sksl",
+  "/sksl/errors/RedeclareBasicType.rts",
   "/sksl/errors/RedeclareSamplerType.sksl",
-  "/sksl/errors/RedeclareStruct.sksl",
-  "/sksl/errors/RedeclareStructTypeWithName.sksl",
-  "/sksl/errors/RedeclareUserType.sksl",
-  "/sksl/errors/RedeclareVariable.sksl",
-  "/sksl/errors/ReservedNameAsm.sksl",
-  "/sksl/errors/ReservedNameAttribute.sksl",
-  "/sksl/errors/ReservedNameCast.sksl",
-  "/sksl/errors/ReservedNameDouble.sksl",
-  "/sksl/errors/ReservedNameDvec2.sksl",
-  "/sksl/errors/ReservedNameDvec3.sksl",
-  "/sksl/errors/ReservedNameDvec4.sksl",
-  "/sksl/errors/ReservedNameEnum.sksl",
-  "/sksl/errors/ReservedNameExtern.sksl",
-  "/sksl/errors/ReservedNameExternal.sksl",
-  "/sksl/errors/ReservedNameFixed.sksl",
-  "/sksl/errors/ReservedNameFvec2.sksl",
-  "/sksl/errors/ReservedNameFvec3.sksl",
-  "/sksl/errors/ReservedNameFvec4.sksl",
-  "/sksl/errors/ReservedNameGoto.sksl",
-  "/sksl/errors/ReservedNameHvec2.sksl",
-  "/sksl/errors/ReservedNameHvec3.sksl",
-  "/sksl/errors/ReservedNameHvec4.sksl",
-  "/sksl/errors/ReservedNameInput.sksl",
-  "/sksl/errors/ReservedNameInterface.sksl",
-  "/sksl/errors/ReservedNameInvariant.sksl",
-  "/sksl/errors/ReservedNameLong.sksl",
-  "/sksl/errors/ReservedNameNamespace.sksl",
-  "/sksl/errors/ReservedNameOutput.sksl",
-  "/sksl/errors/ReservedNamePacked.sksl",
-  "/sksl/errors/ReservedNamePrecision.sksl",
-  "/sksl/errors/ReservedNamePublic.sksl",
-  "/sksl/errors/ReservedNameSampler1DShadow.sksl",
-  "/sksl/errors/ReservedNameSampler2DRectShadow.sksl",
-  "/sksl/errors/ReservedNameSampler2DShadow.sksl",
-  "/sksl/errors/ReservedNameSampler3DRect.sksl",
-  "/sksl/errors/ReservedNameSamplerCube.sksl",
-  "/sksl/errors/ReservedNameSizeof.sksl",
-  "/sksl/errors/ReservedNameStatic.sksl",
-  "/sksl/errors/ReservedNameSuperp.sksl",
-  "/sksl/errors/ReservedNameTemplate.sksl",
-  "/sksl/errors/ReservedNameThis.sksl",
-  "/sksl/errors/ReservedNameTypedef.sksl",
-  "/sksl/errors/ReservedNameUnion.sksl",
-  "/sksl/errors/ReservedNameUnsigned.sksl",
-  "/sksl/errors/ReservedNameUsing.sksl",
-  "/sksl/errors/ReservedNameVarying.sksl",
-  "/sksl/errors/ReservedNameVolatile.sksl",
-  "/sksl/errors/ReturnDifferentType.sksl",
-  "/sksl/errors/ReturnFromVoid.sksl",
-  "/sksl/errors/ReturnMissingValue.sksl",
-  "/sksl/errors/ReturnTypeMismatch.sksl",
+  "/sksl/errors/RedeclareShaderType.rts",
+  "/sksl/errors/RedeclareStruct.rts",
+  "/sksl/errors/RedeclareStructTypeWithName.rts",
+  "/sksl/errors/RedeclareUserType.rts",
+  "/sksl/errors/RedeclareVariable.rts",
+  "/sksl/errors/ReservedNameAsm.rts",
+  "/sksl/errors/ReservedNameAttribute.rts",
+  "/sksl/errors/ReservedNameCast.rts",
+  "/sksl/errors/ReservedNameDouble.rts",
+  "/sksl/errors/ReservedNameDvec2.rts",
+  "/sksl/errors/ReservedNameDvec3.rts",
+  "/sksl/errors/ReservedNameDvec4.rts",
+  "/sksl/errors/ReservedNameEnum.rts",
+  "/sksl/errors/ReservedNameExtern.rts",
+  "/sksl/errors/ReservedNameExternal.rts",
+  "/sksl/errors/ReservedNameFixed.rts",
+  "/sksl/errors/ReservedNameFvec2.rts",
+  "/sksl/errors/ReservedNameFvec3.rts",
+  "/sksl/errors/ReservedNameFvec4.rts",
+  "/sksl/errors/ReservedNameGoto.rts",
+  "/sksl/errors/ReservedNameHvec2.rts",
+  "/sksl/errors/ReservedNameHvec3.rts",
+  "/sksl/errors/ReservedNameHvec4.rts",
+  "/sksl/errors/ReservedNameInput.rts",
+  "/sksl/errors/ReservedNameInterface.rts",
+  "/sksl/errors/ReservedNameInvariant.rts",
+  "/sksl/errors/ReservedNameLong.rts",
+  "/sksl/errors/ReservedNameNamespace.rts",
+  "/sksl/errors/ReservedNameOutput.rts",
+  "/sksl/errors/ReservedNamePacked.rts",
+  "/sksl/errors/ReservedNamePrecision.rts",
+  "/sksl/errors/ReservedNamePublic.rts",
+  "/sksl/errors/ReservedNameSampler1DShadow.rts",
+  "/sksl/errors/ReservedNameSampler2DRectShadow.rts",
+  "/sksl/errors/ReservedNameSampler2DShadow.rts",
+  "/sksl/errors/ReservedNameSampler3DRect.rts",
+  "/sksl/errors/ReservedNameSamplerCube.rts",
+  "/sksl/errors/ReservedNameSizeof.rts",
+  "/sksl/errors/ReservedNameStatic.rts",
+  "/sksl/errors/ReservedNameSuperp.rts",
+  "/sksl/errors/ReservedNameTemplate.rts",
+  "/sksl/errors/ReservedNameThis.rts",
+  "/sksl/errors/ReservedNameTypedef.rts",
+  "/sksl/errors/ReservedNameUnion.rts",
+  "/sksl/errors/ReservedNameUnsigned.rts",
+  "/sksl/errors/ReservedNameUsing.rts",
+  "/sksl/errors/ReservedNameVarying.rts",
+  "/sksl/errors/ReservedNameVolatile.rts",
+  "/sksl/errors/ReturnDifferentType.rts",
+  "/sksl/errors/ReturnFromVoid.rts",
+  "/sksl/errors/ReturnMissingValue.rts",
+  "/sksl/errors/ReturnTypeMismatch.rts",
   "/sksl/errors/SelfReferentialInitializerExpression.sksl",
   "/sksl/errors/SpuriousFloat.sksl",
   "/sksl/errors/StaticIfTest.sksl",
diff --git a/resources/sksl/errors/RedeclareBasicType.sksl b/resources/sksl/errors/RedeclareBasicType.rts
index a0945520fd..a0945520fd 100644
--- a/resources/sksl/errors/RedeclareBasicType.sksl
+++ b/resources/sksl/errors/RedeclareBasicType.rts
diff --git a/resources/sksl/errors/RedeclareShaderType.rts b/resources/sksl/errors/RedeclareShaderType.rts
new file mode 100644
index 0000000000..76d006b0cb
--- /dev/null
+++ b/resources/sksl/errors/RedeclareShaderType.rts
@@ -0,0 +1,5 @@
+uniform shader shader;
+
+/*%%*
+expected an identifier, but found type 'shader'
+*%%*/
diff --git a/resources/sksl/errors/RedeclareStruct.sksl b/resources/sksl/errors/RedeclareStruct.rts
index f4704e91e6..f4704e91e6 100644
--- a/resources/sksl/errors/RedeclareStruct.sksl
+++ b/resources/sksl/errors/RedeclareStruct.rts
diff --git a/resources/sksl/errors/RedeclareStructTypeWithName.sksl b/resources/sksl/errors/RedeclareStructTypeWithName.rts
index ef911dd4da..ef911dd4da 100644
--- a/resources/sksl/errors/RedeclareStructTypeWithName.sksl
+++ b/resources/sksl/errors/RedeclareStructTypeWithName.rts
diff --git a/resources/sksl/errors/RedeclareUserType.sksl b/resources/sksl/errors/RedeclareUserType.rts
index d131fb4efc..d131fb4efc 100644
--- a/resources/sksl/errors/RedeclareUserType.sksl
+++ b/resources/sksl/errors/RedeclareUserType.rts
diff --git a/resources/sksl/errors/RedeclareVariable.sksl b/resources/sksl/errors/RedeclareVariable.rts
index e5ef434b55..0160aa9b6a 100644
--- a/resources/sksl/errors/RedeclareVariable.sksl
+++ b/resources/sksl/errors/RedeclareVariable.rts
@@ -6,7 +6,7 @@ float4x4 x;
 bool2 x[2];
 S x;
 
-void main() {
+void func() {
     float2 y;
     float2 y;
     int y;
diff --git a/resources/sksl/errors/ReservedNameAsm.sksl b/resources/sksl/errors/ReservedNameAsm.rts
index fe198942e7..fe198942e7 100644
--- a/resources/sksl/errors/ReservedNameAsm.sksl
+++ b/resources/sksl/errors/ReservedNameAsm.rts
diff --git a/resources/sksl/errors/ReservedNameAttribute.sksl b/resources/sksl/errors/ReservedNameAttribute.rts
index 6e5dadda64..6e5dadda64 100644
--- a/resources/sksl/errors/ReservedNameAttribute.sksl
+++ b/resources/sksl/errors/ReservedNameAttribute.rts
diff --git a/resources/sksl/errors/ReservedNameCast.sksl b/resources/sksl/errors/ReservedNameCast.rts
index de6663344d..de6663344d 100644
--- a/resources/sksl/errors/ReservedNameCast.sksl
+++ b/resources/sksl/errors/ReservedNameCast.rts
diff --git a/resources/sksl/errors/ReservedNameDouble.sksl b/resources/sksl/errors/ReservedNameDouble.rts
index 1d65060c30..1d65060c30 100644
--- a/resources/sksl/errors/ReservedNameDouble.sksl
+++ b/resources/sksl/errors/ReservedNameDouble.rts
diff --git a/resources/sksl/errors/ReservedNameDvec2.sksl b/resources/sksl/errors/ReservedNameDvec2.rts
index 3ba0c4fbe1..3ba0c4fbe1 100644
--- a/resources/sksl/errors/ReservedNameDvec2.sksl
+++ b/resources/sksl/errors/ReservedNameDvec2.rts
diff --git a/resources/sksl/errors/ReservedNameDvec3.sksl b/resources/sksl/errors/ReservedNameDvec3.rts
index 0e2e3ffa83..0e2e3ffa83 100644
--- a/resources/sksl/errors/ReservedNameDvec3.sksl
+++ b/resources/sksl/errors/ReservedNameDvec3.rts
diff --git a/resources/sksl/errors/ReservedNameDvec4.sksl b/resources/sksl/errors/ReservedNameDvec4.rts
index 2090c5648f..2090c5648f 100644
--- a/resources/sksl/errors/ReservedNameDvec4.sksl
+++ b/resources/sksl/errors/ReservedNameDvec4.rts
diff --git a/resources/sksl/errors/ReservedNameEnum.sksl b/resources/sksl/errors/ReservedNameEnum.rts
index 98cca13d60..98cca13d60 100644
--- a/resources/sksl/errors/ReservedNameEnum.sksl
+++ b/resources/sksl/errors/ReservedNameEnum.rts
diff --git a/resources/sksl/errors/ReservedNameExtern.sksl b/resources/sksl/errors/ReservedNameExtern.rts
index c06581c7bd..c06581c7bd 100644
--- a/resources/sksl/errors/ReservedNameExtern.sksl
+++ b/resources/sksl/errors/ReservedNameExtern.rts
diff --git a/resources/sksl/errors/ReservedNameExternal.sksl b/resources/sksl/errors/ReservedNameExternal.rts
index d18c27ea34..d18c27ea34 100644
--- a/resources/sksl/errors/ReservedNameExternal.sksl
+++ b/resources/sksl/errors/ReservedNameExternal.rts
diff --git a/resources/sksl/errors/ReservedNameFixed.sksl b/resources/sksl/errors/ReservedNameFixed.rts
index 693bbe0278..693bbe0278 100644
--- a/resources/sksl/errors/ReservedNameFixed.sksl
+++ b/resources/sksl/errors/ReservedNameFixed.rts
diff --git a/resources/sksl/errors/ReservedNameFvec2.sksl b/resources/sksl/errors/ReservedNameFvec2.rts
index a1c7a5e099..a1c7a5e099 100644
--- a/resources/sksl/errors/ReservedNameFvec2.sksl
+++ b/resources/sksl/errors/ReservedNameFvec2.rts
diff --git a/resources/sksl/errors/ReservedNameFvec3.sksl b/resources/sksl/errors/ReservedNameFvec3.rts
index c220eba9b2..c220eba9b2 100644
--- a/resources/sksl/errors/ReservedNameFvec3.sksl
+++ b/resources/sksl/errors/ReservedNameFvec3.rts
diff --git a/resources/sksl/errors/ReservedNameFvec4.sksl b/resources/sksl/errors/ReservedNameFvec4.rts
index 2fe2c47fcf..2fe2c47fcf 100644
--- a/resources/sksl/errors/ReservedNameFvec4.sksl
+++ b/resources/sksl/errors/ReservedNameFvec4.rts
diff --git a/resources/sksl/errors/ReservedNameGoto.sksl b/resources/sksl/errors/ReservedNameGoto.rts
index a14eac4bed..a14eac4bed 100644
--- a/resources/sksl/errors/ReservedNameGoto.sksl
+++ b/resources/sksl/errors/ReservedNameGoto.rts
diff --git a/resources/sksl/errors/ReservedNameHvec2.sksl b/resources/sksl/errors/ReservedNameHvec2.rts
index bb8ba502e3..bb8ba502e3 100644
--- a/resources/sksl/errors/ReservedNameHvec2.sksl
+++ b/resources/sksl/errors/ReservedNameHvec2.rts
diff --git a/resources/sksl/errors/ReservedNameHvec3.sksl b/resources/sksl/errors/ReservedNameHvec3.rts
index cd0d12eca3..cd0d12eca3 100644
--- a/resources/sksl/errors/ReservedNameHvec3.sksl
+++ b/resources/sksl/errors/ReservedNameHvec3.rts
diff --git a/resources/sksl/errors/ReservedNameHvec4.sksl b/resources/sksl/errors/ReservedNameHvec4.rts
index cb130111a0..cb130111a0 100644
--- a/resources/sksl/errors/ReservedNameHvec4.sksl
+++ b/resources/sksl/errors/ReservedNameHvec4.rts
diff --git a/resources/sksl/errors/ReservedNameInput.sksl b/resources/sksl/errors/ReservedNameInput.rts
index e2423081e3..e2423081e3 100644
--- a/resources/sksl/errors/ReservedNameInput.sksl
+++ b/resources/sksl/errors/ReservedNameInput.rts
diff --git a/resources/sksl/errors/ReservedNameInterface.sksl b/resources/sksl/errors/ReservedNameInterface.rts
index 3daf3ec8ac..3daf3ec8ac 100644
--- a/resources/sksl/errors/ReservedNameInterface.sksl
+++ b/resources/sksl/errors/ReservedNameInterface.rts
diff --git a/resources/sksl/errors/ReservedNameInvariant.sksl b/resources/sksl/errors/ReservedNameInvariant.rts
index 6eb9edf771..6eb9edf771 100644
--- a/resources/sksl/errors/ReservedNameInvariant.sksl
+++ b/resources/sksl/errors/ReservedNameInvariant.rts
diff --git a/resources/sksl/errors/ReservedNameLong.sksl b/resources/sksl/errors/ReservedNameLong.rts
index cea68b3329..cea68b3329 100644
--- a/resources/sksl/errors/ReservedNameLong.sksl
+++ b/resources/sksl/errors/ReservedNameLong.rts
diff --git a/resources/sksl/errors/ReservedNameNamespace.sksl b/resources/sksl/errors/ReservedNameNamespace.rts
index 14e5dbbfa8..14e5dbbfa8 100644
--- a/resources/sksl/errors/ReservedNameNamespace.sksl
+++ b/resources/sksl/errors/ReservedNameNamespace.rts
diff --git a/resources/sksl/errors/ReservedNameOutput.sksl b/resources/sksl/errors/ReservedNameOutput.rts
index 069d54361c..069d54361c 100644
--- a/resources/sksl/errors/ReservedNameOutput.sksl
+++ b/resources/sksl/errors/ReservedNameOutput.rts
diff --git a/resources/sksl/errors/ReservedNamePacked.sksl b/resources/sksl/errors/ReservedNamePacked.rts
index f1435753cb..f1435753cb 100644
--- a/resources/sksl/errors/ReservedNamePacked.sksl
+++ b/resources/sksl/errors/ReservedNamePacked.rts
diff --git a/resources/sksl/errors/ReservedNamePrecision.sksl b/resources/sksl/errors/ReservedNamePrecision.rts
index 2fe4c28f56..2fe4c28f56 100644
--- a/resources/sksl/errors/ReservedNamePrecision.sksl
+++ b/resources/sksl/errors/ReservedNamePrecision.rts
diff --git a/resources/sksl/errors/ReservedNamePublic.sksl b/resources/sksl/errors/ReservedNamePublic.rts
index fefe192c75..fefe192c75 100644
--- a/resources/sksl/errors/ReservedNamePublic.sksl
+++ b/resources/sksl/errors/ReservedNamePublic.rts
diff --git a/resources/sksl/errors/ReservedNameSampler1DShadow.sksl b/resources/sksl/errors/ReservedNameSampler1DShadow.rts
index 7f48177d65..7f48177d65 100644
--- a/resources/sksl/errors/ReservedNameSampler1DShadow.sksl
+++ b/resources/sksl/errors/ReservedNameSampler1DShadow.rts
diff --git a/resources/sksl/errors/ReservedNameSampler2DRectShadow.sksl b/resources/sksl/errors/ReservedNameSampler2DRectShadow.rts
index f579442ef0..f579442ef0 100644
--- a/resources/sksl/errors/ReservedNameSampler2DRectShadow.sksl
+++ b/resources/sksl/errors/ReservedNameSampler2DRectShadow.rts
diff --git a/resources/sksl/errors/ReservedNameSampler2DShadow.sksl b/resources/sksl/errors/ReservedNameSampler2DShadow.rts
index 1984327df4..1984327df4 100644
--- a/resources/sksl/errors/ReservedNameSampler2DShadow.sksl
+++ b/resources/sksl/errors/ReservedNameSampler2DShadow.rts
diff --git a/resources/sksl/errors/ReservedNameSampler3DRect.sksl b/resources/sksl/errors/ReservedNameSampler3DRect.rts
index 20eb001bbd..20eb001bbd 100644
--- a/resources/sksl/errors/ReservedNameSampler3DRect.sksl
+++ b/resources/sksl/errors/ReservedNameSampler3DRect.rts
diff --git a/resources/sksl/errors/ReservedNameSamplerCube.sksl b/resources/sksl/errors/ReservedNameSamplerCube.rts
index 607a9f9d64..607a9f9d64 100644
--- a/resources/sksl/errors/ReservedNameSamplerCube.sksl
+++ b/resources/sksl/errors/ReservedNameSamplerCube.rts
diff --git a/resources/sksl/errors/ReservedNameSizeof.sksl b/resources/sksl/errors/ReservedNameSizeof.rts
index 9157a959d2..9157a959d2 100644
--- a/resources/sksl/errors/ReservedNameSizeof.sksl
+++ b/resources/sksl/errors/ReservedNameSizeof.rts
diff --git a/resources/sksl/errors/ReservedNameStatic.sksl b/resources/sksl/errors/ReservedNameStatic.rts
index 9668851697..9668851697 100644
--- a/resources/sksl/errors/ReservedNameStatic.sksl
+++ b/resources/sksl/errors/ReservedNameStatic.rts
diff --git a/resources/sksl/errors/ReservedNameSuperp.sksl b/resources/sksl/errors/ReservedNameSuperp.rts
index 9f85eea103..9f85eea103 100644
--- a/resources/sksl/errors/ReservedNameSuperp.sksl
+++ b/resources/sksl/errors/ReservedNameSuperp.rts
diff --git a/resources/sksl/errors/ReservedNameTemplate.sksl b/resources/sksl/errors/ReservedNameTemplate.rts
index 0e3a863d56..0e3a863d56 100644
--- a/resources/sksl/errors/ReservedNameTemplate.sksl
+++ b/resources/sksl/errors/ReservedNameTemplate.rts
diff --git a/resources/sksl/errors/ReservedNameThis.sksl b/resources/sksl/errors/ReservedNameThis.rts
index 4961a7261d..4961a7261d 100644
--- a/resources/sksl/errors/ReservedNameThis.sksl
+++ b/resources/sksl/errors/ReservedNameThis.rts
diff --git a/resources/sksl/errors/ReservedNameTypedef.sksl b/resources/sksl/errors/ReservedNameTypedef.rts
index f373c9de38..f373c9de38 100644
--- a/resources/sksl/errors/ReservedNameTypedef.sksl
+++ b/resources/sksl/errors/ReservedNameTypedef.rts
diff --git a/resources/sksl/errors/ReservedNameUnion.sksl b/resources/sksl/errors/ReservedNameUnion.rts
index 9e4c176c38..9e4c176c38 100644
--- a/resources/sksl/errors/ReservedNameUnion.sksl
+++ b/resources/sksl/errors/ReservedNameUnion.rts
diff --git a/resources/sksl/errors/ReservedNameUnsigned.sksl b/resources/sksl/errors/ReservedNameUnsigned.rts
index f0f9271947..f0f9271947 100644
--- a/resources/sksl/errors/ReservedNameUnsigned.sksl
+++ b/resources/sksl/errors/ReservedNameUnsigned.rts
diff --git a/resources/sksl/errors/ReservedNameUsing.sksl b/resources/sksl/errors/ReservedNameUsing.rts
index bc24629298..bc24629298 100644
--- a/resources/sksl/errors/ReservedNameUsing.sksl
+++ b/resources/sksl/errors/ReservedNameUsing.rts
diff --git a/resources/sksl/errors/ReservedNameVarying.sksl b/resources/sksl/errors/ReservedNameVarying.rts
index 32856f7bdd..32856f7bdd 100644
--- a/resources/sksl/errors/ReservedNameVarying.sksl
+++ b/resources/sksl/errors/ReservedNameVarying.rts
diff --git a/resources/sksl/errors/ReservedNameVolatile.sksl b/resources/sksl/errors/ReservedNameVolatile.rts
index d49e9d1998..d49e9d1998 100644
--- a/resources/sksl/errors/ReservedNameVolatile.sksl
+++ b/resources/sksl/errors/ReservedNameVolatile.rts
diff --git a/resources/sksl/errors/ReturnDifferentType.rts b/resources/sksl/errors/ReturnDifferentType.rts
new file mode 100644
index 0000000000..6650cf2906
--- /dev/null
+++ b/resources/sksl/errors/ReturnDifferentType.rts
@@ -0,0 +1,6 @@
+int func() { return 1; }
+void func() {}
+
+/*%%*
+functions 'void func()' and 'int func()' differ only in return type
+*%%*/
diff --git a/resources/sksl/errors/ReturnDifferentType.sksl b/resources/sksl/errors/ReturnDifferentType.sksl
deleted file mode 100644
index ffd0ed9b13..0000000000
--- a/resources/sksl/errors/ReturnDifferentType.sksl
+++ /dev/null
@@ -1,6 +0,0 @@
-int main() { return 1; }
-void main() {}
-
-/*%%*
-functions 'void main()' and 'int main()' differ only in return type
-*%%*/
diff --git a/resources/sksl/errors/ReturnFromVoid.sksl b/resources/sksl/errors/ReturnFromVoid.rts
index 6ba4a3dd2b..6ba4a3dd2b 100644
--- a/resources/sksl/errors/ReturnFromVoid.sksl
+++ b/resources/sksl/errors/ReturnFromVoid.rts
diff --git a/resources/sksl/errors/ReturnMissingValue.sksl b/resources/sksl/errors/ReturnMissingValue.rts
index 42b03f8375..42b03f8375 100644
--- a/resources/sksl/errors/ReturnMissingValue.sksl
+++ b/resources/sksl/errors/ReturnMissingValue.rts
diff --git a/resources/sksl/errors/ReturnTypeMismatch.sksl b/resources/sksl/errors/ReturnTypeMismatch.rts
index b81f85c06b..b81f85c06b 100644
--- a/resources/sksl/errors/ReturnTypeMismatch.sksl
+++ b/resources/sksl/errors/ReturnTypeMismatch.rts
diff --git a/tests/sksl/errors/RedeclareShaderType.glsl b/tests/sksl/errors/RedeclareShaderType.glsl
new file mode 100644
index 0000000000..826c2bb82d
--- /dev/null
+++ b/tests/sksl/errors/RedeclareShaderType.glsl
@@ -0,0 +1,4 @@
+### Compilation failed:
+
+error: 1: expected an identifier, but found type 'shader'
+1 error
diff --git a/tests/sksl/errors/ReturnDifferentType.glsl b/tests/sksl/errors/ReturnDifferentType.glsl
index f4762b9230..894aea6fcb 100644
--- a/tests/sksl/errors/ReturnDifferentType.glsl
+++ b/tests/sksl/errors/ReturnDifferentType.glsl
@@ -1,4 +1,4 @@
 ### Compilation failed:
 
-error: 2: functions 'void main()' and 'int main()' differ only in return type
+error: 2: functions 'void func()' and 'int func()' differ only in return type
 1 error