Don't sort extensions when there are none. Make an ANGLE context to validate the ANGLE GrGLInterface with.
R=robertphillips@google.com
git-svn-id: http://skia.googlecode.com/svn/trunk@8049 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tests/GLInterfaceValidation.cpp b/tests/GLInterfaceValidation.cpp
index c49de3e..966383f 100755
--- a/tests/GLInterfaceValidation.cpp
+++ b/tests/GLInterfaceValidation.cpp
@@ -37,23 +37,35 @@
{GrGLCreateNullInterface, "Null"},
};
+ static const int kBogusSize = 16;
+
+#if SK_ANGLE
+ SkANGLEGLContext::AutoContextRestore angleACR;
+ SkANGLEGLContext angleContext;
+ bool angleContextInit = angleContext.init(kBogusSize, kBogusSize);
+ REPORTER_ASSERT(reporter, angleContextInit);
+ if (!angleContextInit) {
+ return;
+ }
+#endif
+
// On some platforms GrGLCreateNativeInterface will fail unless an OpenGL
// context has been created. Also, preserve the current context that may
// be in use by outer test harness.
- SkNativeGLContext::AutoContextRestore nglacr;
+ SkNativeGLContext::AutoContextRestore nglACR;
SkNativeGLContext nglctx;
- static const int gBOGUS_SIZE = 16;
- bool nativeContextInit = nglctx.init(gBOGUS_SIZE, gBOGUS_SIZE);
+ bool nativeContextInit = nglctx.init(kBogusSize, kBogusSize);
REPORTER_ASSERT(reporter, nativeContextInit);
if (!nativeContextInit) {
return;
}
+
#if SK_MESA
// We must have a current OSMesa context to initialize an OSMesa
// GrGLInterface
- SkMesaGLContext::AutoContextRestore mglacr;
+ SkMesaGLContext::AutoContextRestore mglACR;
SkMesaGLContext mglctx;
- bool mesaContextInit = mglctx.init(gBOGUS_SIZE, gBOGUS_SIZE);
+ bool mesaContextInit = mglctx.init(kBogusSize, kBogusSize);
REPORTER_ASSERT(reporter, mesaContextInit);
if(!mesaContextInit) {
return;