diff options
| author |  Ethan Nicholas <ethannicholas@google.com> | 2017-07-10 15:40:20 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-07-11 13:50:51 +0000 |
| commit | ceb4d48ef4839aab9d99d0200dcfe403ccd0cdf3 (patch) | |
| tree | fe8daf04d9a10810747e78e9a340e8d89ff90692 /src/gpu | |
| parent | 815486c42f1ca66c81e12d8ccc9fb142e3c10544 (diff) | |
Re-land "converted GrCircleBlurFragmentProcessor to sksl"
This reverts commit 818ac5a00dfd570d2b291b7524a70ecd4ef55770.
Bug: skia:
Change-Id: I9bd8a06bd2dbb40bd261d64d6d04daf864bc00a5
Reviewed-on: https://skia-review.googlesource.com/22075
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/gpu')
| -rw-r--r-- | src/gpu/effects/GrDitherEffect.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/effects/GrDitherEffect.h | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/gpu/effects/GrDitherEffect.cpp b/src/gpu/effects/GrDitherEffect.cpp index 8c24d78843..370e0eedd1 100644 --- a/src/gpu/effects/GrDitherEffect.cpp +++ b/src/gpu/effects/GrDitherEffect.cpp @@ -9,6 +9,7 @@ * This file was autogenerated from GrDitherEffect.fp; do not modify. */ #include "GrDitherEffect.h" +#if SK_SUPPORT_GPU #include "glsl/GrGLSLColorSpaceXformHelper.h" #include "glsl/GrGLSLFragmentProcessor.h" #include "glsl/GrGLSLFragmentShaderBuilder.h" @@ -45,3 +46,4 @@ sk_sp<GrFragmentProcessor> GrDitherEffect::TestCreate(GrProcessorTestData* testD return GrDitherEffect::Make(); } #endif +#endif diff --git a/src/gpu/effects/GrDitherEffect.h b/src/gpu/effects/GrDitherEffect.h index cbb626424c..d0bf9a9f9c 100644 --- a/src/gpu/effects/GrDitherEffect.h +++ b/src/gpu/effects/GrDitherEffect.h @@ -10,6 +10,8 @@ */ #ifndef GrDitherEffect_DEFINED #define GrDitherEffect_DEFINED +#include "SkTypes.h" +#if SK_SUPPORT_GPU #include "GrFragmentProcessor.h" #include "GrCoordTransform.h" #include "effects/GrProxyMove.h" @@ -31,3 +33,4 @@ private: typedef GrFragmentProcessor INHERITED; }; #endif +#endif |