diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-06-15 12:07:18 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-06-15 17:18:19 +0000 |
| commit | fbcef6eb8abad142daf45418516550f7635b4a52 (patch) | |
| tree | 1fb2b2a1df72ba87ec05a91bd1cd271e24b5544e /src/effects/SkMagnifierImageFilter.cpp | |
| parent | baaf439eb5d08097d794f13800e5bf7ce8885f95 (diff) | |
Clean up GrResourceProvider usage
The only substantive changes are the removal of GrProxy instantiation in:
SkGpuBlurUtils::GaussianBlur
GrSimpleTextureEffect::Make*
Change-Id: I10970609693bd6ff5b3a3c21b41d82642bb277bc
Reviewed-on: https://skia-review.googlesource.com/19965
Reviewed-by: Greg Daniel <egdaniel@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/effects/SkMagnifierImageFilter.cpp')
| -rw-r--r-- | src/effects/SkMagnifierImageFilter.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/effects/SkMagnifierImageFilter.cpp b/src/effects/SkMagnifierImageFilter.cpp index 1927715539..5e4b466d96 100644 --- a/src/effects/SkMagnifierImageFilter.cpp +++ b/src/effects/SkMagnifierImageFilter.cpp @@ -49,8 +49,7 @@ sk_sp<SkImageFilter> SkMagnifierImageFilter::Make(const SkRect& srcRect, SkScala #if SK_SUPPORT_GPU class GrMagnifierEffect : public GrSingleTextureEffect { public: - static sk_sp<GrFragmentProcessor> Make(GrResourceProvider* resourceProvider, - sk_sp<GrTextureProxy> proxy, + static sk_sp<GrFragmentProcessor> Make(sk_sp<GrTextureProxy> proxy, sk_sp<GrColorSpaceXform> colorSpaceXform, const SkIRect& bounds, const SkRect& srcRect, @@ -58,8 +57,7 @@ public: float yInvZoom, float xInvInset, float yInvInset) { - return sk_sp<GrFragmentProcessor>(new GrMagnifierEffect(resourceProvider, - std::move(proxy), + return sk_sp<GrFragmentProcessor>(new GrMagnifierEffect(std::move(proxy), std::move(colorSpaceXform), bounds, srcRect, xInvZoom, yInvZoom, @@ -82,8 +80,7 @@ public: float yInvInset() const { return fYInvInset; } private: - GrMagnifierEffect(GrResourceProvider* resourceProvider, - sk_sp<GrTextureProxy> proxy, + GrMagnifierEffect(sk_sp<GrTextureProxy> proxy, sk_sp<GrColorSpaceXform> colorSpaceXform, const SkIRect& bounds, const SkRect& srcRect, @@ -91,8 +88,7 @@ private: float yInvZoom, float xInvInset, float yInvInset) - : INHERITED{resourceProvider, - ModulationFlags(proxy->config()), + : INHERITED{ModulationFlags(proxy->config()), GR_PROXY_MOVE(proxy), std::move(colorSpaceXform), SkMatrix::I()} // TODO: no GrSamplerParams::kBilerp_FilterMode? @@ -268,7 +264,6 @@ sk_sp<GrFragmentProcessor> GrMagnifierEffect::TestCreate(GrProcessorTestData* d) SkRect srcRect = SkRect::MakeWH(SkIntToScalar(width), SkIntToScalar(height)); sk_sp<GrFragmentProcessor> effect(GrMagnifierEffect::Make( - d->resourceProvider(), std::move(proxy), std::move(colorSpaceXform), bounds, @@ -359,7 +354,6 @@ sk_sp<SkSpecialImage> SkMagnifierImageFilter::onFilterImage(SkSpecialImage* sour sk_sp<GrColorSpaceXform> colorSpaceXform = GrColorSpaceXform::Make(input->getColorSpace(), dstColorSpace); sk_sp<GrFragmentProcessor> fp(GrMagnifierEffect::Make( - context->resourceProvider(), std::move(inputProxy), std::move(colorSpaceXform), bounds, |