diff options
author | brianosman <brianosman@google.com> | 2016-07-22 11:04:53 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-07-22 11:04:53 -0700 |
commit | 839345d63466a4209a0985654ec033624821fd78 (patch) | |
tree | 71590a11b99b3b554a4c80096f36c759b5d68ced /src/effects/gradients/SkSweepGradient.cpp | |
parent | 8a8accbcd1958c1646246b9b994fb47a3b5a6021 (diff) |
Bundle SkShader::asFragmentProcessor arguments in a struct
The signature of this thing keeps changing (and is about to change again).
This just makes maintenance much easier.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2175563003
Review-Url: https://codereview.chromium.org/2175563003
Diffstat (limited to 'src/effects/gradients/SkSweepGradient.cpp')
-rw-r--r-- | src/effects/gradients/SkSweepGradient.cpp | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/src/effects/gradients/SkSweepGradient.cpp b/src/effects/gradients/SkSweepGradient.cpp index 9e2b909075..31f4816075 100644 --- a/src/effects/gradients/SkSweepGradient.cpp +++ b/src/effects/gradients/SkSweepGradient.cpp @@ -191,10 +191,9 @@ sk_sp<GrFragmentProcessor> GrSweepGradient::TestCreate(GrProcessorTestData* d) { int colorCount = RandomGradientParams(d->fRandom, colors, &stops, &tmIgnored); sk_sp<SkShader> shader(SkGradientShader::MakeSweep(center.fX, center.fY, colors, stops, colorCount)); - sk_sp<GrFragmentProcessor> fp = shader->asFragmentProcessor(d->fContext, - GrTest::TestMatrix(d->fRandom), - NULL, kNone_SkFilterQuality, - SkSourceGammaTreatment::kRespect); + SkMatrix viewMatrix = GrTest::TestMatrix(d->fRandom); + sk_sp<GrFragmentProcessor> fp = shader->asFragmentProcessor(SkShader::AsFPArgs( + d->fContext, &viewMatrix, NULL, kNone_SkFilterQuality, SkSourceGammaTreatment::kRespect)); GrAlwaysAssert(fp); return fp; } @@ -227,27 +226,22 @@ void GrGLSweepGradient::emitCode(EmitArgs& args) { ///////////////////////////////////////////////////////////////////// -sk_sp<GrFragmentProcessor> SkSweepGradient::asFragmentProcessor( - GrContext* context, - const SkMatrix& viewM, - const SkMatrix* localMatrix, - SkFilterQuality, - SkSourceGammaTreatment) const { +sk_sp<GrFragmentProcessor> SkSweepGradient::asFragmentProcessor(const AsFPArgs& args) const { SkMatrix matrix; if (!this->getLocalMatrix().invert(&matrix)) { return nullptr; } - if (localMatrix) { + if (args.fLocalMatrix) { SkMatrix inv; - if (!localMatrix->invert(&inv)) { + if (!args.fLocalMatrix->invert(&inv)) { return nullptr; } matrix.postConcat(inv); } matrix.postConcat(fPtsToUnit); - sk_sp<GrFragmentProcessor> inner(GrSweepGradient::Make(context, *this, matrix)); + sk_sp<GrFragmentProcessor> inner(GrSweepGradient::Make(args.fContext, *this, matrix)); return GrFragmentProcessor::MulOutputByInputAlpha(std::move(inner)); } |