diff options
author | 2017-07-10 13:12:07 +0000 | |
---|---|---|
committer | 2017-07-10 13:35:25 +0000 | |
commit | 818ac5a00dfd570d2b291b7524a70ecd4ef55770 (patch) | |
tree | f0992c09dc6825729cbdf29fd155243f8150058a /src/effects/GrAlphaThresholdFragmentProcessor.h | |
parent | 086ce11386849c445a99c7bb8c43947f54618a75 (diff) |
Revert "converted GrCircleBlurFragmentProcessor to sksl"
This reverts commit 9b80ffc77b8000b493eb1226dc6ec21f1e99edfc.
Reason for revert: breaking ANGLE and Android Vulkan GMs
Original change's description:
> converted GrCircleBlurFragmentProcessor to sksl
>
> Bug: skia:
> Change-Id: I1b70ba2003c9e9de2b5b9acadaf25c9ed59b1198
> Reviewed-on: https://skia-review.googlesource.com/21727
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
TBR=bsalomon@google.com,ethannicholas@google.com
# Not skipping CQ checks because original CL landed > 1 day ago.
Bug: skia:
Change-Id: Ia313013b4354b34fa5a02bdb16d007a462c5ca94
Reviewed-on: https://skia-review.googlesource.com/22028
Reviewed-by: Ethan Nicholas <ethannicholas@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
Diffstat (limited to 'src/effects/GrAlphaThresholdFragmentProcessor.h')
-rw-r--r-- | src/effects/GrAlphaThresholdFragmentProcessor.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/effects/GrAlphaThresholdFragmentProcessor.h b/src/effects/GrAlphaThresholdFragmentProcessor.h index 702b6aeb88..80e4e0b718 100644 --- a/src/effects/GrAlphaThresholdFragmentProcessor.h +++ b/src/effects/GrAlphaThresholdFragmentProcessor.h @@ -10,9 +10,9 @@ */ #ifndef GrAlphaThresholdFragmentProcessor_DEFINED #define GrAlphaThresholdFragmentProcessor_DEFINED -#include "SkTypes.h" -#if SK_SUPPORT_GPU + #include "SkTypes.h" + #if SK_SUPPORT_GPU #include "GrColorSpaceXform.h" #include "GrFragmentProcessor.h" #include "GrCoordTransform.h" @@ -75,5 +75,6 @@ private: float fOuterThreshold; typedef GrFragmentProcessor INHERITED; }; -#endif + + #endif #endif |