4 files changed, 5 insertions, 17 deletions
diff --git a/src/sksl/SkSLCompiler.h b/src/sksl/SkSLCompiler.h
index f7dcf2b5b9..167f042d52 100644
--- a/src/sksl/SkSLCompiler.h
+++ b/src/sksl/SkSLCompiler.h
@@ -17,10 +17,9 @@
 #include "SkSLErrorReporter.h"
 #include "SkSLIRGenerator.h"
 
-#define SK_FRAGCOLOR_BUILTIN    10001
-#define SK_FRAGCOORD_BUILTIN       15
-#define SK_VERTEXID_BUILTIN         5
-#define SK_CLIPDISTANCE_BUILTIN     3
+#define SK_FRAGCOLOR_BUILTIN 10001
+#define SK_FRAGCOORD_BUILTIN    15
+#define SK_VERTEXID_BUILTIN      5
 
 namespace SkSL {
 
diff --git a/src/sksl/SkSLGLSLCodeGenerator.cpp b/src/sksl/SkSLGLSLCodeGenerator.cpp
index 4b1eea3451..70e2e7761c 100644
--- a/src/sksl/SkSLGLSLCodeGenerator.cpp
+++ b/src/sksl/SkSLGLSLCodeGenerator.cpp
@@ -329,9 +329,6 @@ void GLSLCodeGenerator::writeVariableReference(const VariableReference& ref) {
         case SK_VERTEXID_BUILTIN:
             this->write("gl_VertexID");
             break;
-        case SK_CLIPDISTANCE_BUILTIN:
-            this->write("gl_ClipDistance");
-            break;
         default:
             this->write(ref.fVariable.fName);
     }
@@ -349,13 +346,7 @@ void GLSLCodeGenerator::writeFieldAccess(const FieldAccess& f) {
         this->writeExpression(*f.fBase, kPostfix_Precedence);
         this->write(".");
     }
-    switch (f.fBase->fType.fields()[f.fFieldIndex].fModifiers.fLayout.fBuiltin) {
-        case SK_CLIPDISTANCE_BUILTIN:
-            this->write("gl_ClipDistance");
-            break;
-        default:
-            this->write(f.fBase->fType.fields()[f.fFieldIndex].fName);
-    }
+    this->write(f.fBase->fType.fields()[f.fFieldIndex].fName);
 }
 
 void GLSLCodeGenerator::writeSwizzle(const Swizzle& swizzle) {
diff --git a/src/sksl/sksl_frag.include b/src/sksl/sksl_frag.include
index d0e30f2574..21849866df 100644
--- a/src/sksl/sksl_frag.include
+++ b/src/sksl/sksl_frag.include
@@ -3,7 +3,6 @@ STRINGIFY(
 // defines built-in interfaces supported by SkiaSL fragment shaders
 
 layout(builtin=15) in vec4 sk_FragCoord;
-layout(builtin=3) float sk_ClipDistance[];
 
 // 9999 is a temporary value that causes us to ignore these declarations beyond
 // adding them to the symbol table. This works fine in GLSL (where they do not
diff --git a/src/sksl/sksl_vert.include b/src/sksl/sksl_vert.include
index 8e14c388a7..af74c0c54c 100644
--- a/src/sksl/sksl_vert.include
+++ b/src/sksl/sksl_vert.include
@@ -4,8 +4,7 @@ STRINGIFY(
 
 out gl_PerVertex {
   	layout(builtin=0) vec4 gl_Position;
-    layout(builtin=1) float gl_PointSize;
-    layout(builtin=3) float sk_ClipDistance[];
+  	layout(builtin=1) float gl_PointSize;
 };
 
 layout(builtin=5) int sk_VertexID;