diff options
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/GLInterfaceValidationTest.cpp | 10 | ||||
| -rw-r--r-- | tests/Test.cpp | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/GLInterfaceValidationTest.cpp b/tests/GLInterfaceValidationTest.cpp index 797ba72cc0..83f9e2eae2 100755 --- a/tests/GLInterfaceValidationTest.cpp +++ b/tests/GLInterfaceValidationTest.cpp @@ -17,20 +17,20 @@ DEF_GPUTEST(GLInterfaceValidation, reporter, factory) { GrContextFactory::GLContextType glCtxType = (GrContextFactory::GLContextType)i; // this forces the factory to make the context if it hasn't yet factory->get(glCtxType); - SkGLContextHelper* glCtxHelper = factory->getGLContext(glCtxType); + SkGLContext* glCtx = factory->getGLContext(glCtxType); // We're supposed to fail the NVPR context type when we the native context that does not // support the NVPR extension. if (GrContextFactory::kNVPR_GLContextType == glCtxType && factory->getGLContext(GrContextFactory::kNative_GLContextType) && !factory->getGLContext(GrContextFactory::kNative_GLContextType)->hasExtension("GL_NV_path_rendering")) { - REPORTER_ASSERT(reporter, NULL == glCtxHelper); + REPORTER_ASSERT(reporter, NULL == glCtx); continue; } - REPORTER_ASSERT(reporter, glCtxHelper); - if (glCtxHelper) { - const GrGLInterface* interface = glCtxHelper->gl(); + REPORTER_ASSERT(reporter, glCtx); + if (glCtx) { + const GrGLInterface* interface = glCtx->gl(); REPORTER_ASSERT(reporter, interface->validate()); } } diff --git a/tests/Test.cpp b/tests/Test.cpp index d0147e1e4a..c458f897fb 100644 --- a/tests/Test.cpp +++ b/tests/Test.cpp @@ -15,7 +15,7 @@ #if SK_SUPPORT_GPU #include "GrContext.h" -#include "gl/SkNativeGLContext.h" +#include "gl/SkGLContext.h" #else class GrContext; #endif |