diff options
author | kkinnunen <kkinnunen@nvidia.com> | 2016-01-05 00:30:32 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-01-05 00:30:33 -0800 |
commit | 830e012187f951d49d7e46e196ac8d1e653a25da (patch) | |
tree | c70e0541370b4b0b04211b2477218d8a2593303c /tests/GrContextFactoryTest.cpp | |
parent | 8686a5eeef85bbd28404d7cc51b5d02ceff35767 (diff) |
Make SkGLContext lifetime more well-defined
Remove refcounting from SkGLContext.
SkGLContext is expected to behave like GrContextFactory would own
it, as implied by the GrContextFactory function.
If it is refcounted, this does not hold.
Also other use sites, such as in SkOSWindow_win (command buffer gl
object), confirm the behavior. The object is explicitly owned and
destroyed, not shared.
Also fixes potential crashes from using GL context of an abandoned
context.
Also fixes potential crashes in DM/nanobench, if the GrContext lives
longer than GLContext through internal refing of GrContext.
Moves the non-trivial implementations from GrContextFactory.h to
.cpp, just for consistency sake.
Changes pathops_unittest.gyp. The pathops_unittest uses
GrContextFactory, but did not link to its implementation. The reason
they worked was that the implementation used (constructors, destructors)
happened to be in the .h file.
This works towards being able to use command buffer and NVPR from
the SampleApp.
BUG=skia:2992
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1511773005
Review URL: https://codereview.chromium.org/1511773005
Diffstat (limited to 'tests/GrContextFactoryTest.cpp')
-rw-r--r-- | tests/GrContextFactoryTest.cpp | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/tests/GrContextFactoryTest.cpp b/tests/GrContextFactoryTest.cpp index 1b19ac68e3..7fe3b50ff8 100644 --- a/tests/GrContextFactoryTest.cpp +++ b/tests/GrContextFactoryTest.cpp @@ -46,4 +46,28 @@ DEF_GPUTEST(GrContextFactory_NoPathRenderingUnlessNVPRRequested, reporter, /*fac } } +DEF_GPUTEST(GrContextFactory_abandon, reporter, /*factory*/) { + GrContextFactory testFactory; + for (int i = 0; i < GrContextFactory::kGLContextTypeCnt; ++i) { + GrContextFactory::GLContextType glCtxType = (GrContextFactory::GLContextType) i; + GrContextFactory::ContextInfo info1 = + testFactory.getContextInfo(glCtxType); + REPORTER_ASSERT(reporter, info1.fGrContext); + REPORTER_ASSERT(reporter, info1.fGLContext); + // Ref for comparison. The API does not explicitly say that this stays alive. + info1.fGrContext->ref(); + testFactory.abandonContexts(); + + // Test that we get different context after abandon. + GrContextFactory::ContextInfo info2 = + testFactory.getContextInfo(glCtxType); + REPORTER_ASSERT(reporter, info2.fGrContext); + REPORTER_ASSERT(reporter, info2.fGLContext); + REPORTER_ASSERT(reporter, info1.fGrContext != info2.fGrContext); + // fGLContext should also change, but it also could get the same address. + + info1.fGrContext->unref(); + } +} + #endif |