Force VisualBench to reset GLContext on GrContext reset

tools/VisualBench/VisualBench.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
  */
 
 #include "VisualBench.h"
 
@@ skipping 22 matching lines @@
     fModule.reset(new VisualLightweightBenchModule(this));
     if (FLAGS_interactive) {
         fModule.reset(new VisualInteractiveModule(this));
     }
 
     this->setTitle();
     this->setupBackend();
 }
 
 VisualBench::~VisualBench() {
-    INHERITED::detach();
+    this->tearDownContext();
 }
 
 void VisualBench::setTitle() {
     SkString title("VisualBench");
     INHERITED::setTitle(title.c_str());
 }
 
 SkSurface* VisualBench::createSurface() {
     if (!fSurface) {
         SkSurfaceProps props(INHERITED::getSurfaceProps());
         fSurface.reset(SkSurface::NewRenderTargetDirect(fRenderTarget, &props));
     }
 
     // The caller will wrap the SkSurface in an SkAutoTUnref
     return SkRef(fSurface.get());
 }
 
 bool VisualBench::setupBackend() {
     this->setColorType(kRGBA_8888_SkColorType);
     this->setVisibleP(true);
     this->setClipToBounds(false);
 
     if (FLAGS_fullscreen) {
         if (!this->makeFullscreen()) {
             SkDebugf("Could not go fullscreen!");
         }
     }
-    if (!this->attach(kNativeGL_BackEndType, FLAGS_msaa, &fAttachmentInfo)) {
-        SkDebugf("Not possible to create backend.\n");
-        INHERITED::detach();
-        return false;
-    }
 
-    this->setVsync(false);
     this->resetContext();
     return true;
 }
 
 void VisualBench::resetContext() {
+    this->tearDownContext();
+    this->setupContext();
+}
+
+void VisualBench::setupContext() {
+    if (!this->attach(kNativeGL_BackEndType, FLAGS_msaa, &fAttachmentInfo)) {
+        SkDebugf("Not possible to create backend.\n");
+        INHERITED::detach();
+        SkFAIL("Could not create backend\n");
+    }
+
+    this->setVsync(false);
+
     fSurface.reset(nullptr);
 
     fInterface.reset(GrGLCreateNativeInterface());
 
     // TODO use the GLContext creation factories and also set this all up in configs
     if (!FLAGS_nvpr) {
         fInterface.reset(GrGLInterfaceRemoveNVPR(fInterface));
     }
     SkASSERT(fInterface);
 
     // setup contexts
     fContext.reset(GrContext::Create(kOpenGL_GrBackend, (GrBackendContext)fInterface.get()));
     SkASSERT(fContext);
 
     // setup rendertargets
     this->setupRenderTarget();
 }
 
+void VisualBench::tearDownContext() {
+    if (fContext) {
+        // We abandon the context in case SkWindow has kept a ref to the surface
+        fContext->abandonContext();

[bsalomon, 2015/10/21 14:52:05]

It'd be really nice to refactor SkOSWindow a little bit so that it owned/managed
all these objects rather than the subclass doing it.

+        fContext.reset();
+        fSurface.reset();
+        fInterface.reset();
+        this->detach();
+    }
+}
+
 void VisualBench::setupRenderTarget() {
     if (fContext) {
         fRenderTarget.reset(this->renderTarget(fAttachmentInfo, fInterface, fContext));
     }
 }
 
 void VisualBench::draw(SkCanvas* canvas) {
     fModule->draw(canvas);
 
     // Invalidate the window to force a redraw. Poor man's animation mechanism.
@@ skipping 30 matching lines @@
 }
 
 void application_term() {
     SkEvent::Term();
 }
 
 SkOSWindow* create_sk_window(void* hwnd, int argc, char** argv) {
     return new VisualBench(hwnd, argc, argv);
 }