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/GrVkResource.h

diff --git a/src/gpu/vk/GrVkResource.h b/src/gpu/vk/GrVkResource.h
index d42ec70..3999749 100644
--- a/src/gpu/vk/GrVkResource.h
+++ b/src/gpu/vk/GrVkResource.h
@@ -40,7 +40,26 @@
 #ifdef SK_TRACE_VK_RESOURCES
     static const uint32_t& GetKey(const GrVkResource& r) { return r.fKey; }
     static uint32_t Hash(const uint32_t& k) { return k; }
-    static SkTDynamicHash<GrVkResource, uint32_t> fTrace;
+
+    class Trace {
+    public:
+        ~Trace() {
+            if (fHash.count()) {
+                SkTDynamicHash<GrVkResource, uint32_t>::Iter iter(&fHash);
+                for (; !iter.done(); ++iter) {
+                    (*iter).dumpInfo();
+                }
+            }
+            SkASSERT(0 == fHash.count());
+        }
+        void add(GrVkResource* r) { fHash.add(r); }
+        void remove(const GrVkResource* r) { fHash.remove(GetKey(*r)); }
+
+    private:
+        SkTDynamicHash<GrVkResource, uint32_t> fHash;
+    };
+    static Trace  fTrace;
+
     static SkRandom fRandom;
 #endif
 
@@ -144,7 +163,7 @@
     void internal_dispose(const GrVkGpu* gpu) const {
         this->freeGPUData(gpu);
 #ifdef SK_TRACE_VK_RESOURCES
-        fTrace.remove(GetKey(*this));
+        fTrace.remove(this);
 #endif
         SkASSERT(0 == fRefCnt);
         fRefCnt = 1;
@@ -157,7 +176,7 @@
     void internal_dispose() const {
         this->abandonSubResources();
 #ifdef SK_TRACE_VK_RESOURCES
-        fTrace.remove(GetKey(*this));
+        fTrace.remove(this);
 #endif
         SkASSERT(0 == fRefCnt);
         fRefCnt = 1;