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/GrBitmapTextGeoProc.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/GrBitmapTextGeoProc.cpp')
| -rw-r--r-- | src/gpu/effects/GrBitmapTextGeoProc.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/gpu/effects/GrBitmapTextGeoProc.cpp b/src/gpu/effects/GrBitmapTextGeoProc.cpp index eb9b7b8c7d..9de3b463c4 100644 --- a/src/gpu/effects/GrBitmapTextGeoProc.cpp +++ b/src/gpu/effects/GrBitmapTextGeoProc.cpp @@ -114,14 +114,14 @@ private: /////////////////////////////////////////////////////////////////////////////// -GrBitmapTextGeoProc::GrBitmapTextGeoProc(GrResourceProvider* resourceProvider, GrColor color, +GrBitmapTextGeoProc::GrBitmapTextGeoProc(GrColor color, sk_sp<GrTextureProxy> proxy, const GrSamplerParams& params, GrMaskFormat format, const SkMatrix& localMatrix, bool usesLocalCoords) : fColor(color) , fLocalMatrix(localMatrix) , fUsesLocalCoords(usesLocalCoords) - , fTextureSampler(resourceProvider, std::move(proxy), params) + , fTextureSampler(std::move(proxy), params) , fInColor(nullptr) , fMaskFormat(format) { this->initClassID<GrBitmapTextGeoProc>(); @@ -181,8 +181,7 @@ sk_sp<GrGeometryProcessor> GrBitmapTextGeoProc::TestCreate(GrProcessorTestData* break; } - return GrBitmapTextGeoProc::Make(d->resourceProvider(), GrRandomColor(d->fRandom), - std::move(proxy), + return GrBitmapTextGeoProc::Make(GrRandomColor(d->fRandom), std::move(proxy), params, format, GrTest::TestMatrix(d->fRandom), d->fRandom->nextBool()); } |