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/GLProgramsTest.cpp | |
| 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/GLProgramsTest.cpp')
| -rw-r--r-- | tests/GLProgramsTest.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
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)); |