From 818ac5a00dfd570d2b291b7524a70ecd4ef55770 Mon Sep 17 00:00:00 2001 From: Ethan Nicholas Date: Mon, 10 Jul 2017 13:12:07 +0000 Subject: 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 > Reviewed-by: Brian Salomon 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 Commit-Queue: Ethan Nicholas --- src/effects/GrAlphaThresholdFragmentProcessor.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/effects/GrAlphaThresholdFragmentProcessor.cpp') diff --git a/src/effects/GrAlphaThresholdFragmentProcessor.cpp b/src/effects/GrAlphaThresholdFragmentProcessor.cpp index dd26ac5ffd..51869f3c46 100644 --- a/src/effects/GrAlphaThresholdFragmentProcessor.cpp +++ b/src/effects/GrAlphaThresholdFragmentProcessor.cpp @@ -9,8 +9,8 @@ * This file was autogenerated from GrAlphaThresholdFragmentProcessor.fp; do not modify. */ #include "GrAlphaThresholdFragmentProcessor.h" -#if SK_SUPPORT_GPU + #if SK_SUPPORT_GPU inline GrFragmentProcessor::OptimizationFlags GrAlphaThresholdFragmentProcessor::optFlags( float outerThreshold) { if (outerThreshold >= 1.0) { @@ -98,4 +98,5 @@ sk_sp GrAlphaThresholdFragmentProcessor::TestCreate(GrProce bounds); } #endif -#endif + + #endif -- cgit v1.2.3