diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-04-08 07:38:53 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-08 12:17:11 +0000 |
| commit | 48d1b4c2b2c0f41a10376ed657cde043d8f11979 (patch) | |
| tree | 5d970e48864be1d57809f14e136f5da9b388eb61 /tests/GrPorterDuffTest.cpp | |
| parent | 5dac9b3b5bf7e9c06c207cb92e257535c7d9ec95 (diff) | |
Revert "Revert "Create GrXferProcessor while doing GrProcessorSet analysis.""
This reverts commit 5dac9b3b5bf7e9c06c207cb92e257535c7d9ec95.
Bug: skia:
Change-Id: I3db2ec6776eb10c1f863b3992a2c8048c54b130f
Reviewed-on: https://skia-review.googlesource.com/12620
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'tests/GrPorterDuffTest.cpp')
| -rw-r--r-- | tests/GrPorterDuffTest.cpp | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/tests/GrPorterDuffTest.cpp b/tests/GrPorterDuffTest.cpp index f2bd1e729d..4066d28503 100644 --- a/tests/GrPorterDuffTest.cpp +++ b/tests/GrPorterDuffTest.cpp @@ -55,16 +55,30 @@ enum { kISCModulate_OutputType }; +static GrProcessorSet::Analysis do_analysis(const GrXPFactory* xpf, + const GrProcessorAnalysisColor& colorInput, + GrProcessorAnalysisCoverage coverageInput, + const GrCaps& caps) { + GrPaint paint; + paint.setXPFactory(xpf); + GrProcessorSet procs(std::move(paint)); + GrColor overrideColor; + GrProcessorSet::Analysis analysis = + procs.finalize(colorInput, coverageInput, nullptr, false, caps, &overrideColor); + return analysis; +} + class GrPorterDuffTest { public: struct XPInfo { XPInfo(skiatest::Reporter* reporter, SkBlendMode xfermode, const GrCaps& caps, GrProcessorAnalysisColor inputColor, GrProcessorAnalysisCoverage inputCoverage) { const GrXPFactory* xpf = GrPorterDuffXPFactory::Get(xfermode); - GrProcessorSet::Analysis analysis(inputColor, inputCoverage, xpf, caps); + + GrProcessorSet::Analysis analysis = do_analysis(xpf, inputColor, inputCoverage, caps); fCompatibleWithCoverageAsAlpha = analysis.isCompatibleWithCoverageAsAlpha(); fCanCombineOverlappedStencilAndCover = analysis.canCombineOverlappedStencilAndCover(); - fIgnoresInputColor = analysis.isInputColorIgnored(); + fIgnoresInputColor = analysis.inputColorIsIgnored(); sk_sp<GrXferProcessor> xp( GrXPFactory::MakeXferProcessor(xpf, inputColor, inputCoverage, false, caps)); TEST_ASSERT(!analysis.requiresDstTexture()); @@ -1040,8 +1054,6 @@ DEF_GPUTEST(PorterDuffNoDualSourceBlending, reporter, /*factory*/) { for (int m = 0; m <= (int)SkBlendMode::kLastCoeffMode; m++) { SkBlendMode xfermode = static_cast<SkBlendMode>(m); const GrXPFactory* xpf = GrPorterDuffXPFactory::Get(xfermode); - GrProcessorSet::Analysis analysis; - analysis = GrProcessorSet::Analysis(colorInput, coverageType, xpf, caps); sk_sp<GrXferProcessor> xp( GrXPFactory::MakeXferProcessor(xpf, colorInput, coverageType, false, caps)); if (!xp) { |