| Index: src/sksl/sksl_frag.include | 
| diff --git a/src/sksl/sksl_frag.include b/src/sksl/sksl_frag.include | 
| index ed63d4af1631d3e742123b0bf95e85a9e7589c73..123c3393a20c5a3573e8239ab7336cc841cfb29c 100644 | 
| --- a/src/sksl/sksl_frag.include | 
| +++ b/src/sksl/sksl_frag.include | 
| @@ -4,16 +4,5 @@ | 
|  | 
| layout(builtin=15) in vec4 gl_FragCoord; | 
|  | 
| -// 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 | 
| -// require any further handling) but will fail in SPIR-V. We'll have a better | 
| -// solution for this soon. | 
| -layout(builtin=9999) vec4 gl_LastFragData[1]; | 
| -layout(builtin=9999) vec4 gl_LastFragColor; | 
| -layout(builtin=9999) vec4 gl_LastFragColorARM; | 
| -layout(builtin=9999) int gl_SampleMaskIn[]; | 
| -layout(builtin=9999) out int gl_SampleMask[]; | 
| +) | 
|  | 
| -layout(location=0,index=0,builtin=10001) out vec4 sk_FragColor; | 
| - | 
| -) | 
|  |