Clean up EGL thread state at thread exit in nanobench and DM

dm/DM.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "CrashHandler.h"
 #include "DMJsonWriter.h"
 #include "DMSrcSink.h"
@@ skipping 1087 matching lines @@
 #undef PORTABLE_FONT_PREFIX
 
 extern SkTypeface* (*gCreateTypefaceDelegate)(const char [], SkTypeface::Style );
 
 int dm_main();
 int dm_main() {
     setup_crash_handler();
 
     JsonWriter::DumpJson();  // It's handy for the bots to assume this is ~never missing.
     SkAutoGraphics ag;
+#if SK_SUPPORT_GPU
+    SkTaskGroup::Enabler enabled(FLAGS_threads, GrContextFactory::ReleaseGpuAPIsInThread);
+#else
     SkTaskGroup::Enabler enabled(FLAGS_threads);
+#endif
     gCreateTypefaceDelegate = &create_from_name;
 
     {
         SkString testResourcePath = GetResourcePath("color_wheel.png");
         SkFILEStream testResource(testResourcePath.c_str());
         if (!testResource.isValid()) {
             SkDebugf("Some resources are missing.  Do you need to set --resourcePath?\n");
         }
     }
     gather_gold();
@@ skipping 57 matching lines @@
         SkDebugf("%d failures\n", gFailures.count());
         return 1;
     }
 
 #ifdef SK_PDF_IMAGE_STATS
     SkPDFImageDumpStats();
 #endif  // SK_PDF_IMAGE_STATS
 
     print_status();
     SkDebugf("Finished!\n");
+
+#if SK_SUPPORT_GPU
+    // The main thread maybe ran GPU code.
+    GrContextFactory::ReleaseGpuAPIsInThread();
+#endif
     return 0;
 }
 
 // TODO: currently many GPU tests are declared outside SK_SUPPORT_GPU guards.
 // Thus we export the empty RunWithGPUTestContexts when SK_SUPPORT_GPU=0.
 namespace skiatest {
 namespace {
 typedef void(*TestWithGrContext)(skiatest::Reporter*, GrContext*);
 typedef void(*TestWithGrContextAndGLContext)(skiatest::Reporter*, GrContext*, SkGLContext*);
 #if SK_SUPPORT_GPU
@@ skipping 77 matching lines @@
                                                            Reporter* reporter,
                                                            GrContextFactory* factory);
 } // namespace skiatest
 
 #if !defined(SK_BUILD_FOR_IOS)
 int main(int argc, char** argv) {
     SkCommandLineFlags::Parse(argc, argv);
     return dm_main();
 }
 #endif