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 /gn | |
| 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 'gn')
| -rw-r--r-- | gn/gpu.gni | 4 | ||||
| -rw-r--r-- | gn/sksl.gni | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gn/gpu.gni b/gn/gpu.gni index 51a0dc29ec..6cac050820 100644 --- a/gn/gpu.gni +++ b/gn/gpu.gni @@ -364,6 +364,8 @@ skia_gpu_sources = [ "$_src/gpu/effects/GrDisableColorXP.h", "$_src/gpu/effects/GrDistanceFieldGeoProc.cpp", "$_src/gpu/effects/GrDistanceFieldGeoProc.h", + "$_src/gpu/effects/GrDitherEffect.cpp", + "$_src/gpu/effects/GrDitherEffect.h", "$_src/gpu/effects/GrEllipseEffect.cpp", "$_src/gpu/effects/GrEllipseEffect.h", "$_src/gpu/effects/GrGaussianConvolutionFragmentProcessor.cpp", @@ -392,8 +394,6 @@ skia_gpu_sources = [ "$_src/gpu/effects/GrShadowGeoProc.h", "$_src/gpu/effects/GrSimpleTextureEffect.cpp", "$_src/gpu/effects/GrSimpleTextureEffect.h", - "$_src/gpu/effects/GrSkSLFP.cpp", - "$_src/gpu/effects/GrSkSLFP.h", "$_src/gpu/effects/GrSRGBEffect.cpp", "$_src/gpu/effects/GrSRGBEffect.h", "$_src/gpu/effects/GrTextureDomain.cpp", diff --git a/gn/sksl.gni b/gn/sksl.gni index 61c9250090..bce75c8599 100644 --- a/gn/sksl.gni +++ b/gn/sksl.gni @@ -19,7 +19,6 @@ skia_sksl_sources = [ "$_src/sksl/SkSLLayoutLexer.cpp", "$_src/sksl/SkSLMetalCodeGenerator.cpp", "$_src/sksl/SkSLParser.cpp", - "$_src/sksl/SkSLPipelineStageCodeGenerator.cpp", "$_src/sksl/SkSLSPIRVCodeGenerator.cpp", "$_src/sksl/SkSLString.cpp", "$_src/sksl/SkSLUtil.cpp", @@ -38,6 +37,7 @@ skia_gpu_processor_sources = [ "$_src/gpu/effects/GrCircleEffect.fp", "$_src/gpu/effects/GrConfigConversionEffect.fp", "$_src/gpu/effects/GrConstColorProcessor.fp", + "$_src/gpu/effects/GrDitherEffect.fp", "$_src/gpu/effects/GrEllipseEffect.fp", "$_src/gpu/effects/GrLumaColorFilterEffect.fp", "$_src/gpu/effects/GrMagnifierEffect.fp", |