commit d5f6e9a759891473b8211efb90f665b14a85b830
author jvanverth <jvanverth@google.com> Thu Jul 07 08:21:48 2016 -0700
committer Commit bot <commit-bot@chromium.org> Thu Jul 07 08:21:48 2016 -0700
tree fc7a47e8c29943d38687c72334b5dcfe59b4cd7b
parent 6e46eea63efdede18525ff7b7097e611d3986d0d

Only check resource tracking on program shutdown, not context shutdown

BUG=skia:5496
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2128273002

Review-Url: https://codereview.chromium.org/2128273002

src/gpu/vk/GrVkResourceProvider.cpp

diff --git a/src/gpu/vk/GrVkResourceProvider.cpp b/src/gpu/vk/GrVkResourceProvider.cpp
index c7a66ca..c83c6a4 100644
--- a/src/gpu/vk/GrVkResourceProvider.cpp
+++ b/src/gpu/vk/GrVkResourceProvider.cpp
@@ -15,7 +15,7 @@
 #include "GrVkUtil.h"
 
 #ifdef SK_TRACE_VK_RESOURCES
-SkTDynamicHash<GrVkResource, uint32_t> GrVkResource::fTrace;
+GrVkResource::Trace GrVkResource::fTrace;
 SkRandom GrVkResource::fRandom;
 #endif
 
@@ -314,16 +314,6 @@
         fUniformDescLayout = VK_NULL_HANDLE;
     }
     fUniformDescPool->unref(fGpu);
-
-#ifdef SK_TRACE_VK_RESOURCES
-    if (GrVkResource::fTrace.count()) {
-        SkTDynamicHash<GrVkResource, uint32_t>::Iter iter(&GrVkResource::fTrace);
-        for (; !iter.done(); ++iter) {
-            (*iter).dumpInfo();
-        }
-    }
-    SkASSERT(0 == GrVkResource::fTrace.count());
-#endif
 }
 
 void GrVkResourceProvider::abandonResources() {
@@ -368,16 +358,6 @@
 
     fUniformDescLayout = VK_NULL_HANDLE;
     fUniformDescPool->unrefAndAbandon();
-
-#ifdef SK_TRACE_VK_RESOURCES
-    if (GrVkResource::fTrace.count()) {
-        SkTDynamicHash<GrVkResource, uint32_t>::Iter iter(&GrVkResource::fTrace);
-        for (; !iter.done(); ++iter) {
-            (*iter).dumpInfo();
-        }
-    }
-    SkASSERT(0 == GrVkResource::fTrace.count());
-#endif
 }
 
 ////////////////////////////////////////////////////////////////////////////////