commit 15b83aa5d48713d30ce5826b4aae70651fb1dee0
author Ethan Nicholas <ethannicholas@google.com> Wed Dec 12 11:29:13 2018 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Dec 12 17:10:20 2018 +0000
tree a19f8329e0616c76e9ec740a5a0d9f5d08635780
parent bdc011dc9ba93589564175665721f979c9d05177

fix for GrVkGpu not always unreffing all command pools

Bug: skia:
Change-Id: I2a122aa25f5a8bedb413b2dca3b53637f8ddd604
Reviewed-on: https://skia-review.googlesource.com/c/176975
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Ethan Nicholas <ethannicholas@google.com>

src/gpu/vk/GrVkResourceProvider.cpp

diff --git a/src/gpu/vk/GrVkResourceProvider.cpp b/src/gpu/vk/GrVkResourceProvider.cpp
index 2b54878..99b4d12 100644
--- a/src/gpu/vk/GrVkResourceProvider.cpp
+++ b/src/gpu/vk/GrVkResourceProvider.cpp
@@ -330,6 +330,11 @@
 }
 
 void GrVkResourceProvider::destroyResources(bool deviceLost) {
+    SkTaskGroup* taskGroup = fGpu->getContext()->contextPriv().getTaskGroup();
+    if (taskGroup) {
+        taskGroup->wait();
+    }
+
     // Release all copy pipelines
     for (int i = 0; i < fCopyPipelines.count(); ++i) {
         fCopyPipelines[i]->unref(fGpu);
@@ -381,6 +386,11 @@
 }
 
 void GrVkResourceProvider::abandonResources() {
+    SkTaskGroup* taskGroup = fGpu->getContext()->contextPriv().getTaskGroup();
+    if (taskGroup) {
+        taskGroup->wait();
+    }
+
     // Abandon all command pools
     for (int i = 0; i < fActiveCommandPools.count(); ++i) {
         SkASSERT(fActiveCommandPools[i]->unique());