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/ops/GrAtlasTextOp.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/ops/GrAtlasTextOp.cpp')
| -rw-r--r-- | src/gpu/ops/GrAtlasTextOp.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/gpu/ops/GrAtlasTextOp.cpp b/src/gpu/ops/GrAtlasTextOp.cpp index c854a8b54d..20a5b4f5d8 100644 --- a/src/gpu/ops/GrAtlasTextOp.cpp +++ b/src/gpu/ops/GrAtlasTextOp.cpp @@ -88,13 +88,11 @@ void GrAtlasTextOp::onPrepareDraws(Target* target) const { FlushInfo flushInfo; if (this->usesDistanceFields()) { flushInfo.fGeometryProcessor = - this->setupDfProcessor(fFontCache->context()->resourceProvider(), - this->viewMatrix(), + this->setupDfProcessor(this->viewMatrix(), fLuminanceColor, this->color(), std::move(proxy)); } else { GrSamplerParams params(SkShader::kClamp_TileMode, GrSamplerParams::kNone_FilterMode); flushInfo.fGeometryProcessor = GrBitmapTextGeoProc::Make( - fFontCache->context()->resourceProvider(), this->color(), std::move(proxy), params, maskFormat, localMatrix, this->usesLocalCoords()); } @@ -213,8 +211,7 @@ bool GrAtlasTextOp::onCombineIfPossible(GrOp* t, const GrCaps& caps) { // TODO just use class params // TODO trying to figure out why lcd is so whack -sk_sp<GrGeometryProcessor> GrAtlasTextOp::setupDfProcessor(GrResourceProvider* resourceProvider, - const SkMatrix& viewMatrix, +sk_sp<GrGeometryProcessor> GrAtlasTextOp::setupDfProcessor(const SkMatrix& viewMatrix, SkColor luminanceColor, GrColor color, sk_sp<GrTextureProxy> proxy) const { @@ -243,8 +240,7 @@ sk_sp<GrGeometryProcessor> GrAtlasTextOp::setupDfProcessor(GrResourceProvider* r GrDistanceFieldLCDTextGeoProc::DistanceAdjust::Make( redCorrection, greenCorrection, blueCorrection); - return GrDistanceFieldLCDTextGeoProc::Make(resourceProvider, - color, viewMatrix, std::move(proxy), + return GrDistanceFieldLCDTextGeoProc::Make(color, viewMatrix, std::move(proxy), params, widthAdjust, flags, this->usesLocalCoords()); } else { @@ -252,12 +248,12 @@ sk_sp<GrGeometryProcessor> GrAtlasTextOp::setupDfProcessor(GrResourceProvider* r U8CPU lum = SkColorSpaceLuminance::computeLuminance(SK_GAMMA_EXPONENT, luminanceColor); float correction = fDistanceAdjustTable->getAdjustment(lum >> kDistanceAdjustLumShift, fUseGammaCorrectDistanceTable); - return GrDistanceFieldA8TextGeoProc::Make(resourceProvider, color, + return GrDistanceFieldA8TextGeoProc::Make(color, viewMatrix, std::move(proxy), params, correction, flags, this->usesLocalCoords()); #else - return GrDistanceFieldA8TextGeoProc::Make(resourceProvider, color, + return GrDistanceFieldA8TextGeoProc::Make(color, viewMatrix, std::move(proxy), params, flags, this->usesLocalCoords()); #endif |