aboutsummaryrefslogtreecommitdiffhomepage
path: root/gn
diff options
context:
space:
mode:
authorGravatar Kevin Lubick <kjlubick@google.com>2018-06-19 12:04:18 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-06-19 12:23:21 +0000
commitf2030783094e502fb74221077a5ee7cb41287fe4 (patch)
tree7716875c2aaf120f213bb916300bf9482d260d0c /gn
parentfb3beb0591aed9fd6bf349eb5d08e0e485bcff08 (diff)
Revert "added GrSkSLFP and converted DitherEffect to use it"
This reverts commit dfbfc738a9edfff7a9804253175e380c230f3d21. Reason for revert: Seems to be breaking DDL/ASAN bots Original change's description: > added GrSkSLFP and converted DitherEffect to use it > > Bug: skia: > Change-Id: I84b71165eab1712355f3c7669cee2d33d259f3df > Reviewed-on: https://skia-review.googlesource.com/124504 > Commit-Queue: Ethan Nicholas <ethannicholas@google.com> > Reviewed-by: Brian Salomon <bsalomon@google.com> TBR=bsalomon@google.com,ethannicholas@google.com Change-Id: Ic4c3978aaba0391f2f8bb1316a456e3821a3a2f2 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/135700 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Kevin Lubick <kjlubick@google.com>
Diffstat (limited to 'gn')
-rw-r--r--gn/gpu.gni4
-rw-r--r--gn/sksl.gni2
2 files changed, 3 insertions, 3 deletions
diff --git a/gn/gpu.gni b/gn/gpu.gni
index a691a137b7..bf448ced0a 100644
--- a/gn/gpu.gni
+++ b/gn/gpu.gni
@@ -365,6 +365,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",
@@ -393,8 +395,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",
diff --git a/gn/sksl.gni b/gn/sksl.gni
index 61c9250090..bce75c8599 100644
--- a/gn/sksl.gni
+++ b/gn/sksl.gni
@@ -19,7 +19,6 @@ skia_sksl_sources = [
"$_src/sksl/SkSLLayoutLexer.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",
@@ -38,6 +37,7 @@ 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",