diff options
author | Mike Klein <mtklein@google.com> | 2017-06-27 22:52:03 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-06-27 22:52:10 +0000 |
commit | 5ce397205528f82084fc650c2ce27d246c01da33 (patch) | |
tree | 3e359ae172fed10fce8204163d6d372b0c3f6207 /src/sksl/sksl_fp.include | |
parent | 3fe44544c93759e7791ee0df3e5d172cb0f268b6 (diff) |
Revert "Re-land sksl fragment processor support"
This reverts commit c070939fd1a954b7a492bc30f0cf64a664b90181.
Reason for revert:
This has some knock-on effects in the generation of Android.bp from our GN files. See gn/gn_to_bp.py? We're seeing things like "tmp/tmpsBVycx/gen/" end up in the include search path in Android.bp, which obviously don't exist there...
Original change's description:
> Re-land sksl fragment processor support
>
> This reverts commit ed50200682e0de72c3abecaa4d5324ebcd1ed9f9.
>
> Bug: skia:
> Change-Id: I9caa7454b391450620d6989dc472abb3cf7a2cab
> Reviewed-on: https://skia-review.googlesource.com/20965
> Reviewed-by: Ben Wagner <benjaminwagner@google.com>
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
TBR=benjaminwagner@google.com,ethannicholas@google.com
Change-Id: I502486b5405923b322429219f4cc396a45a14cea
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/20990
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Diffstat (limited to 'src/sksl/sksl_fp.include')
-rw-r--r-- | src/sksl/sksl_fp.include | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/src/sksl/sksl_fp.include b/src/sksl/sksl_fp.include deleted file mode 100644 index 566e441e30..0000000000 --- a/src/sksl/sksl_fp.include +++ /dev/null @@ -1,23 +0,0 @@ -STRINGIFY( - -// defines built-in interfaces supported by SkiaSL fragment shaders - -layout(builtin=15) in vec4 sk_FragCoord; -layout(builtin=3) float sk_ClipDistance[1]; - -// 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[1]; -layout(builtin=9999) out int gl_SampleMask[1]; -layout(builtin=9999) vec4 gl_SecondaryFragColorEXT; - -layout(builtin=10003) vec4 sk_InColor; -layout(builtin=10004) out vec4 sk_OutColor; -layout(builtin=10005) vec2[] sk_TransformedCoords2D; -layout(builtin=10006) sampler2D[] sk_TextureSamplers; -) |