diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2018-07-12 14:02:00 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-07-19 19:00:55 +0000 |
| commit | 97ae0c89025dfd791047f5701e57d58da37c125c (patch) | |
| tree | d944775c2c88dd36d5e40fb6c1bae5c7c2376e3b /gn | |
| parent | 310f44d3d5298becdd8ab235af29789f6ed769b5 (diff) | |
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>
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 6cac050820..51a0dc29ec 100644 --- a/gn/gpu.gni +++ b/gn/gpu.gni @@ -364,8 +364,6 @@ 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", @@ -394,6 +392,8 @@ 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 bce75c8599..61c9250090 100644 --- a/gn/sksl.gni +++ b/gn/sksl.gni @@ -19,6 +19,7 @@ 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", @@ -37,7 +38,6 @@ 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", |