diff options
| author |  Stan Iliev <stani@google.com> | 2017-05-25 22:07:16 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-25 22:30:19 +0000 |
| commit | d8872be505c5c9c48072fe62c244e53e9b7334f1 (patch) | |
| tree | ef6ae54d394f1bf0794393c42129811b93d0f6be /gn/effects.gni | |
| parent | 5b474d36238e38642add8d4b54cb9ac80935262b (diff) | |
Revert "Relocate shaders to own dir"
This reverts commit fabe0b26d05624ce7374f6ca89bd66df6142534e.
Reason for revert: Last android roll failed with "external/skia/src/effects/SkGaussianEdgeShader.h:11:10: fatal error: 'SkShaderBase.h' file not found"
Original change's description:
> Relocate shaders to own dir
>
> Consolidate all shader impls under src/shaders/.
>
> Change-Id: I450e37541214704c1ad9e379d9d753b7cc62fac3
> Reviewed-on: https://skia-review.googlesource.com/17927
> Commit-Queue: Florin Malita <fmalita@chromium.org>
> Reviewed-by: Herb Derby <herb@google.com>
>
TBR=mtklein@google.com,herb@google.com,fmalita@chromium.org,reed@google.com
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Change-Id: Idbb2b75053969df1dad9d8ce0217cd39189b9ddb
Reviewed-on: https://skia-review.googlesource.com/18020
Reviewed-by: Stan Iliev <stani@google.com>
Commit-Queue: Stan Iliev <stani@google.com>
Diffstat (limited to 'gn/effects.gni')
| -rw-r--r-- | gn/effects.gni | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/gn/effects.gni b/gn/effects.gni index 3fd8e531a6..278925ba85 100644 --- a/gn/effects.gni +++ b/gn/effects.gni @@ -56,6 +56,7 @@ skia_effects_sources = [ "$_src/effects/SkPackBits.h", "$_src/effects/SkPaintFlagsDrawFilter.cpp", "$_src/effects/SkPaintImageFilter.cpp", + "$_src/effects/SkPerlinNoiseShader.cpp", "$_src/effects/SkPictureImageFilter.cpp", "$_src/effects/SkRRectsGaussianEdgeMaskFilter.cpp", "$_src/effects/SkTableColorFilter.cpp", @@ -63,28 +64,27 @@ skia_effects_sources = [ "$_src/effects/SkTileImageFilter.cpp", "$_src/effects/SkXfermodeImageFilter.cpp", - "$_src/shaders/SkPerlinNoiseShader.cpp", - "$_src/shaders/gradients/Sk4fGradientBase.cpp", - "$_src/shaders/gradients/Sk4fGradientBase.h", - "$_src/shaders/gradients/Sk4fGradientPriv.h", - "$_src/shaders/gradients/Sk4fLinearGradient.cpp", - "$_src/shaders/gradients/Sk4fLinearGradient.h", - "$_src/shaders/gradients/SkClampRange.cpp", - "$_src/shaders/gradients/SkClampRange.h", - "$_src/shaders/gradients/SkGradientBitmapCache.cpp", - "$_src/shaders/gradients/SkGradientBitmapCache.h", - "$_src/shaders/gradients/SkGradientShader.cpp", - "$_src/shaders/gradients/SkGradientShaderPriv.h", - "$_src/shaders/gradients/SkLinearGradient.cpp", - "$_src/shaders/gradients/SkLinearGradient.h", - "$_src/shaders/gradients/SkRadialGradient.cpp", - "$_src/shaders/gradients/SkRadialGradient.h", - "$_src/shaders/gradients/SkTwoPointConicalGradient.cpp", - "$_src/shaders/gradients/SkTwoPointConicalGradient.h", - "$_src/shaders/gradients/SkTwoPointConicalGradient_gpu.cpp", - "$_src/shaders/gradients/SkTwoPointConicalGradient_gpu.h", - "$_src/shaders/gradients/SkSweepGradient.cpp", - "$_src/shaders/gradients/SkSweepGradient.h", + "$_src/effects/gradients/Sk4fGradientBase.cpp", + "$_src/effects/gradients/Sk4fGradientBase.h", + "$_src/effects/gradients/Sk4fGradientPriv.h", + "$_src/effects/gradients/Sk4fLinearGradient.cpp", + "$_src/effects/gradients/Sk4fLinearGradient.h", + "$_src/effects/gradients/SkClampRange.cpp", + "$_src/effects/gradients/SkClampRange.h", + "$_src/effects/gradients/SkGradientBitmapCache.cpp", + "$_src/effects/gradients/SkGradientBitmapCache.h", + "$_src/effects/gradients/SkGradientShader.cpp", + "$_src/effects/gradients/SkGradientShaderPriv.h", + "$_src/effects/gradients/SkLinearGradient.cpp", + "$_src/effects/gradients/SkLinearGradient.h", + "$_src/effects/gradients/SkRadialGradient.cpp", + "$_src/effects/gradients/SkRadialGradient.h", + "$_src/effects/gradients/SkTwoPointConicalGradient.cpp", + "$_src/effects/gradients/SkTwoPointConicalGradient.h", + "$_src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp", + "$_src/effects/gradients/SkTwoPointConicalGradient_gpu.h", + "$_src/effects/gradients/SkSweepGradient.cpp", + "$_src/effects/gradients/SkSweepGradient.h", "$_include/effects/Sk1DPathEffect.h", "$_include/effects/Sk2DPathEffect.h", |