diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2017-02-08 15:49:56 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-09 14:13:57 +0000 |
| commit | 8b8c76506a9a3b07246e6c2770e35dfc413da97a (patch) | |
| tree | 4efcf140a33f9783a113e3dd45414e5aa67b36a7 /src | |
| parent | 52bab3047b50c388b33a55faa42bf55df2a3d814 (diff) | |
added support for sk_ClipDistance
Change-Id: I14fd921cace23ab37a1e5e9d5da94d92d3688680
Reviewed-on: https://skia-review.googlesource.com/8225
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/sksl/SkSLCompiler.h | 7 | ||||
| -rw-r--r-- | src/sksl/SkSLGLSLCodeGenerator.cpp | 11 | ||||
| -rw-r--r-- | src/sksl/sksl_frag.include | 1 | ||||
| -rw-r--r-- | src/sksl/sksl_vert.include | 3 |
4 files changed, 17 insertions, 5 deletions
diff --git a/src/sksl/SkSLCompiler.h b/src/sksl/SkSLCompiler.h index 167f042d52..f7dcf2b5b9 100644 --- a/src/sksl/SkSLCompiler.h +++ b/src/sksl/SkSLCompiler.h @@ -17,9 +17,10 @@ #include "SkSLErrorReporter.h" #include "SkSLIRGenerator.h" -#define SK_FRAGCOLOR_BUILTIN 10001 -#define SK_FRAGCOORD_BUILTIN 15 -#define SK_VERTEXID_BUILTIN 5 +#define SK_FRAGCOLOR_BUILTIN 10001 +#define SK_FRAGCOORD_BUILTIN 15 +#define SK_VERTEXID_BUILTIN 5 +#define SK_CLIPDISTANCE_BUILTIN 3 namespace SkSL { diff --git a/src/sksl/SkSLGLSLCodeGenerator.cpp b/src/sksl/SkSLGLSLCodeGenerator.cpp index 70e2e7761c..4b1eea3451 100644 --- a/src/sksl/SkSLGLSLCodeGenerator.cpp +++ b/src/sksl/SkSLGLSLCodeGenerator.cpp @@ -329,6 +329,9 @@ 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); } @@ -346,7 +349,13 @@ void GLSLCodeGenerator::writeFieldAccess(const FieldAccess& f) { this->writeExpression(*f.fBase, kPostfix_Precedence); this->write("."); } - this->write(f.fBase->fType.fields()[f.fFieldIndex].fName); + 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); + } } void GLSLCodeGenerator::writeSwizzle(const Swizzle& swizzle) { diff --git a/src/sksl/sksl_frag.include b/src/sksl/sksl_frag.include index 21849866df..d0e30f2574 100644 --- a/src/sksl/sksl_frag.include +++ b/src/sksl/sksl_frag.include @@ -3,6 +3,7 @@ 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 af74c0c54c..8e14c388a7 100644 --- a/src/sksl/sksl_vert.include +++ b/src/sksl/sksl_vert.include @@ -4,7 +4,8 @@ STRINGIFY( out gl_PerVertex { layout(builtin=0) vec4 gl_Position; - layout(builtin=1) float gl_PointSize; + layout(builtin=1) float gl_PointSize; + layout(builtin=3) float sk_ClipDistance[]; }; layout(builtin=5) int sk_VertexID; |