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/GrSingleTextureEffect.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/gpu/effects/GrSingleTextureEffect.cpp')
| -rw-r--r-- | src/gpu/effects/GrSingleTextureEffect.cpp | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/gpu/effects/GrSingleTextureEffect.cpp b/src/gpu/effects/GrSingleTextureEffect.cpp index f5d70003e6..9dbf32d9c9 100644 --- a/src/gpu/effects/GrSingleTextureEffect.cpp +++ b/src/gpu/effects/GrSingleTextureEffect.cpp @@ -9,41 +9,38 @@ #include "GrTextureProxy.h" -GrSingleTextureEffect::GrSingleTextureEffect(GrResourceProvider* resourceProvider, - OptimizationFlags optFlags, +GrSingleTextureEffect::GrSingleTextureEffect(OptimizationFlags optFlags, sk_sp<GrTextureProxy> proxy, sk_sp<GrColorSpaceXform> colorSpaceXform, const SkMatrix& m) : INHERITED(optFlags) - , fCoordTransform(resourceProvider, m, proxy.get()) - , fTextureSampler(resourceProvider, std::move(proxy)) + , fCoordTransform(m, proxy.get()) + , fTextureSampler(std::move(proxy)) , fColorSpaceXform(std::move(colorSpaceXform)) { this->addCoordTransform(&fCoordTransform); this->addTextureSampler(&fTextureSampler); } -GrSingleTextureEffect::GrSingleTextureEffect(GrResourceProvider* resourceProvider, - OptimizationFlags optFlags, +GrSingleTextureEffect::GrSingleTextureEffect(OptimizationFlags optFlags, sk_sp<GrTextureProxy> proxy, sk_sp<GrColorSpaceXform> colorSpaceXform, const SkMatrix& m, GrSamplerParams::FilterMode filterMode) : INHERITED(optFlags) - , fCoordTransform(resourceProvider, m, proxy.get()) - , fTextureSampler(resourceProvider, std::move(proxy), filterMode) + , fCoordTransform(m, proxy.get()) + , fTextureSampler(std::move(proxy), filterMode) , fColorSpaceXform(std::move(colorSpaceXform)) { this->addCoordTransform(&fCoordTransform); this->addTextureSampler(&fTextureSampler); } -GrSingleTextureEffect::GrSingleTextureEffect(GrResourceProvider* resourceProvider, - OptimizationFlags optFlags, +GrSingleTextureEffect::GrSingleTextureEffect(OptimizationFlags optFlags, sk_sp<GrTextureProxy> proxy, sk_sp<GrColorSpaceXform> colorSpaceXform, const SkMatrix& m, const GrSamplerParams& params) : INHERITED(optFlags) - , fCoordTransform(resourceProvider, m, proxy.get()) - , fTextureSampler(resourceProvider, std::move(proxy), params) + , fCoordTransform(m, proxy.get()) + , fTextureSampler(std::move(proxy), params) , fColorSpaceXform(std::move(colorSpaceXform)) { this->addCoordTransform(&fCoordTransform); this->addTextureSampler(&fTextureSampler); |