diff options
Diffstat (limited to 'tests/GrContextFactoryTest.cpp')
| -rw-r--r-- | tests/GrContextFactoryTest.cpp | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/tests/GrContextFactoryTest.cpp b/tests/GrContextFactoryTest.cpp index bd1888380a..6e51b2fda3 100644 --- a/tests/GrContextFactoryTest.cpp +++ b/tests/GrContextFactoryTest.cpp @@ -20,10 +20,10 @@ DEF_GPUTEST(GrContextFactory_NVPRContextOptionHasPathRenderingSupport, reporter, // or the context creation fails. GrContextFactory testFactory; // Test that if NVPR is possible, caps are in sync. - for (int i = 0; i < GrContextFactory::kGLContextTypeCnt; ++i) { - GrContextFactory::GLContextType glCtxType = static_cast<GrContextFactory::GLContextType>(i); - GrContext* context = testFactory.get(glCtxType, - GrContextFactory::kEnableNVPR_GLContextOptions); + for (int i = 0; i < GrContextFactory::kContextTypeCnt; ++i) { + GrContextFactory::ContextType ctxType = static_cast<GrContextFactory::ContextType>(i); + GrContext* context = testFactory.get(ctxType, + GrContextFactory::kEnableNVPR_ContextOptions); if (!context) { continue; } @@ -37,9 +37,9 @@ DEF_GPUTEST(GrContextFactory_NoPathRenderingUnlessNVPRRequested, reporter, /*fac // Test that if NVPR is not requested, the context never has path rendering support. GrContextFactory testFactory; - for (int i = 0; i <= GrContextFactory::kLastGLContextType; ++i) { - GrContextFactory::GLContextType glCtxType = (GrContextFactory::GLContextType)i; - GrContext* context = testFactory.get(glCtxType); + for (int i = 0; i <= GrContextFactory::kLastContextType; ++i) { + GrContextFactory::ContextType ctxType = (GrContextFactory::ContextType)i; + GrContext* context = testFactory.get(ctxType); if (context) { REPORTER_ASSERT( reporter, @@ -54,16 +54,15 @@ DEF_GPUTEST(GrContextFactory_RequiredSRGBSupport, reporter, /*factory*/) { // created without that flag would not have had sRGB support. GrContextFactory testFactory; // Test that if sRGB is requested, caps are in sync. - for (int i = 0; i < GrContextFactory::kGLContextTypeCnt; ++i) { - GrContextFactory::GLContextType glCtxType = static_cast<GrContextFactory::GLContextType>(i); + for (int i = 0; i < GrContextFactory::kContextTypeCnt; ++i) { + GrContextFactory::ContextType ctxType = static_cast<GrContextFactory::ContextType>(i); GrContext* context = - testFactory.get(glCtxType, - GrContextFactory::kRequireSRGBSupport_GLContextOptions); + testFactory.get(ctxType, GrContextFactory::kRequireSRGBSupport_ContextOptions); if (context) { REPORTER_ASSERT(reporter, context->caps()->srgbSupport()); } else { - context = testFactory.get(glCtxType); + context = testFactory.get(ctxType); if (context) { REPORTER_ASSERT(reporter, !context->caps()->srgbSupport()); } @@ -73,10 +72,9 @@ DEF_GPUTEST(GrContextFactory_RequiredSRGBSupport, reporter, /*factory*/) { 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); + for (int i = 0; i < GrContextFactory::kContextTypeCnt; ++i) { + GrContextFactory::ContextType ctxType = (GrContextFactory::ContextType) i; + GrContextFactory::ContextInfo info1 = testFactory.getContextInfo(ctxType); if (!info1.fGrContext) { continue; } @@ -87,7 +85,7 @@ DEF_GPUTEST(GrContextFactory_abandon, reporter, /*factory*/) { // Test that we get different context after abandon. GrContextFactory::ContextInfo info2 = - testFactory.getContextInfo(glCtxType); + testFactory.getContextInfo(ctxType); REPORTER_ASSERT(reporter, info2.fGrContext); REPORTER_ASSERT(reporter, info2.fGLContext); REPORTER_ASSERT(reporter, info1.fGrContext != info2.fGrContext); |