commit e922953cabe40fd87e78518575b7de0cb4c7e7fe
author Robert Phillips <robertphillips@google.com> Fri Jun 26 10:10:49 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jun 26 15:37:30 2020 +0000
tree 3d40ed6c7dddcc2f4afb9b8654070b14380432c5
parent 7ac9b5fdb6ee226601ab468cdc957c1650f96bbf

Adjust how GM::gpuSetup is handled in the tools

Change-Id: I7a49ff49030b4c8aba1f0798a3742641030fe44f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/298710
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

tools/viewer/Viewer.cpp

diff --git a/tools/viewer/Viewer.cpp b/tools/viewer/Viewer.cpp
index 45d4fbd..9e20ddb 100644
--- a/tools/viewer/Viewer.cpp
+++ b/tools/viewer/Viewer.cpp
@@ -848,6 +848,10 @@
 
 
 Viewer::~Viewer() {
+    for(auto& slide : fSlides) {
+        slide->gpuTeardown();
+    }
+
     fWindow->detach();
     delete fWindow;
 }
@@ -1182,6 +1186,11 @@
     fCachedShaders.reset();
     fBackendType = backendType;
 
+    // The active context is going away in 'detach'
+    for(auto& slide : fSlides) {
+        slide->gpuTeardown();
+    }
+
     fWindow->detach();
 
 #if defined(SK_BUILD_FOR_WIN)
@@ -2585,6 +2594,9 @@
             if (stateValue.equals(kBackendTypeStrings[i])) {
                 if (fBackendType != i) {
                     fBackendType = (sk_app::Window::BackendType)i;
+                    for(auto& slide : fSlides) {
+                        slide->gpuTeardown();
+                    }
                     fWindow->detach();
                     fWindow->attach(backend_type_for_window(fBackendType));
                 }