Temporary revert of r2510. The test that it introduced fails on the Mac build bots. I suspect there is something wrong with the Mac bot machine's GL that is preventing context creation from succeeding. The OpenGL Driver monitor on the machine only shows a software rasterizer. aglChoosePixelFormat seems to fail regardless of input. It may just need a reboot. I'll investigate it more on Monday.

git-svn-id: http://skia.googlecode.com/svn/trunk@2511 2bbb7eff-a529-9590-31e7-b0007b416f81

2 files changed, 0 insertions, 58 deletions

diff --git a/tests/GLInterfaceValidation.cpp b/tests/GLInterfaceValidation.cpp
deleted file mode 100755
index a18ab84091..0000000000
--- a/tests/GLInterfaceValidation.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-
-/*
- * Copyright 2011 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "Test.h"
-#include "SkNativeGLContext.h"
-#include "SkMesaGLContext.h"
-
-static void GLInterfaceValidationTest(skiatest::Reporter* reporter) {
-    typedef const GrGLInterface* (*interfaceFactory)();
-    struct {
-       interfaceFactory fFactory;
-       const char* fName;
-    } interfaceFactories[] = {
-        {GrGLCreateNativeInterface, "Native"},
-#if SK_MESA
-        {GrGLCreateMesaInterface, "Mesa"},
-#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 nglctx;
-    static const int gBOGUS_SIZE = 16;
-    REPORTER_ASSERT(reporter, nglctx.init(gBOGUS_SIZE, gBOGUS_SIZE));
-#if SK_MESA
-    // We must have a current OSMesa context to initialize an OSMesa 
-    // GrGLInterface
-    SkMesaGLContext::AutoContextRestore mglacr;
-    SkMesaGLContext mglctx;
-    REPORTER_ASSERT(reporter, mglctx.init(gBOGUS_SIZE, gBOGUS_SIZE));
-#endif
-
-    SkAutoTUnref<const GrGLInterface> iface;
-    for (size_t i = 0; i < SK_ARRAY_COUNT(interfaceFactories); ++i) {
-        iface.reset(interfaceFactories[i].fFactory());
-        REPORTER_ASSERT(reporter, NULL != iface.get());
-        if (iface.get()) {
-            REPORTER_ASSERT(reporter, iface.get()->validate(kOpenGL_Shaders_GrEngine));
-        }
-    }
-}
-
-
-#include "TestClassDef.h"
-DEFINE_TESTCLASS("GLInterfaceValidation",
-                 GLInterfaceValidationTestClass,
-                 GLInterfaceValidationTest)
-
diff --git a/tests/Test.cpp b/tests/Test.cpp
index 1c3b691261..d91eeedb8f 100644
--- a/tests/Test.cpp
+++ b/tests/Test.cpp
@@ -89,9 +89,6 @@ GrContext* GpuTest::GetContext() {
             gGrContext.reset(GrContext::Create(kOpenGL_Shaders_GrEngine, ctx));
         }
     }
-    if (gGLContext.get()) {
-        gGLContext.get()->makeCurrent();
-    }
     return gGrContext.get();
 }