diff options
author | Brian Salomon <bsalomon@google.com> | 2017-04-08 02:53:30 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-08 02:53:38 +0000 |
commit | 5dac9b3b5bf7e9c06c207cb92e257535c7d9ec95 (patch) | |
tree | 78054390590c5388b9a12525d1fee763ba3f105c /tests | |
parent | 0ae0e23696f2ef08503040f8c02765eb58b26ddf (diff) |
Revert "Create GrXferProcessor while doing GrProcessorSet analysis."
This reverts commit 0ae0e23696f2ef08503040f8c02765eb58b26ddf.
Reason for revert: static assert failure on ios build
Original change's description:
> Create GrXferProcessor while doing GrProcessorSet analysis.
>
>
> Bug: skia:
> Change-Id: I62a628f9c0536ffb05c8f9d0c9ded5657f93b48e
> Reviewed-on: https://skia-review.googlesource.com/11482
> Reviewed-by: Greg Daniel <egdaniel@google.com>
> Commit-Queue: Brian Salomon <bsalomon@google.com>
>
TBR=egdaniel@google.com,bsalomon@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: Ifd57367b0326dd2b53c622705a868e246645d589
Reviewed-on: https://skia-review.googlesource.com/12104
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/GpuSampleLocationsTest.cpp | 18 | ||||
-rw-r--r-- | tests/GrPorterDuffTest.cpp | 20 |
2 files changed, 18 insertions, 20 deletions
diff --git a/tests/GpuSampleLocationsTest.cpp b/tests/GpuSampleLocationsTest.cpp index 26d7e70148..75fa6fcf65 100644 --- a/tests/GpuSampleLocationsTest.cpp +++ b/tests/GpuSampleLocationsTest.cpp @@ -91,8 +91,17 @@ public: virtual ~TestSampleLocationsInterface() {} }; -static sk_sp<GrPipeline> construct_dummy_pipeline(GrRenderTargetContext* dc) { - return sk_sp<GrPipeline>(new GrPipeline(dc->accessRenderTarget(), SkBlendMode::kSrcOver)); +static void construct_dummy_pipeline(GrRenderTargetContext* dc, GrPipeline* pipeline) { + GrPipelineBuilder dummyBuilder(GrPaint(), GrAAType::kNone); + GrScissorState dummyScissor; + GrWindowRectsState dummyWindows; + + GrPipeline::InitArgs args; + dummyBuilder.getPipelineInitArgs(&args); + args.fRenderTarget = dc->accessRenderTarget(); + args.fCaps = dc->caps(); + args.fDstTexture = GrXferProcessor::DstTexture(); + pipeline->init(args); } void assert_equal(skiatest::Reporter* reporter, const SamplePattern& pattern, @@ -137,10 +146,11 @@ void test_sampleLocations(skiatest::Reporter* reporter, TestSampleLocationsInter for (int i = 0; i < numTestPatterns; ++i) { testInterface->overrideSamplePattern(kTestPatterns[i]); for (GrRenderTargetContext* dc : {bottomUps[i].get(), topDowns[i].get()}) { - sk_sp<GrPipeline> dummyPipeline = construct_dummy_pipeline(dc); + GrPipeline dummyPipeline; + construct_dummy_pipeline(dc, &dummyPipeline); GrRenderTarget* rt = dc->accessRenderTarget(); assert_equal(reporter, kTestPatterns[i], - rt->renderTargetPriv().getMultisampleSpecs(*dummyPipeline), + rt->renderTargetPriv().getMultisampleSpecs(dummyPipeline), kBottomLeft_GrSurfaceOrigin == rt->origin()); } } diff --git a/tests/GrPorterDuffTest.cpp b/tests/GrPorterDuffTest.cpp index 4066d28503..f2bd1e729d 100644 --- a/tests/GrPorterDuffTest.cpp +++ b/tests/GrPorterDuffTest.cpp @@ -55,30 +55,16 @@ 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 = do_analysis(xpf, inputColor, inputCoverage, caps); + GrProcessorSet::Analysis analysis(inputColor, inputCoverage, xpf, caps); fCompatibleWithCoverageAsAlpha = analysis.isCompatibleWithCoverageAsAlpha(); fCanCombineOverlappedStencilAndCover = analysis.canCombineOverlappedStencilAndCover(); - fIgnoresInputColor = analysis.inputColorIsIgnored(); + fIgnoresInputColor = analysis.isInputColorIgnored(); sk_sp<GrXferProcessor> xp( GrXPFactory::MakeXferProcessor(xpf, inputColor, inputCoverage, false, caps)); TEST_ASSERT(!analysis.requiresDstTexture()); @@ -1054,6 +1040,8 @@ 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) { |