diff options
| author |  Robert Phillips <robertphillips@google.com> | 2018-07-17 12:30:40 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-07-17 17:24:50 +0000 |
| commit | a8cdbd7431b6a27d28db1bc80d7557cedf7e66d0 (patch) | |
| tree | 3d866605d2236b31da70535f2a4263c55b01acae /gn | |
| parent | 9e0d7e4072e43495a3907bb2bac7824e8e60c368 (diff) | |
Restore SkLightingShader and associated classes
This reverts https://skia-review.googlesource.com/c/skia/+/31140 (Remove SkLightingShader and associated classes) and updates the classes to ToT
Change-Id: I3b1df1704cca8907aa00f081a7e93339b65ad4fa
Reviewed-on: https://skia-review.googlesource.com/141545
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'gn')
| -rw-r--r-- | gn/core.gni | 10 | ||||
| -rw-r--r-- | gn/gm.gni | 2 | ||||
| -rw-r--r-- | gn/samples.gni | 2 |
3 files changed, 14 insertions, 0 deletions
diff --git a/gn/core.gni b/gn/core.gni index 2f60ef8162..a226d37f47 100644 --- a/gn/core.gni +++ b/gn/core.gni @@ -165,6 +165,7 @@ skia_core_sources = [ "$_src/core/SkImageInfo.cpp", "$_src/core/SkImageCacherator.h", "$_src/core/SkImageGenerator.cpp", + "$_src/core/SkLights.cpp", "$_src/core/SkLineClipper.cpp", "$_src/core/SkLiteDL.cpp", "$_src/core/SkLiteRecorder.cpp", @@ -199,6 +200,12 @@ skia_core_sources = [ "$_src/core/SkNextID.h", "$_src/core/SkLatticeIter.cpp", "$_src/core/SkLatticeIter.h", + "$_src/core/SkNormalFlatSource.cpp", + "$_src/core/SkNormalFlatSource.h", + "$_src/core/SkNormalMapSource.cpp", + "$_src/core/SkNormalMapSource.h", + "$_src/core/SkNormalSource.cpp", + "$_src/core/SkNormalSource.h", "$_src/core/SkNx.h", "$_src/core/SkOpts.cpp", "$_src/core/SkOpts.h", @@ -374,6 +381,8 @@ skia_core_sources = [ "$_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", @@ -406,6 +415,7 @@ skia_core_sources = [ "$_include/core/SkImageFilter.h", "$_include/core/SkImageGenerator.h", "$_include/core/SkImageInfo.h", + "$_include/core/SkLights.h", "$_include/core/SkMallocPixelRef.h", "$_include/core/SkMaskFilter.h", "$_include/core/SkMath.h", @@ -198,6 +198,8 @@ gm_sources = [ "$_gm/lcdoverlap.cpp", "$_gm/lcdtext.cpp", "$_gm/lighting.cpp", + "$_gm/lightingshader.cpp", + "$_gm/lightingshader2.cpp", "$_gm/linepaths.cpp", "$_gm/localmatriximagefilter.cpp", "$_gm/localmatriximageshader.cpp", diff --git a/gn/samples.gni b/gn/samples.gni index c4678c6c60..588a0f1ca6 100644 --- a/gn/samples.gni +++ b/gn/samples.gni @@ -60,7 +60,9 @@ samples_sources = [ "$_samplecode/SampleLayerMask.cpp", "$_samplecode/SampleLayers.cpp", "$_samplecode/SampleLCD.cpp", + "$_samplecode/SampleLighting.cpp", "$_samplecode/SampleLines.cpp", + "$_samplecode/SampleLitAtlas.cpp", "$_samplecode/SampleManyRects.cpp", "$_samplecode/SampleMeasure.cpp", "$_samplecode/SampleMegaStroke.cpp", |