diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-04-04 15:17:03 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-04 20:07:34 +0000 |
| commit | a076d8711d24b8181f894038a4fd34d5327f1717 (patch) | |
| tree | a21a88286fd99db304441440a22341bc1daea2fa /tests/GrPorterDuffTest.cpp | |
| parent | a08104abf2850546d97c5d33f5fb5fabedf45466 (diff) | |
Use sk_sp with GrXferProcessor and use a static factory to handle the nullptr==srcover case.
Bug: skia:
Change-Id: I9c07069fc2aae24fc2884c18939e3a649afc27e7
Reviewed-on: https://skia-review.googlesource.com/11282
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'tests/GrPorterDuffTest.cpp')
| -rw-r--r-- | tests/GrPorterDuffTest.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/GrPorterDuffTest.cpp b/tests/GrPorterDuffTest.cpp index 28465c2e81..f2bd1e729d 100644 --- a/tests/GrPorterDuffTest.cpp +++ b/tests/GrPorterDuffTest.cpp @@ -66,7 +66,7 @@ public: fCanCombineOverlappedStencilAndCover = analysis.canCombineOverlappedStencilAndCover(); fIgnoresInputColor = analysis.isInputColorIgnored(); sk_sp<GrXferProcessor> xp( - xpf->createXferProcessor(inputColor, inputCoverage, false, caps)); + GrXPFactory::MakeXferProcessor(xpf, inputColor, inputCoverage, false, caps)); TEST_ASSERT(!analysis.requiresDstTexture()); GetXPOutputTypes(xp.get(), &fPrimaryOutputType, &fSecondaryOutputType); xp->getBlendInfo(&fBlendInfo); @@ -992,7 +992,7 @@ static void test_lcd_coverage_fallback_case(skiatest::Reporter* reporter, const GrProcessorAnalysisCoverage coverage = GrProcessorAnalysisCoverage::kLCD; SkASSERT(!(GrXPFactory::GetAnalysisProperties(xpf, color, coverage, caps) & GrXPFactory::AnalysisProperties::kRequiresDstTexture)); - sk_sp<GrXferProcessor> xp(xpf->createXferProcessor(color, coverage, false, caps)); + sk_sp<GrXferProcessor> xp(GrXPFactory::MakeXferProcessor(xpf, color, coverage, false, caps)); if (!xp) { ERRORF(reporter, "Failed to create an XP with LCD coverage."); return; @@ -1043,7 +1043,7 @@ DEF_GPUTEST(PorterDuffNoDualSourceBlending, reporter, /*factory*/) { GrProcessorSet::Analysis analysis; analysis = GrProcessorSet::Analysis(colorInput, coverageType, xpf, caps); sk_sp<GrXferProcessor> xp( - xpf->createXferProcessor(colorInput, coverageType, false, caps)); + GrXPFactory::MakeXferProcessor(xpf, colorInput, coverageType, false, caps)); if (!xp) { ERRORF(reporter, "Failed to create an XP without dual source blending."); return; |