diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-01-09 16:00:33 +0000 |
|---|---|---|
| committer | Brian Salomon <bsalomon@google.com> | 2017-01-09 16:08:13 +0000 |
| commit | 003312a211e65f35e402d6fe80a32e23d4c94ac4 (patch) | |
| tree | 61635d3df8e7bf873c0ea08b211da03521b8a477 /tests | |
| parent | a8f80de2bc17672b4b6f26d3cf6b38123ac850c9 (diff) | |
Revert "Removing ref counting from GrXPFactory."
This reverts commit a8f80de2bc17672b4b6f26d3cf6b38123ac850c9.
Reason for revert: nanobench failing on windows bots, possibly others
Change-Id: Iacb8c650064a28654c165665be057377ffb02ba5
Reviewed-on: https://skia-review.googlesource.com/6802
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/DFPathRendererTest.cpp | 2 | ||||
| -rw-r--r-- | tests/GLProgramsTest.cpp | 6 | ||||
| -rw-r--r-- | tests/GrPorterDuffTest.cpp | 6 | ||||
| -rw-r--r-- | tests/TessellatingPathRendererTests.cpp | 2 |
4 files changed, 9 insertions, 7 deletions
diff --git a/tests/DFPathRendererTest.cpp b/tests/DFPathRendererTest.cpp index ca437da4ed..c499c081e0 100644 --- a/tests/DFPathRendererTest.cpp +++ b/tests/DFPathRendererTest.cpp @@ -42,7 +42,7 @@ static void test_far_from_origin(GrRenderTargetContext* renderTargetContext, GrP shape = shape.applyStyle(GrStyle::Apply::kPathEffectAndStrokeRec, 1.f); GrPaint paint; - paint.setXPFactory(GrPorterDuffXPFactory::Get(SkBlendMode::kSrc)); + paint.setXPFactory(GrPorterDuffXPFactory::Make(SkBlendMode::kSrc)); GrNoClip noClip; GrPathRenderer::DrawPathArgs args; diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp index 94abd1c9ee..0ab7a1ecb0 100644 --- a/tests/GLProgramsTest.cpp +++ b/tests/GLProgramsTest.cpp @@ -167,7 +167,9 @@ static sk_sp<GrRenderTargetContext> random_render_target_context(GrContext* cont } static void set_random_xpf(GrPaint* paint, GrProcessorTestData* d) { - paint->setXPFactory(GrXPFactoryTestFactory::Get(d)); + sk_sp<GrXPFactory> xpf(GrProcessorTestFactory<GrXPFactory>::Make(d)); + SkASSERT(xpf); + paint->setXPFactory(std::move(xpf)); } static sk_sp<GrFragmentProcessor> create_random_proc_tree(GrProcessorTestData* d, @@ -366,7 +368,7 @@ bool GrDrawingManager::ProgramUnitTest(GrContext* context, int maxStages) { GrProcessorTestData ptd(&random, context, context->caps(), renderTargetContext.get(), dummyTextures); GrPaint grPaint; - grPaint.setXPFactory(GrPorterDuffXPFactory::Get(SkBlendMode::kSrc)); + grPaint.setXPFactory(GrPorterDuffXPFactory::Make(SkBlendMode::kSrc)); sk_sp<GrFragmentProcessor> fp( GrProcessorTestFactory<GrFragmentProcessor>::MakeIdx(i, &ptd)); diff --git a/tests/GrPorterDuffTest.cpp b/tests/GrPorterDuffTest.cpp index 3132feeff8..19ba7b8e54 100644 --- a/tests/GrPorterDuffTest.cpp +++ b/tests/GrPorterDuffTest.cpp @@ -67,7 +67,7 @@ public: struct XPInfo { XPInfo(skiatest::Reporter* reporter, SkBlendMode xfermode, const GrCaps& caps, const GrPipelineAnalysis& analysis) { - const GrXPFactory* xpf = GrPorterDuffXPFactory::Get(xfermode); + sk_sp<GrXPFactory> xpf(GrPorterDuffXPFactory::Make(xfermode)); sk_sp<GrXferProcessor> xp(xpf->createXferProcessor(analysis, false, nullptr, caps)); TEST_ASSERT(!xpf->willNeedDstTexture(caps, analysis)); xpf->getInvariantBlendedColor(analysis.fColorPOI, &fBlendedColor); @@ -1097,7 +1097,7 @@ static void test_lcd_coverage_fallback_case(skiatest::Reporter* reporter, const SkASSERT(kRGBA_GrColorComponentFlags == colorPOI.validFlags()); SkASSERT(covPOI.isFourChannelOutput()); - const GrXPFactory* xpf = GrPorterDuffXPFactory::Get(SkBlendMode::kSrcOver); + sk_sp<GrXPFactory> xpf(GrPorterDuffXPFactory::Make(SkBlendMode::kSrcOver)); TEST_ASSERT(!xpf->willNeedDstTexture(caps, analysis)); sk_sp<GrXferProcessor> xp(xpf->createXferProcessor(analysis, false, nullptr, caps)); @@ -1171,7 +1171,7 @@ 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); + sk_sp<GrXPFactory> xpf(GrPorterDuffXPFactory::Make(xfermode)); GrXferProcessor::DstTexture* dstTexture = xpf->willNeedDstTexture(caps, analysis) ? &fakeDstTexture : 0; sk_sp<GrXferProcessor> xp( diff --git a/tests/TessellatingPathRendererTests.cpp b/tests/TessellatingPathRendererTests.cpp index fc93772106..ccc24a4aa8 100644 --- a/tests/TessellatingPathRendererTests.cpp +++ b/tests/TessellatingPathRendererTests.cpp @@ -254,7 +254,7 @@ static void test_path(GrRenderTargetContext* renderTargetContext, GrResourceProv GrTessellatingPathRenderer tess; GrPaint paint; - paint.setXPFactory(GrPorterDuffXPFactory::Get(SkBlendMode::kSrc)); + paint.setXPFactory(GrPorterDuffXPFactory::Make(SkBlendMode::kSrc)); GrNoClip noClip; GrStyle style(SkStrokeRec::kFill_InitStyle); |