diff options
author | Florin Malita <fmalita@chromium.org> | 2017-05-25 15:29:13 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-25 20:05:08 +0000 |
commit | fabe0b26d05624ce7374f6ca89bd66df6142534e (patch) | |
tree | f32b5873b31185d7e86e6c48fbdbd654efb8af7a /gn | |
parent | 1c214313248a4b5a69af14539608c54fb67c2bf8 (diff) |
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>
Diffstat (limited to 'gn')
-rw-r--r-- | gn/core.gni | 36 | ||||
-rw-r--r-- | gn/effects.gni | 44 |
2 files changed, 42 insertions, 38 deletions
diff --git a/gn/core.gni b/gn/core.gni index 9dfc47826b..95d2b00d2e 100644 --- a/gn/core.gni +++ b/gn/core.gni @@ -34,8 +34,6 @@ skia_core_sources = [ "$_src/core/SkThreadedBMPDevice.cpp", "$_src/core/SkThreadedBMPDevice.h", "$_src/core/SkBitmapFilter.h", - "$_src/core/SkBitmapProcShader.cpp", - "$_src/core/SkBitmapProcShader.h", "$_src/core/SkBitmapProcState.cpp", "$_src/core/SkBitmapProcState.h", "$_src/core/SkBitmapProcState_filter.h", @@ -74,13 +72,10 @@ skia_core_sources = [ "$_src/core/SkClipStackDevice.h", "$_src/core/SkColor.cpp", "$_src/core/SkColorFilter.cpp", - "$_src/core/SkColorFilterShader.cpp", "$_src/core/SkColorLookUpTable.cpp", "$_src/core/SkColorLookUpTable.h", "$_src/core/SkColorMatrixFilterRowMajor255.cpp", "$_src/core/SkColorMatrixFilterRowMajor255.h", - "$_src/core/SkColorShader.cpp", - "$_src/core/SkColorShader.h", "$_src/core/SkColorSpace.cpp", "$_src/core/SkColorSpace_A2B.cpp", "$_src/core/SkColorSpace_A2B.h", @@ -94,7 +89,6 @@ skia_core_sources = [ "$_src/core/SkColorSpaceXform_A2B.cpp", "$_src/core/SkColorSpaceXform_A2B.h", "$_src/core/SkColorTable.cpp", - "$_src/core/SkComposeShader.cpp", "$_src/core/SkConvertPixels.cpp", "$_src/core/SkConvertPixels.h", "$_src/core/SkConvolver.cpp", @@ -130,7 +124,6 @@ skia_core_sources = [ "$_src/core/SkEdgeBuilder.h", "$_src/core/SkEdgeClipper.cpp", "$_src/core/SkEdgeClipper.h", - "$_src/core/SkEmptyShader.h", "$_src/core/SkEndian.h", "$_src/core/SkExecutor.cpp", "$_src/core/SkAnalyticEdge.cpp", @@ -173,8 +166,6 @@ skia_core_sources = [ "$_src/core/SkImageInfo.cpp", "$_src/core/SkImageCacherator.h", "$_src/core/SkImageGenerator.cpp", - "$_src/core/SkLightingShader.h", - "$_src/core/SkLightingShader.cpp", "$_src/core/SkLights.cpp", "$_src/core/SkLinearBitmapPipeline.cpp", "$_src/core/SkLinearBitmapPipeline.h", @@ -187,7 +178,6 @@ skia_core_sources = [ "$_src/core/SkLiteRecorder.cpp", "$_src/core/SkLocalMatrixImageFilter.cpp", "$_src/core/SkLocalMatrixImageFilter.h", - "$_src/core/SkLocalMatrixShader.cpp", "$_src/core/SkMD5.cpp", "$_src/core/SkMD5.h", "$_src/core/SkMallocPixelRef.cpp", @@ -254,8 +244,6 @@ skia_core_sources = [ "$_src/core/SkPictureRecord.cpp", "$_src/core/SkPictureRecord.h", "$_src/core/SkPictureRecorder.cpp", - "$_src/core/SkPictureShader.cpp", - "$_src/core/SkPictureShader.h", "$_src/core/SkPixelRef.cpp", "$_src/core/SkPixmap.cpp", "$_src/core/SkPoint.cpp", @@ -301,8 +289,6 @@ skia_core_sources = [ "$_src/core/SkScan_Hairline.cpp", "$_src/core/SkScan_Path.cpp", "$_src/core/SkSemaphore.cpp", - "$_src/core/SkShader.cpp", - "$_src/core/SkShaderBase.h", "$_src/core/SkSharedMutex.cpp", "$_src/core/SkSharedMutex.h", "$_src/core/SkSinglyLinkedList.h", @@ -377,8 +363,6 @@ skia_core_sources = [ # "$_src/image/SkImage_Gpu.cpp", "$_src/image/SkImage_Lazy.cpp", "$_src/image/SkImage_Raster.cpp", - "$_src/image/SkImageShader.cpp", - "$_src/image/SkImageShader.h", "$_src/image/SkSurface.cpp", "$_src/image/SkSurface_Base.h", @@ -388,6 +372,26 @@ skia_core_sources = [ "$_src/pipe/SkPipeCanvas.cpp", "$_src/pipe/SkPipeReader.cpp", + "$_src/shaders/SkBitmapProcShader.cpp", + "$_src/shaders/SkBitmapProcShader.h", + "$_src/shaders/SkColorFilterShader.cpp", + "$_src/shaders/SkColorFilterShader.h", + "$_src/shaders/SkColorShader.cpp", + "$_src/shaders/SkColorShader.h", + "$_src/shaders/SkComposeShader.cpp", + "$_src/shaders/SkComposeShader.h", + "$_src/shaders/SkEmptyShader.h", + "$_src/shaders/SkImageShader.cpp", + "$_src/shaders/SkImageShader.h", + "$_src/shaders/SkLightingShader.cpp", + "$_src/shaders/SkLightingShader.h", + "$_src/shaders/SkLocalMatrixShader.cpp", + "$_src/shaders/SkLocalMatrixShader.h", + "$_src/shaders/SkPictureShader.cpp", + "$_src/shaders/SkPictureShader.h", + "$_src/shaders/SkShader.cpp", + "$_src/shaders/SkShaderBase.h", + "$_include/core/SkBBHFactory.h", "$_include/core/SkBitmap.h", "$_include/core/SkCanvas.h", diff --git a/gn/effects.gni b/gn/effects.gni index 278925ba85..3fd8e531a6 100644 --- a/gn/effects.gni +++ b/gn/effects.gni @@ -56,7 +56,6 @@ 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", @@ -64,27 +63,28 @@ skia_effects_sources = [ "$_src/effects/SkTileImageFilter.cpp", "$_src/effects/SkXfermodeImageFilter.cpp", - "$_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", + "$_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", "$_include/effects/Sk1DPathEffect.h", "$_include/effects/Sk2DPathEffect.h", |