diff options
author | Ethan Nicholas <ethannicholas@google.com> | 2018-07-19 20:10:37 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-07-19 20:10:46 +0000 |
commit | 6c48e4d11ce80fa5cfef56e13b2d5847fe94a7cc (patch) | |
tree | 57e5d832d16aa9a0447e5102fe9811e39f8403d9 /src/sksl/sksl_pipeline.inc | |
parent | 736db1081b378ac8c167dfbc0322470d28c1cb3e (diff) |
Reland "Revert "added GrSkSLFP and converted DitherEffect to use it""
This reverts commit 97ae0c89025dfd791047f5701e57d58da37c125c.
Reason for revert: Breaking ANGLE.
Original change's description:
> Revert "Revert "added GrSkSLFP and converted DitherEffect to use it""
>
> This reverts commit f2030783094e502fb74221077a5ee7cb41287fe4.
>
> Bug: skia:
> Change-Id: Icaaa8b3ea652a8f126bfbcc788a360493a7ebe3e
> Reviewed-on: https://skia-review.googlesource.com/137391
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
TBR=bsalomon@google.com,robertphillips@google.com,ethannicholas@google.com
Change-Id: I65d6d2707fceab0a99121c528d1b848d23e34bfa
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/142588
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/sksl/sksl_pipeline.inc')
-rw-r--r-- | src/sksl/sksl_pipeline.inc | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/src/sksl/sksl_pipeline.inc b/src/sksl/sksl_pipeline.inc deleted file mode 100644 index f0a2221607..0000000000 --- a/src/sksl/sksl_pipeline.inc +++ /dev/null @@ -1,19 +0,0 @@ -STRINGIFY( - // special-cased within the compiler - append takes various arguments depending on what kind of - // stage is being appended - sk_has_side_effects void append(); - - float abs(float x); - float sin(float x); - float cos(float y); - float tan(float x); - float sqrt(float x); - float clamp(float x, float min, float max); - float2 clamp(float2 x, float min, float max); - float3 clamp(float3 x, float min, float max); - float4 clamp(float4 x, float min, float max); - sk_has_side_effects void print(float x); - layout(builtin=10009) int sk_x; - layout(builtin=10010) int sk_y; - layout(builtin=10004) out half4 sk_OutColor; -) |