aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests
diff options
context:
space:
mode:
authorGravatar kkinnunen <kkinnunen@nvidia.com>2014-10-08 04:14:24 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2014-10-08 04:14:24 -0700
commita90ed4e83897b45d6331ee4c54e1edd4054de9a8 (patch)
tree5c79561319e03d1ab6f8901248928ab6cd2d23c5 /tests
parent5a161ea78ebb668849c62baffae0bfffae98c332 (diff)
Make the Sk GL context class an abstract base class
Make the Sk GL context class, SkGLNativeContext, an abstract base class. Before, it depended on ifdefs to implement the platform dependent polymorphism. Move the logic to subclasses of the various platform implementations. This a step to enable Skia embedders to compile dm and bench_pictures. The concrete goal is to support running these test apps with Chromium command buffer. With this change, Chromium can implement its own version of SkGLNativeContext that uses command buffer, and host the implementation in its own repository. Implements the above by renaming the SkGLContextHelper to SkGLContext and removing the unneeded SkGLNativeContext. Also removes SkGLNativeContext::AutoRestoreContext functionality, it appeared to be unused: no use in Skia code, and no tests. BUG=skia:2992 Review URL: https://codereview.chromium.org/630843002
Diffstat (limited to 'tests')
-rwxr-xr-xtests/GLInterfaceValidationTest.cpp10
-rw-r--r--tests/Test.cpp2
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