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/gpu/effects/GrMatrixConvolutionEffect.h | |
| 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/gpu/effects/GrMatrixConvolutionEffect.h')
| -rw-r--r-- | src/gpu/effects/GrMatrixConvolutionEffect.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/gpu/effects/GrMatrixConvolutionEffect.h b/src/gpu/effects/GrMatrixConvolutionEffect.h index 6104f11402..ffd05fa06f 100644 --- a/src/gpu/effects/GrMatrixConvolutionEffect.h +++ b/src/gpu/effects/GrMatrixConvolutionEffect.h @@ -17,8 +17,7 @@ class GrMatrixConvolutionEffect : public GrSingleTextureEffect { public: - static sk_sp<GrFragmentProcessor> Make(GrResourceProvider* resourceProvider, - sk_sp<GrTextureProxy> proxy, + static sk_sp<GrFragmentProcessor> Make(sk_sp<GrTextureProxy> proxy, const SkIRect& bounds, const SkISize& kernelSize, const SkScalar* kernel, @@ -28,12 +27,11 @@ public: GrTextureDomain::Mode tileMode, bool convolveAlpha) { return sk_sp<GrFragmentProcessor>( - new GrMatrixConvolutionEffect(resourceProvider, std::move(proxy), bounds, kernelSize, + new GrMatrixConvolutionEffect(std::move(proxy), bounds, kernelSize, kernel, gain, bias, kernelOffset, tileMode, convolveAlpha)); } - static sk_sp<GrFragmentProcessor> MakeGaussian(GrResourceProvider*, - sk_sp<GrTextureProxy> proxy, + static sk_sp<GrFragmentProcessor> MakeGaussian(sk_sp<GrTextureProxy> proxy, const SkIRect& bounds, const SkISize& kernelSize, SkScalar gain, @@ -56,8 +54,7 @@ public: const char* name() const override { return "MatrixConvolution"; } private: - GrMatrixConvolutionEffect(GrResourceProvider*, - sk_sp<GrTextureProxy> proxy, + GrMatrixConvolutionEffect(sk_sp<GrTextureProxy> proxy, const SkIRect& bounds, const SkISize& kernelSize, const SkScalar* kernel, |