aboutsummaryrefslogtreecommitdiffhomepage
path: root/gn
diff options
context:
space:
mode:
authorGravatar Greg Daniel <egdaniel@google.com>2018-04-06 10:37:55 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-04-06 18:27:53 +0000
commit3e8c3458f036da88eca1225a5c6a2cce228f894e (patch)
treeb910cd1a3a25994bbf7b52effde770fae7a2fb2f /gn
parent4961a938586e3c46cf80f15ecb70a011324bfe59 (diff)
Make generated effects from sksl fp files not need SK_SUPPORT_GPU
Bug: skia: Change-Id: I42a5c7fe7dc35a23290c8daa754c9fcce07f76fb Reviewed-on: https://skia-review.googlesource.com/119010 Commit-Queue: Greg Daniel <egdaniel@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'gn')
-rw-r--r--gn/effects.gni3
-rw-r--r--gn/gpu.gni2
-rw-r--r--gn/sksl.gni2
3 files changed, 3 insertions, 4 deletions
diff --git a/gn/effects.gni b/gn/effects.gni
index 7ea768ba25..94d56e3b68 100644
--- a/gn/effects.gni
+++ b/gn/effects.gni
@@ -10,9 +10,6 @@ _include = get_path_info("../include", "abspath")
skia_effects_sources = [
"$_src/c/sk_effects.cpp",
- "$_src/effects/GrAlphaThresholdFragmentProcessor.cpp",
- "$_src/effects/GrAlphaThresholdFragmentProcessor.h",
-
"$_src/effects/Sk1DPathEffect.cpp",
"$_src/effects/Sk2DPathEffect.cpp",
"$_src/effects/SkAlphaThresholdFilter.cpp",
diff --git a/gn/gpu.gni b/gn/gpu.gni
index b3f4eb1680..c9fd2f3008 100644
--- a/gn/gpu.gni
+++ b/gn/gpu.gni
@@ -319,6 +319,8 @@ skia_gpu_sources = [
"$_src/gpu/effects/GrAARectEffect.cpp",
"$_src/gpu/effects/GrAARectEffect.h",
+ "$_src/gpu/effects/GrAlphaThresholdFragmentProcessor.cpp",
+ "$_src/gpu/effects/GrAlphaThresholdFragmentProcessor.h",
"$_src/gpu/effects/GrArithmeticFP.cpp",
"$_src/gpu/effects/GrArithmeticFP.h",
"$_src/gpu/effects/GrBlurredEdgeFragmentProcessor.cpp",
diff --git a/gn/sksl.gni b/gn/sksl.gni
index 4a223573b4..bce75c8599 100644
--- a/gn/sksl.gni
+++ b/gn/sksl.gni
@@ -29,8 +29,8 @@ skia_sksl_sources = [
]
skia_gpu_processor_sources = [
- "$_src/effects/GrAlphaThresholdFragmentProcessor.fp",
"$_src/gpu/effects/GrAARectEffect.fp",
+ "$_src/gpu/effects/GrAlphaThresholdFragmentProcessor.fp",
"$_src/gpu/effects/GrArithmeticFP.fp",
"$_src/gpu/effects/GrBlurredEdgeFragmentProcessor.fp",
"$_src/gpu/effects/GrCircleBlurFragmentProcessor.fp",