From 6c48e4d11ce80fa5cfef56e13b2d5847fe94a7cc Mon Sep 17 00:00:00 2001 From: Ethan Nicholas Date: Thu, 19 Jul 2018 20:10:37 +0000 Subject: Reland "Revert "added GrSkSLFP and converted DitherEffect to use it"" This reverts commit 97ae0c89025dfd791047f5701e57d58da37c125c. Reason for revert: Breaking ANGLE. Original change's description: > 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 > Reviewed-by: Brian Salomon TBR=bsalomon@google.com,robertphillips@google.com,ethannicholas@google.com Change-Id: I65d6d2707fceab0a99121c528d1b848d23e34bfa No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/142588 Reviewed-by: Ethan Nicholas Commit-Queue: Ethan Nicholas --- gn/gpu.gni | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gn/gpu.gni') diff --git a/gn/gpu.gni b/gn/gpu.gni index 51a0dc29ec..6cac050820 100644 --- a/gn/gpu.gni +++ b/gn/gpu.gni @@ -364,6 +364,8 @@ 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", @@ -392,8 +394,6 @@ 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", -- cgit v1.2.3