diff options
Diffstat (limited to 'src/gpu')
| -rw-r--r-- | src/gpu/effects/GrRRectBlurEffect.cpp | 4 | ||||
| -rw-r--r-- | src/gpu/effects/GrRRectBlurEffect.fp | 19 | ||||
| -rw-r--r-- | src/gpu/effects/GrRRectBlurEffect.h | 1 |
3 files changed, 13 insertions, 11 deletions
diff --git a/src/gpu/effects/GrRRectBlurEffect.cpp b/src/gpu/effects/GrRRectBlurEffect.cpp index b307946d0c..efb168a565 100644 --- a/src/gpu/effects/GrRRectBlurEffect.cpp +++ b/src/gpu/effects/GrRRectBlurEffect.cpp @@ -28,11 +28,11 @@ std::unique_ptr<GrFragmentProcessor> GrRRectBlurEffect::Make(GrContext* context, // width (and height) of the rrect. SkRRect rrectToDraw; SkISize size; - SkScalar ignored[SkBlurMaskFilter::kMaxDivisions]; + SkScalar ignored[kSkBlurRRectMaxDivisions]; int ignoredSize; uint32_t ignored32; - bool ninePatchable = SkBlurMaskFilter::ComputeBlurredRRectParams( + bool ninePatchable = SkComputeBlurredRRectParams( srcRRect, devRRect, SkRect::MakeEmpty(), sigma, xformedSigma, &rrectToDraw, &size, ignored, ignored, ignored, ignored, &ignoredSize, &ignoredSize, &ignored32); if (!ninePatchable) { diff --git a/src/gpu/effects/GrRRectBlurEffect.fp b/src/gpu/effects/GrRRectBlurEffect.fp index 5015cd07b4..c9e70bbba8 100644 --- a/src/gpu/effects/GrRRectBlurEffect.fp +++ b/src/gpu/effects/GrRRectBlurEffect.fp @@ -21,6 +21,7 @@ uniform half blurRadius; #include "GrRenderTargetContext.h" #include "GrStyle.h" #include "SkBlurMaskFilter.h" + #include "SkBlurPriv.h" #include "SkGpuBlurUtils.h" #include "SkRRectPriv.h" } @@ -121,18 +122,18 @@ uniform half blurRadius; // width (and height) of the rrect. SkRRect rrectToDraw; SkISize size; - SkScalar ignored[SkBlurMaskFilter::kMaxDivisions]; + SkScalar ignored[kSkBlurRRectMaxDivisions]; int ignoredSize; uint32_t ignored32; - bool ninePatchable = SkBlurMaskFilter::ComputeBlurredRRectParams(srcRRect, devRRect, - SkRect::MakeEmpty(), - sigma, xformedSigma, - &rrectToDraw, &size, - ignored, ignored, - ignored, ignored, - &ignoredSize, &ignoredSize, - &ignored32); + bool ninePatchable = SkComputeBlurredRRectParams(srcRRect, devRRect, + SkRect::MakeEmpty(), + sigma, xformedSigma, + &rrectToDraw, &size, + ignored, ignored, + ignored, ignored, + &ignoredSize, &ignoredSize, + &ignored32); if (!ninePatchable) { return nullptr; } diff --git a/src/gpu/effects/GrRRectBlurEffect.h b/src/gpu/effects/GrRRectBlurEffect.h index 0e63a92c9e..4aa0ac19db 100644 --- a/src/gpu/effects/GrRRectBlurEffect.h +++ b/src/gpu/effects/GrRRectBlurEffect.h @@ -21,6 +21,7 @@ #include "GrRenderTargetContext.h" #include "GrStyle.h" #include "SkBlurMaskFilter.h" +#include "SkBlurPriv.h" #include "SkGpuBlurUtils.h" #include "SkRRectPriv.h" #include "GrFragmentProcessor.h" |