diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2018-07-31 09:44:36 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-07-31 15:18:03 +0000 |
| commit | 0054311bf3b4f619a631e95d8aa1ea2d4bfd01c6 (patch) | |
| tree | a3a48bece53f8a381c2a2e431db08f5055282e4f /gn | |
| parent | ce3c7bbd0de68fda69903107461738b6afc8a3f4 (diff) | |
Re-re-land "added GrSkSLFP and converted DitherEffect to use it"
This reverts commit 6c48e4d11ce80fa5cfef56e13b2d5847fe94a7cc.
Bug: skia:
Change-Id: I7ee78990fc30eec545d1856e59eb6e0573089426
Reviewed-on: https://skia-review.googlesource.com/144348
Reviewed-by: Brian Salomon <bsalomon@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 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 5cf376fd1d..fa04c8e2e4 100644 --- a/gn/sksl.gni +++ b/gn/sksl.gni @@ -18,6 +18,7 @@ skia_sksl_sources = [ "$_src/sksl/SkSLLexer.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", @@ -36,7 +37,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", |