Remove sk_ClipDistance.
This was unused and did not work on non-GLSL backends.
Change-Id: I6bd314d43cfefa64871b5c0e964b5ae52e494164
Bug: skia:10757
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/319778
Commit-Queue: John Stiles <johnstiles@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>
Reviewed-by: Chris Dalton <csmartdalton@google.com>
diff --git a/gn/sksl_tests.gni b/gn/sksl_tests.gni
index 61d39ba..e3b75e5 100644
--- a/gn/sksl_tests.gni
+++ b/gn/sksl_tests.gni
@@ -149,8 +149,6 @@
"$_tests/sksl/shared/BoolFolding.sksl",
"$_tests/sksl/shared/Caps.sksl",
"$_tests/sksl/shared/CastsRoundTowardZero.sksl",
- "$_tests/sksl/shared/ClipDistanceFragment.sksl",
- "$_tests/sksl/shared/ClipDistanceVertex.vert",
"$_tests/sksl/shared/Clockwise.sksl",
"$_tests/sksl/shared/ComplexDelete.sksl",
"$_tests/sksl/shared/ConstArray.sksl",
diff --git a/src/sksl/SkSLCompiler.h b/src/sksl/SkSLCompiler.h
index 527484f..00da8db 100644
--- a/src/sksl/SkSLCompiler.h
+++ b/src/sksl/SkSLCompiler.h
@@ -37,7 +37,6 @@
#define SK_SAMPLEMASK_BUILTIN 20
#define SK_VERTEXID_BUILTIN 42
#define SK_INSTANCEID_BUILTIN 43
-#define SK_CLIPDISTANCE_BUILTIN 3
#define SK_INVOCATIONID_BUILTIN 8
#define SK_POSITION_BUILTIN 0
diff --git a/src/sksl/SkSLGLSLCodeGenerator.cpp b/src/sksl/SkSLGLSLCodeGenerator.cpp
index 3d87782..81b9d5b 100644
--- a/src/sksl/SkSLGLSLCodeGenerator.cpp
+++ b/src/sksl/SkSLGLSLCodeGenerator.cpp
@@ -812,9 +812,6 @@
case SK_INSTANCEID_BUILTIN:
this->write("gl_InstanceID");
break;
- case SK_CLIPDISTANCE_BUILTIN:
- this->write("gl_ClipDistance");
- break;
case SK_IN_BUILTIN:
this->write("gl_in");
break;
@@ -846,19 +843,13 @@
this->write(".");
}
const Type& baseType = f.fBase->type();
- switch (baseType.fields()[f.fFieldIndex].fModifiers.fLayout.fBuiltin) {
- case SK_CLIPDISTANCE_BUILTIN:
- this->write("gl_ClipDistance");
- break;
- default:
- StringFragment name = baseType.fields()[f.fFieldIndex].fName;
- if (name == "sk_Position") {
- this->write("gl_Position");
- } else if (name == "sk_PointSize") {
- this->write("gl_PointSize");
- } else {
- this->write(baseType.fields()[f.fFieldIndex].fName);
- }
+ StringFragment name = baseType.fields()[f.fFieldIndex].fName;
+ if (name == "sk_Position") {
+ this->write("gl_Position");
+ } else if (name == "sk_PointSize") {
+ this->write("gl_PointSize");
+ } else {
+ this->write(baseType.fields()[f.fFieldIndex].fName);
}
}
diff --git a/src/sksl/SkSLMetalCodeGenerator.cpp b/src/sksl/SkSLMetalCodeGenerator.cpp
index 652485f..0193471 100644
--- a/src/sksl/SkSLMetalCodeGenerator.cpp
+++ b/src/sksl/SkSLMetalCodeGenerator.cpp
@@ -725,9 +725,6 @@
this->write(".");
}
switch (field->fModifiers.fLayout.fBuiltin) {
- case SK_CLIPDISTANCE_BUILTIN:
- this->write("gl_ClipDistance");
- break;
case SK_POSITION_BUILTIN:
this->write("_out->sk_Position");
break;
diff --git a/src/sksl/generated/sksl_fp.dehydrated.sksl b/src/sksl/generated/sksl_fp.dehydrated.sksl
index 126c137..f6587cc 100644
--- a/src/sksl/generated/sksl_fp.dehydrated.sksl
+++ b/src/sksl/generated/sksl_fp.dehydrated.sksl
@@ -1,2 +1,2 @@
-static constexpr size_t SKSL_INCLUDE_sksl_fp_LENGTH = 1658;
-static uint8_t SKSL_INCLUDE_sksl_fp[1658] = {120,1,14,71,114,67,108,105,112,69,100,103,101,84,121,112,101,12,80,77,67,111,110,118,101,114,115,105,111,110,12,115,107,95,70,114,97,103,67,111,111,114,100,6,102,108,111,97,116,52,5,102,108,111,97,116,15,115,107,95,67,108,105,112,68,105,115,116,97,110,99,101,3,105,110,116,13,115,107,95,83,97,109,112,108,101,77,97,115,107,15,103,108,95,76,97,115,116,70,114,97,103,68,97,116,97,16,103,108,95,76,97,115,116,70,114,97,103,67,111,108,111,114,5,104,97,108,102,52,19,103,108,95,76,97,115,116,70,114,97,103,67,111,108,111,114,65,82,77,24,103,108,95,83,101,99,111,110,100,97,114,121,70,114,97,103,67,111,108,111,114,69,88,84,11,115,107,95,79,117,116,67,111,108,111,114,8,115,107,95,87,105,100,116,104,4,104,97,108,102,9,115,107,95,72,101,105,103,104,116,2,102,112,17,102,114,97,103,109,101,110,116,80,114,111,99,101,115,115,111,114,6,115,97,109,112,108,101,9,116,114,97,110,115,102,111,114,109,8,102,108,111,97,116,51,120,51,6,99,111,111,114,100,115,6,102,108,111,97,116,50,5,105,110,112,117,116,9,116,114,97,110,115,102,114,111,109,7,107,70,105,108,108,66,87,7,107,70,105,108,108,65,65,14,107,73,110,118,101,114,115,101,70,105,108,108,66,87,14,107,73,110,118,101,114,115,101,70,105,108,108,65,65,5,107,76,97,115,116,9,107,84,111,80,114,101,109,117,108,11,107,84,111,85,110,112,114,101,109,117,108,16,107,80,77,67,111,110,118,101,114,115,105,111,110,67,110,116,41,70,0,14,1,0,2,0,14,2,0,17,0,45,3,0,29,5,15,0,2,30,0,42,4,0,43,0,0,0,5,0,42,6,0,50,0,1,45,7,0,29,5,3,0,0,56,0,40,5,0,0,0,8,0,42,9,0,72,0,1,45,10,0,29,5,20,0,4,76,0,40,8,0,0,0,11,0,40,4,0,1,45,12,0,29,5,15,39,0,90,0,40,11,0,0,45,13,0,29,5,15,39,0,106,0,42,14,0,123,0,0,45,15,0,29,5,15,39,0,129,0,40,14,0,0,45,16,0,29,5,15,39,0,149,0,40,14,0,0,45,17,0,29,5,20,39,4,174,0,40,14,0,0,45,18,0,29,5,27,39,0,186,0,42,19,0,195,0,0,45,20,0,29,5,28,39,0,200,0,40,19,0,0,45,21,0,9,210,0,42,22,0,213,0,3,22,23,0,9,231,0,1,21,0,40,14,0,45,24,0,9,210,0,40,22,0,3,45,25,0,9,238,0,42,26,0,248,0,3,44,27,0,2,40,23,0,22,28,0,9,231,0,2,24,0,25,0,40,14,0,40,28,0,45,29,0,9,210,0,40,22,0,3,45,30,0,9,1,1,42,31,0,8,1,3,44,32,0,3,40,23,0,40,28,0,22,33,0,9,231,0,2,29,0,30,0,40,14,0,40,33,0,45,34,0,9,210,0,40,22,0,3,45,35,0,9,15,1,40,14,0,3,44,36,0,4,40,23,0,40,28,0,40,33,0,22,37,0,9,231,0,2,34,0,35,0,40,14,0,40,37,0,45,38,0,9,210,0,40,22,0,3,45,39,0,9,15,1,40,14,0,3,45,40,0,9,238,0,40,26,0,3,44,41,0,5,40,23,0,40,28,0,40,33,0,40,37,0,22,42,0,9,231,0,3,38,0,39,0,40,0,40,14,0,40,42,0,45,43,0,9,210,0,40,22,0,3,45,44,0,9,15,1,40,14,0,3,45,45,0,9,1,1,40,31,0,3,44,46,0,6,40,23,0,40,28,0,40,33,0,40,37,0,40,42,0,22,47,0,9,231,0,3,43,0,44,0,45,0,40,14,0,40,47,0,31,48,0,40,22,0,45,49,0,9,210,0,40,48,0,3,44,50,0,7,40,23,0,40,28,0,40,33,0,40,37,0,40,42,0,40,47,0,22,51,0,9,231,0,1,49,0,40,14,0,40,51,0,31,52,0,40,22,0,45,53,0,9,210,0,40,52,0,3,45,54,0,9,238,0,40,26,0,3,44,55,0,8,40,23,0,40,28,0,40,33,0,40,37,0,40,42,0,40,47,0,40,51,0,22,56,0,9,231,0,2,53,0,54,0,40,14,0,40,56,0,31,57,0,40,22,0,45,58,0,9,210,0,40,57,0,3,45,59,0,9,1,1,40,31,0,3,44,60,0,9,40,23,0,40,28,0,40,33,0,40,37,0,40,42,0,40,47,0,40,51,0,40,56,0,22,61,0,9,231,0,2,58,0,59,0,40,14,0,40,61,0,31,62,0,40,22,0,45,63,0,9,210,0,40,62,0,3,45,64,0,9,15,1,40,14,0,3,44,65,0,10,40,23,0,40,28,0,40,33,0,40,37,0,40,42,0,40,47,0,40,51,0,40,56,0,40,61,0,22,66,0,9,231,0,2,63,0,64,0,40,14,0,40,66,0,31,67,0,40,22,0,45,68,0,9,210,0,40,67,0,3,45,69,0,9,15,1,40,14,0,3,45,70,0,9,21,1,40,26,0,3,44,71,0,11,40,23,0,40,28,0,40,33,0,40,37,0,40,42,0,40,47,0,40,51,0,40,56,0,40,61,0,40,66,0,22,72,0,9,231,0,3,68,0,69,0,70,0,40,14,0,40,72,0,31,73,0,40,22,0,45,74,0,9,210,0,40,73,0,3,45,75,0,9,15,1,40,14,0,3,45,76,0,9,1,1,40,31,0,3,44,77,0,12,40,23,0,40,28,0,40,33,0,40,37,0,40,42,0,40,47,0,40,51,0,40,56,0,40,61,0,40,66,0,40,72,0,22,78,0,9,231,0,3,74,0,75,0,76,0,40,14,0,40,78,0,13,0,2,0,0,0,17,0,1,0,106,0,9,0,129,0,10,0,90,0,8,0,149,0,11,0,231,0,68,0,56,0,4,0,30,0,2,0,200,0,14,0,174,0,12,0,76,0,6,0,186,0,13,0,12,12,13,2,0,41,5,0,45,79,0,29,8,1,31,1,40,1,0,0,45,80,0,29,8,1,39,1,40,1,0,0,45,81,0,29,8,1,47,1,40,1,0,0,45,82,0,29,8,1,62,1,40,1,0,0,45,83,0,29,8,1,77,1,40,1,0,0,5,0,39,1,1,0,31,1,0,0,62,1,3,0,47,1,2,0,77,1,4,0,0,0,0,0,1,0,0,0,2,0,0,0,3,0,0,0,3,0,0,0,13,17,0,41,3,0,45,84,0,29,8,1,83,1,40,2,0,0,45,85,0,29,8,1,93,1,40,2,0,0,45,86,0,29,8,1,105,1,40,2,0,0,3,0,105,1,2,0,83,1,0,0,93,1,1,0,0,0,0,0,1,0,0,0,2,0,0,0,47,40,4,0,1,46,3,0,0,49,47,40,6,0,1,46,7,0,1,27,1,0,0,0,49,47,40,9,0,1,46,10,0,1,27,1,0,0,0,49,47,40,4,0,1,46,12,0,1,27,1,0,0,0,49,47,40,14,0,1,46,13,0,0,49,47,40,14,0,1,46,15,0,0,49,47,40,14,0,1,46,16,0,0,49,47,40,14,0,1,46,17,0,0,49,47,40,19,0,1,46,18,0,0,49,47,40,19,0,1,46,20,0,0,49,};
+static constexpr size_t SKSL_INCLUDE_sksl_fp_LENGTH = 1594;
+static uint8_t SKSL_INCLUDE_sksl_fp[1594] = {98,1,14,71,114,67,108,105,112,69,100,103,101,84,121,112,101,12,80,77,67,111,110,118,101,114,115,105,111,110,12,115,107,95,70,114,97,103,67,111,111,114,100,6,102,108,111,97,116,52,3,105,110,116,13,115,107,95,83,97,109,112,108,101,77,97,115,107,15,103,108,95,76,97,115,116,70,114,97,103,68,97,116,97,16,103,108,95,76,97,115,116,70,114,97,103,67,111,108,111,114,5,104,97,108,102,52,19,103,108,95,76,97,115,116,70,114,97,103,67,111,108,111,114,65,82,77,24,103,108,95,83,101,99,111,110,100,97,114,121,70,114,97,103,67,111,108,111,114,69,88,84,11,115,107,95,79,117,116,67,111,108,111,114,8,115,107,95,87,105,100,116,104,4,104,97,108,102,9,115,107,95,72,101,105,103,104,116,2,102,112,17,102,114,97,103,109,101,110,116,80,114,111,99,101,115,115,111,114,6,115,97,109,112,108,101,9,116,114,97,110,115,102,111,114,109,8,102,108,111,97,116,51,120,51,6,99,111,111,114,100,115,6,102,108,111,97,116,50,5,105,110,112,117,116,9,116,114,97,110,115,102,114,111,109,7,107,70,105,108,108,66,87,7,107,70,105,108,108,65,65,14,107,73,110,118,101,114,115,101,70,105,108,108,66,87,14,107,73,110,118,101,114,115,101,70,105,108,108,65,65,5,107,76,97,115,116,9,107,84,111,80,114,101,109,117,108,11,107,84,111,85,110,112,114,101,109,117,108,16,107,80,77,67,111,110,118,101,114,115,105,111,110,67,110,116,41,68,0,14,1,0,2,0,14,2,0,17,0,45,3,0,29,5,15,0,2,30,0,42,4,0,43,0,0,0,5,0,42,6,0,50,0,1,45,7,0,29,5,20,0,4,54,0,40,5,0,0,0,8,0,40,4,0,1,45,9,0,29,5,15,39,0,68,0,40,8,0,0,45,10,0,29,5,15,39,0,84,0,42,11,0,101,0,0,45,12,0,29,5,15,39,0,107,0,40,11,0,0,45,13,0,29,5,15,39,0,127,0,40,11,0,0,45,14,0,29,5,20,39,4,152,0,40,11,0,0,45,15,0,29,5,27,39,0,164,0,42,16,0,173,0,0,45,17,0,29,5,28,39,0,178,0,40,16,0,0,45,18,0,9,188,0,42,19,0,191,0,3,22,20,0,9,209,0,1,18,0,40,11,0,45,21,0,9,188,0,40,19,0,3,45,22,0,9,216,0,42,23,0,226,0,3,44,24,0,2,40,20,0,22,25,0,9,209,0,2,21,0,22,0,40,11,0,40,25,0,45,26,0,9,188,0,40,19,0,3,45,27,0,9,235,0,42,28,0,242,0,3,44,29,0,3,40,20,0,40,25,0,22,30,0,9,209,0,2,26,0,27,0,40,11,0,40,30,0,45,31,0,9,188,0,40,19,0,3,45,32,0,9,249,0,40,11,0,3,44,33,0,4,40,20,0,40,25,0,40,30,0,22,34,0,9,209,0,2,31,0,32,0,40,11,0,40,34,0,45,35,0,9,188,0,40,19,0,3,45,36,0,9,249,0,40,11,0,3,45,37,0,9,216,0,40,23,0,3,44,38,0,5,40,20,0,40,25,0,40,30,0,40,34,0,22,39,0,9,209,0,3,35,0,36,0,37,0,40,11,0,40,39,0,45,40,0,9,188,0,40,19,0,3,45,41,0,9,249,0,40,11,0,3,45,42,0,9,235,0,40,28,0,3,44,43,0,6,40,20,0,40,25,0,40,30,0,40,34,0,40,39,0,22,44,0,9,209,0,3,40,0,41,0,42,0,40,11,0,40,44,0,31,45,0,40,19,0,45,46,0,9,188,0,40,45,0,3,44,47,0,7,40,20,0,40,25,0,40,30,0,40,34,0,40,39,0,40,44,0,22,48,0,9,209,0,1,46,0,40,11,0,40,48,0,31,49,0,40,19,0,45,50,0,9,188,0,40,49,0,3,45,51,0,9,216,0,40,23,0,3,44,52,0,8,40,20,0,40,25,0,40,30,0,40,34,0,40,39,0,40,44,0,40,48,0,22,53,0,9,209,0,2,50,0,51,0,40,11,0,40,53,0,31,54,0,40,19,0,45,55,0,9,188,0,40,54,0,3,45,56,0,9,235,0,40,28,0,3,44,57,0,9,40,20,0,40,25,0,40,30,0,40,34,0,40,39,0,40,44,0,40,48,0,40,53,0,22,58,0,9,209,0,2,55,0,56,0,40,11,0,40,58,0,31,59,0,40,19,0,45,60,0,9,188,0,40,59,0,3,45,61,0,9,249,0,40,11,0,3,44,62,0,10,40,20,0,40,25,0,40,30,0,40,34,0,40,39,0,40,44,0,40,48,0,40,53,0,40,58,0,22,63,0,9,209,0,2,60,0,61,0,40,11,0,40,63,0,31,64,0,40,19,0,45,65,0,9,188,0,40,64,0,3,45,66,0,9,249,0,40,11,0,3,45,67,0,9,255,0,40,23,0,3,44,68,0,11,40,20,0,40,25,0,40,30,0,40,34,0,40,39,0,40,44,0,40,48,0,40,53,0,40,58,0,40,63,0,22,69,0,9,209,0,3,65,0,66,0,67,0,40,11,0,40,69,0,31,70,0,40,19,0,45,71,0,9,188,0,40,70,0,3,45,72,0,9,249,0,40,11,0,3,45,73,0,9,235,0,40,28,0,3,44,74,0,12,40,20,0,40,25,0,40,30,0,40,34,0,40,39,0,40,44,0,40,48,0,40,53,0,40,58,0,40,63,0,40,69,0,22,75,0,9,209,0,3,71,0,72,0,73,0,40,11,0,40,75,0,12,0,2,0,0,0,17,0,1,0,84,0,7,0,107,0,8,0,68,0,6,0,127,0,9,0,209,0,66,0,30,0,2,0,178,0,12,0,152,0,10,0,54,0,4,0,164,0,11,0,12,11,13,2,0,41,5,0,45,76,0,29,8,1,9,1,40,1,0,0,45,77,0,29,8,1,17,1,40,1,0,0,45,78,0,29,8,1,25,1,40,1,0,0,45,79,0,29,8,1,40,1,40,1,0,0,45,80,0,29,8,1,55,1,40,1,0,0,5,0,17,1,1,0,9,1,0,0,40,1,3,0,25,1,2,0,55,1,4,0,0,0,0,0,1,0,0,0,2,0,0,0,3,0,0,0,3,0,0,0,13,17,0,41,3,0,45,81,0,29,8,1,61,1,40,2,0,0,45,82,0,29,8,1,71,1,40,2,0,0,45,83,0,29,8,1,83,1,40,2,0,0,3,0,83,1,2,0,61,1,0,0,71,1,1,0,0,0,0,0,1,0,0,0,2,0,0,0,47,40,4,0,1,46,3,0,0,49,47,40,6,0,1,46,7,0,1,27,1,0,0,0,49,47,40,4,0,1,46,9,0,1,27,1,0,0,0,49,47,40,11,0,1,46,10,0,0,49,47,40,11,0,1,46,12,0,0,49,47,40,11,0,1,46,13,0,0,49,47,40,11,0,1,46,14,0,0,49,47,40,16,0,1,46,15,0,0,49,47,40,16,0,1,46,17,0,0,49,};
diff --git a/src/sksl/generated/sksl_frag.dehydrated.sksl b/src/sksl/generated/sksl_frag.dehydrated.sksl
index 880cc8a..f34ee40 100644
--- a/src/sksl/generated/sksl_frag.dehydrated.sksl
+++ b/src/sksl/generated/sksl_frag.dehydrated.sksl
@@ -1,2 +1,2 @@
-static constexpr size_t SKSL_INCLUDE_sksl_frag_LENGTH = 481;
-static uint8_t SKSL_INCLUDE_sksl_frag[481] = {164,0,12,115,107,95,70,114,97,103,67,111,111,114,100,6,102,108,111,97,116,52,12,115,107,95,67,108,111,99,107,119,105,115,101,4,98,111,111,108,5,102,108,111,97,116,15,115,107,95,67,108,105,112,68,105,115,116,97,110,99,101,3,105,110,116,13,115,107,95,83,97,109,112,108,101,77,97,115,107,24,103,108,95,83,101,99,111,110,100,97,114,121,70,114,97,103,67,111,108,111,114,69,88,84,5,104,97,108,102,52,0,12,115,107,95,70,114,97,103,67,111,108,111,114,16,115,107,95,76,97,115,116,70,114,97,103,67,111,108,111,114,8,115,107,95,87,105,100,116,104,4,104,97,108,102,9,115,107,95,72,101,105,103,104,116,41,11,0,45,1,0,29,5,15,0,2,2,0,42,2,0,15,0,0,45,3,0,29,5,17,0,2,22,0,42,4,0,35,0,0,0,5,0,42,6,0,40,0,1,45,7,0,29,5,3,0,0,46,0,40,5,0,0,0,8,0,42,9,0,62,0,1,45,10,0,29,5,20,0,4,66,0,40,8,0,0,45,11,0,29,5,15,39,4,80,0,42,12,0,105,0,0,45,13,0,29,28,0,0,0,0,0,255,255,0,255,17,39,255,255,255,255,255,111,0,111,0,0,0,4,112,0,40,12,0,0,45,14,0,29,5,24,39,0,125,0,40,12,0,0,45,15,0,29,5,27,39,0,142,0,42,16,0,151,0,0,45,17,0,29,5,28,39,0,156,0,40,16,0,0,9,0,80,0,6,0,46,0,3,0,22,0,1,0,112,0,7,0,2,0,0,0,156,0,10,0,125,0,8,0,66,0,5,0,142,0,9,0,12,9,47,40,2,0,1,46,1,0,0,49,47,40,4,0,1,46,3,0,0,49,47,40,6,0,1,46,7,0,1,27,1,0,0,0,49,47,40,9,0,1,46,10,0,1,27,1,0,0,0,49,47,40,12,0,1,46,11,0,0,49,47,40,12,0,1,46,13,0,0,49,47,40,12,0,1,46,14,0,0,49,47,40,16,0,1,46,15,0,0,49,47,40,16,0,1,46,17,0,0,49,};
+static constexpr size_t SKSL_INCLUDE_sksl_frag_LENGTH = 417;
+static uint8_t SKSL_INCLUDE_sksl_frag[417] = {142,0,12,115,107,95,70,114,97,103,67,111,111,114,100,6,102,108,111,97,116,52,12,115,107,95,67,108,111,99,107,119,105,115,101,4,98,111,111,108,3,105,110,116,13,115,107,95,83,97,109,112,108,101,77,97,115,107,24,103,108,95,83,101,99,111,110,100,97,114,121,70,114,97,103,67,111,108,111,114,69,88,84,5,104,97,108,102,52,0,12,115,107,95,70,114,97,103,67,111,108,111,114,16,115,107,95,76,97,115,116,70,114,97,103,67,111,108,111,114,8,115,107,95,87,105,100,116,104,4,104,97,108,102,9,115,107,95,72,101,105,103,104,116,41,9,0,45,1,0,29,5,15,0,2,2,0,42,2,0,15,0,0,45,3,0,29,5,17,0,2,22,0,42,4,0,35,0,0,0,5,0,42,6,0,40,0,1,45,7,0,29,5,20,0,4,44,0,40,5,0,0,45,8,0,29,5,15,39,4,58,0,42,9,0,83,0,0,45,10,0,29,28,0,0,0,0,0,255,255,0,255,17,39,255,255,255,255,255,89,0,89,0,0,0,4,90,0,40,9,0,0,45,11,0,29,5,24,39,0,103,0,40,9,0,0,45,12,0,29,5,27,39,0,120,0,42,13,0,129,0,0,45,14,0,29,5,28,39,0,134,0,40,13,0,0,8,0,58,0,4,0,22,0,1,0,90,0,5,0,2,0,0,0,134,0,8,0,103,0,6,0,44,0,3,0,120,0,7,0,12,8,47,40,2,0,1,46,1,0,0,49,47,40,4,0,1,46,3,0,0,49,47,40,6,0,1,46,7,0,1,27,1,0,0,0,49,47,40,9,0,1,46,8,0,0,49,47,40,9,0,1,46,10,0,0,49,47,40,9,0,1,46,11,0,0,49,47,40,13,0,1,46,12,0,0,49,47,40,13,0,1,46,14,0,0,49,};
diff --git a/src/sksl/generated/sksl_geom.dehydrated.sksl b/src/sksl/generated/sksl_geom.dehydrated.sksl
index 1437769..3b25697 100644
--- a/src/sksl/generated/sksl_geom.dehydrated.sksl
+++ b/src/sksl/generated/sksl_geom.dehydrated.sksl
@@ -1,2 +1,2 @@
-static constexpr size_t SKSL_INCLUDE_sksl_geom_LENGTH = 474;
-static uint8_t SKSL_INCLUDE_sksl_geom[474] = {166,0,12,115,107,95,80,101,114,86,101,114,116,101,120,11,115,107,95,80,111,115,105,116,105,111,110,6,102,108,111,97,116,52,12,115,107,95,80,111,105,110,116,83,105,122,101,5,102,108,111,97,116,15,115,107,95,67,108,105,112,68,105,115,116,97,110,99,101,5,115,107,95,105,110,15,115,107,95,73,110,118,111,99,97,116,105,111,110,73,68,3,105,110,116,6,115,116,114,101,97,109,16,69,109,105,116,83,116,114,101,97,109,86,101,114,116,101,120,4,118,111,105,100,18,69,110,100,83,116,114,101,97,109,80,114,105,109,105,116,105,118,101,10,69,109,105,116,86,101,114,116,101,120,12,69,110,100,80,114,105,109,105,116,105,118,101,0,41,14,0,37,1,0,2,0,3,29,5,0,0,0,15,0,42,2,0,27,0,29,5,1,0,0,34,0,42,3,0,47,0,29,5,3,0,0,53,0,0,4,0,40,3,0,1,45,5,0,29,5,18,39,2,69,0,0,6,0,40,1,0,1,0,37,7,0,2,0,3,29,5,0,0,0,15,0,40,2,0,29,5,1,0,0,34,0,40,3,0,29,5,3,0,0,53,0,0,8,0,40,3,0,1,45,9,0,29,5,23,39,4,2,0,40,7,0,0,16,9,0,0,16,9,0,1,16,9,0,2,45,10,0,29,5,8,0,2,75,0,42,11,0,91,0,0,45,12,0,9,95,0,40,11,0,3,22,13,0,30,8,0,16,0,0,102,0,1,12,0,42,14,0,119,0,45,15,0,9,95,0,40,11,0,3,22,16,0,30,8,0,16,0,0,124,0,1,15,0,40,14,0,22,17,0,30,8,0,16,0,0,143,0,0,40,14,0,22,18,0,30,8,0,16,0,0,154,0,0,40,14,0,9,0,102,0,9,0,143,0,12,0,154,0,13,0,124,0,11,0,53,0,6,0,75,0,7,0,34,0,5,0,15,0,4,0,69,0,1,0,12,3,26,40,5,0,2,0,69,0,1,27,1,0,0,0,26,40,9,0,2,0,167,0,0,47,40,11,0,1,46,10,0,0,49,};
+static constexpr size_t SKSL_INCLUDE_sksl_geom_LENGTH = 422;
+static uint8_t SKSL_INCLUDE_sksl_geom[422] = {150,0,12,115,107,95,80,101,114,86,101,114,116,101,120,11,115,107,95,80,111,115,105,116,105,111,110,6,102,108,111,97,116,52,12,115,107,95,80,111,105,110,116,83,105,122,101,5,102,108,111,97,116,5,115,107,95,105,110,15,115,107,95,73,110,118,111,99,97,116,105,111,110,73,68,3,105,110,116,6,115,116,114,101,97,109,16,69,109,105,116,83,116,114,101,97,109,86,101,114,116,101,120,4,118,111,105,100,18,69,110,100,83,116,114,101,97,109,80,114,105,109,105,116,105,118,101,10,69,109,105,116,86,101,114,116,101,120,12,69,110,100,80,114,105,109,105,116,105,118,101,0,41,13,0,37,1,0,2,0,2,29,5,0,0,0,15,0,42,2,0,27,0,29,5,1,0,0,34,0,42,3,0,47,0,45,4,0,29,5,18,39,2,53,0,0,5,0,40,1,0,1,0,37,6,0,2,0,2,29,5,0,0,0,15,0,40,2,0,29,5,1,0,0,34,0,40,3,0,45,7,0,29,5,23,39,4,2,0,40,6,0,0,16,7,0,0,16,7,0,1,45,8,0,29,5,8,0,2,59,0,42,9,0,75,0,0,45,10,0,9,79,0,40,9,0,3,22,11,0,30,8,0,16,0,0,86,0,1,10,0,42,12,0,103,0,45,13,0,9,79,0,40,9,0,3,22,14,0,30,8,0,16,0,0,108,0,1,13,0,40,12,0,22,15,0,30,8,0,16,0,0,127,0,0,40,12,0,22,16,0,30,8,0,16,0,0,138,0,0,40,12,0,8,0,86,0,8,0,127,0,11,0,138,0,12,0,108,0,10,0,59,0,6,0,34,0,5,0,15,0,4,0,53,0,1,0,12,3,26,40,4,0,2,0,53,0,1,27,1,0,0,0,26,40,7,0,2,0,151,0,0,47,40,9,0,1,46,8,0,0,49,};
diff --git a/src/sksl/generated/sksl_vert.dehydrated.sksl b/src/sksl/generated/sksl_vert.dehydrated.sksl
index bf73e21..d772f84 100644
--- a/src/sksl/generated/sksl_vert.dehydrated.sksl
+++ b/src/sksl/generated/sksl_vert.dehydrated.sksl
@@ -1,2 +1,2 @@
-static constexpr size_t SKSL_INCLUDE_sksl_vert_LENGTH = 254;
-static uint8_t SKSL_INCLUDE_sksl_vert[254] = {98,0,12,115,107,95,80,101,114,86,101,114,116,101,120,11,115,107,95,80,111,115,105,116,105,111,110,6,102,108,111,97,116,52,12,115,107,95,80,111,105,110,116,83,105,122,101,5,102,108,111,97,116,15,115,107,95,67,108,105,112,68,105,115,116,97,110,99,101,11,115,107,95,86,101,114,116,101,120,73,68,3,105,110,116,13,115,107,95,73,110,115,116,97,110,99,101,73,68,0,41,7,0,37,1,0,2,0,3,29,5,0,0,0,15,0,42,2,0,27,0,29,5,1,0,0,34,0,42,3,0,47,0,29,5,3,0,0,53,0,0,4,0,40,3,0,1,45,5,0,29,8,4,2,0,40,1,0,0,16,5,0,0,16,5,0,1,16,5,0,2,45,6,0,29,5,42,0,2,69,0,42,7,0,81,0,0,45,8,0,29,5,43,0,2,85,0,40,7,0,0,5,0,53,0,4,0,85,0,6,0,34,0,3,0,15,0,2,0,69,0,5,0,12,3,26,40,5,0,2,0,99,0,0,47,40,7,0,1,46,6,0,0,49,47,40,7,0,1,46,8,0,0,49,};
+static constexpr size_t SKSL_INCLUDE_sksl_vert_LENGTH = 216;
+static uint8_t SKSL_INCLUDE_sksl_vert[216] = {82,0,12,115,107,95,80,101,114,86,101,114,116,101,120,11,115,107,95,80,111,115,105,116,105,111,110,6,102,108,111,97,116,52,12,115,107,95,80,111,105,110,116,83,105,122,101,5,102,108,111,97,116,11,115,107,95,86,101,114,116,101,120,73,68,3,105,110,116,13,115,107,95,73,110,115,116,97,110,99,101,73,68,0,41,6,0,37,1,0,2,0,2,29,5,0,0,0,15,0,42,2,0,27,0,29,5,1,0,0,34,0,42,3,0,47,0,45,4,0,29,8,4,2,0,40,1,0,0,16,4,0,0,16,4,0,1,45,5,0,29,5,42,0,2,53,0,42,6,0,65,0,0,45,7,0,29,5,43,0,2,69,0,40,6,0,0,4,0,69,0,5,0,34,0,3,0,15,0,2,0,53,0,4,0,12,3,26,40,4,0,2,0,83,0,0,47,40,6,0,1,46,5,0,0,49,47,40,6,0,1,46,7,0,0,49,};
diff --git a/src/sksl/sksl_fp_raw.sksl b/src/sksl/sksl_fp_raw.sksl
index 377bfe7..08e6745 100644
--- a/src/sksl/sksl_fp_raw.sksl
+++ b/src/sksl/sksl_fp_raw.sksl
@@ -4,7 +4,6 @@
// defines built-in interfaces supported by SkiaSL fragment shaders
layout(builtin=15) in float4 sk_FragCoord;
-layout(builtin=3) float sk_ClipDistance[1];
layout(builtin=20) out int sk_SampleMask[1];
// 9999 is a temporary value that causes us to ignore these declarations beyond
diff --git a/src/sksl/sksl_frag.sksl b/src/sksl/sksl_frag.sksl
index 819deaa..dc26b04 100644
--- a/src/sksl/sksl_frag.sksl
+++ b/src/sksl/sksl_frag.sksl
@@ -3,7 +3,6 @@
// See "enum SpvBuiltIn_" in ./spirv.h
layout(builtin=15) in float4 sk_FragCoord;
layout(builtin=17) in bool sk_Clockwise; // Similar to gl_FrontFacing, but defined in device space.
-layout(builtin=3) float sk_ClipDistance[1];
layout(builtin=20) out int sk_SampleMask[1];
// 9999 is a temporary value that causes us to ignore these declarations beyond
diff --git a/src/sksl/sksl_geom.sksl b/src/sksl/sksl_geom.sksl
index f5ce472..372d13f 100644
--- a/src/sksl/sksl_geom.sksl
+++ b/src/sksl/sksl_geom.sksl
@@ -3,13 +3,11 @@
layout(builtin=10002) in sk_PerVertex {
layout(builtin=0) float4 sk_Position;
layout(builtin=1) float sk_PointSize;
- layout(builtin=3) float sk_ClipDistance[1];
} sk_in[1];
layout(builtin=10007) out sk_PerVertex {
layout(builtin=0) float4 sk_Position;
layout(builtin=1) float sk_PointSize;
- layout(builtin=3) float sk_ClipDistance[1];
};
layout(builtin=8) in int sk_InvocationID;
diff --git a/src/sksl/sksl_vert.sksl b/src/sksl/sksl_vert.sksl
index d106c49..086c574 100644
--- a/src/sksl/sksl_vert.sksl
+++ b/src/sksl/sksl_vert.sksl
@@ -3,7 +3,6 @@
out sk_PerVertex {
layout(builtin=0) float4 sk_Position;
layout(builtin=1) float sk_PointSize;
- layout(builtin=3) float sk_ClipDistance[1];
};
layout(builtin=42) in int sk_VertexID;
diff --git a/tests/sksl/shared/ClipDistanceFragment.sksl b/tests/sksl/shared/ClipDistanceFragment.sksl
deleted file mode 100644
index 397dfa8..0000000
--- a/tests/sksl/shared/ClipDistanceFragment.sksl
+++ /dev/null
@@ -1,3 +0,0 @@
-void main() {
- sk_FragColor = half4(half(sk_ClipDistance[0]));
-}
diff --git a/tests/sksl/shared/ClipDistanceVertex.vert b/tests/sksl/shared/ClipDistanceVertex.vert
deleted file mode 100644
index 3a651f2..0000000
--- a/tests/sksl/shared/ClipDistanceVertex.vert
+++ /dev/null
@@ -1,3 +0,0 @@
-void main() {
- sk_ClipDistance[0] = 0;
-}
diff --git a/tests/sksl/shared/golden/ClipDistanceFragment.glsl b/tests/sksl/shared/golden/ClipDistanceFragment.glsl
deleted file mode 100644
index dd4f4fe..0000000
--- a/tests/sksl/shared/golden/ClipDistanceFragment.glsl
+++ /dev/null
@@ -1,5 +0,0 @@
-
-out vec4 sk_FragColor;
-void main() {
- sk_FragColor = vec4(gl_ClipDistance[0]);
-}
diff --git a/tests/sksl/shared/golden/ClipDistanceFragment.metal b/tests/sksl/shared/golden/ClipDistanceFragment.metal
deleted file mode 100644
index 1ca49d5..0000000
--- a/tests/sksl/shared/golden/ClipDistanceFragment.metal
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <metal_stdlib>
-#include <simd/simd.h>
-using namespace metal;
-struct Inputs {
-};
-struct Outputs {
- float4 sk_FragColor [[color(0)]];
-};
-fragment Outputs fragmentMain(Inputs _in [[stage_in]], bool _frontFacing [[front_facing]], float4 _fragCoord [[position]]) {
- Outputs _outputStruct;
- thread Outputs* _out = &_outputStruct;
- _out->sk_FragColor = float4(_globals->sk_ClipDistance[0]);
- return *_out;
-}
diff --git a/tests/sksl/shared/golden/ClipDistanceVertex.glsl b/tests/sksl/shared/golden/ClipDistanceVertex.glsl
deleted file mode 100644
index 8fe9093..0000000
--- a/tests/sksl/shared/golden/ClipDistanceVertex.glsl
+++ /dev/null
@@ -1,4 +0,0 @@
-
-void main() {
- gl_ClipDistance[0] = 0.0;
-}
diff --git a/tests/sksl/shared/golden/ClipDistanceVertex.metal b/tests/sksl/shared/golden/ClipDistanceVertex.metal
deleted file mode 100644
index 1123a9f..0000000
--- a/tests/sksl/shared/golden/ClipDistanceVertex.metal
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <metal_stdlib>
-#include <simd/simd.h>
-using namespace metal;
-struct Inputs {
-};
-struct Outputs {
- float4 sk_Position [[position]];
- float sk_PointSize [[point_size]];
-};
-vertex Outputs vertexMain(Inputs _in [[stage_in]], uint sk_VertexID [[vertex_id]], uint sk_InstanceID [[instance_id]]) {
- Outputs _outputStruct;
- thread Outputs* _out = &_outputStruct;
- gl_ClipDistance[0] = 0.0;
- _out->sk_Position.y = -_out->sk_Position.y;
- return *_out;
-}
