diff options
| author |  kkinnunen <kkinnunen@nvidia.com> | 2015-12-08 01:24:40 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-12-08 01:24:40 -0800 |
| commit | 64492c43c3faee7ab0f69b1c84e0267616f85e52 (patch) | |
| tree | 1e87911280dc78c7a37b853bfbca3e45ce2a0810 /tests/GrContextFactoryTest.cpp | |
| parent | c6e7a13489eda2abf7a03ea8de3a4abbab1c597d (diff) | |
Make NVPR a GL context option instead of a GL context
Make NVPR a GL context option instead of a GL context.
This may enable NVPR to be run with command buffer
interface.
No functionality change in DM or nanobench. NVPR can
only be run with normal GL APIs.
BUG=skia:2992
Committed: https://skia.googlesource.com/skia/+/eeebdb538d476c1bfc8b63a946094ca1b505ecd1
Review URL: https://codereview.chromium.org/1448883002
Diffstat (limited to 'tests/GrContextFactoryTest.cpp')
| -rw-r--r-- | tests/GrContextFactoryTest.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tests/GrContextFactoryTest.cpp b/tests/GrContextFactoryTest.cpp index 176391ef8d..50bdedff9e 100644 --- a/tests/GrContextFactoryTest.cpp +++ b/tests/GrContextFactoryTest.cpp @@ -13,11 +13,13 @@ #include "GrCaps.h" #include "Test.h" -DEF_GPUTEST(GrContextFactory_NVPRContextTypeHasPathRenderingSupport, reporter, /*factory*/) { +DEF_GPUTEST(GrContextFactory_NVPRContextOptionHasPathRenderingSupport, reporter, /*factory*/) { // Test that if NVPR is requested, the context always has path rendering // or the context creation fails. GrContextFactory testFactory; - GrContext* context = testFactory.get(GrContextFactory::kNVPR_GLContextType); + GrContext* context = testFactory.get(GrContextFactory::kNative_GLContextType, + kNone_GrGLStandard, + GrContextFactory::kEnableNVPR_GLContextOptions); if (context) { REPORTER_ASSERT( reporter, @@ -31,9 +33,6 @@ DEF_GPUTEST(GrContextFactory_NoPathRenderingUnlessNVPRRequested, reporter, /*fac GrContextFactory testFactory; for (int i = 0; i <= GrContextFactory::kLastGLContextType; ++i) { GrContextFactory::GLContextType glCtxType = (GrContextFactory::GLContextType)i; - if (glCtxType == GrContextFactory::kNVPR_GLContextType) { - continue; - } GrContext* context = testFactory.get(glCtxType); if (context) { REPORTER_ASSERT( |