commit a584de966a4f7ab71f3f07077cf1e226def9d730
author jvanverth <jvanverth@google.com> Thu Jun 30 09:10:52 2016 -0700
committer Commit bot <commit-bot@chromium.org> Thu Jun 30 09:10:52 2016 -0700
tree 96615c75ab3e371de222ebedc83ccf0782414ca0
parent 37535c9ecef67a56cad293535f8626b1d60f7c08

Add static buffer support

Put resource tracking check in the right place

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

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

src/gpu/vk/GrVkResourceProvider.cpp

diff --git a/src/gpu/vk/GrVkResourceProvider.cpp b/src/gpu/vk/GrVkResourceProvider.cpp
index 31d5568..4f6c792 100644
--- a/src/gpu/vk/GrVkResourceProvider.cpp
+++ b/src/gpu/vk/GrVkResourceProvider.cpp
@@ -261,10 +261,6 @@
 
     fPipelineStateCache->release();
 
-#ifdef SK_TRACE_VK_RESOURCES
-    SkASSERT(0 == GrVkResource::fTrace.count());
-#endif
-
     GR_VK_CALL(fGpu->vkInterface(), DestroyPipelineCache(fGpu->device(), fPipelineCache, nullptr));
     fPipelineCache = VK_NULL_HANDLE;
 
@@ -275,6 +271,10 @@
         fUniformDescLayout = VK_NULL_HANDLE;
     }
     fUniformDescPool->unref(fGpu);
+
+#ifdef SK_TRACE_VK_RESOURCES
+    SkASSERT(0 == GrVkResource::fTrace.count());
+#endif
 }
 
 void GrVkResourceProvider::abandonResources() {
@@ -300,13 +300,14 @@
 
     fPipelineStateCache->abandon();
 
-#ifdef SK_TRACE_VK_RESOURCES
-    SkASSERT(0 == GrVkResource::fTrace.count());
-#endif
     fPipelineCache = VK_NULL_HANDLE;
 
     fUniformDescLayout = VK_NULL_HANDLE;
     fUniformDescPool->unrefAndAbandon();
+
+#ifdef SK_TRACE_VK_RESOURCES
+    SkASSERT(0 == GrVkResource::fTrace.count());
+#endif
 }
 
 ////////////////////////////////////////////////////////////////////////////////