Add GrVkRecycledResource subclass

src/gpu/vk/GrVkCommandBuffer.cpp

 /*
 * Copyright 2015 Google Inc.
 *
 * Use of this source code is governed by a BSD-style license that can be
 * found in the LICENSE file.
 */
 
 #include "GrVkCommandBuffer.h"
 
 #include "GrVkFramebuffer.h"
@@ skipping 22 matching lines @@
         fCachedBlendConstant[i] = -1.0;
     }
 }
 
 void GrVkCommandBuffer::freeGPUData(const GrVkGpu* gpu) const {
     SkASSERT(!fIsActive);
     for (int i = 0; i < fTrackedResources.count(); ++i) {
         fTrackedResources[i]->unref(gpu);
     }
 
+    for (int i = 0; i < fTrackedRecycledResources.count(); ++i) {
+        fTrackedRecycledResources[i]->recycle(const_cast<GrVkGpu*>(gpu));
+    }
+
     GR_VK_CALL(gpu->vkInterface(), FreeCommandBuffers(gpu->device(), gpu->cmdPool(),
                                                       1, &fCmdBuffer));
 
     this->onFreeGPUData(gpu);
 }
 
 void GrVkCommandBuffer::abandonSubResources() const {
     for (int i = 0; i < fTrackedResources.count(); ++i) {
         fTrackedResources[i]->unrefAndAbandon();
     }
+
+    for (int i = 0; i < fTrackedRecycledResources.count(); ++i) {
+        // We don't recycle resources when abandoning them.
+        fTrackedRecycledResources[i]->unrefAndAbandon();
+    }
 }
 
 void GrVkCommandBuffer::reset(GrVkGpu* gpu) {
     SkASSERT(!fIsActive);
     for (int i = 0; i < fTrackedResources.count(); ++i) {
         fTrackedResources[i]->unref(gpu);
     }
     fTrackedResources.reset();
 
+    for (int i = 0; i < fTrackedRecycledResources.count(); ++i) {
+        fTrackedRecycledResources[i]->recycle(const_cast<GrVkGpu*>(gpu));
+        fTrackedRecycledResources[i]->unref(gpu);

[jvanverth1, 2016/07/20 14:51:36]

I think you have an extra unref here.

[egdaniel, 2016/07/20 14:53:26]

Done.

+    }
+    fTrackedRecycledResources.reset();
+
+
     this->invalidateState();
 
     // we will retain resources for later use
     VkCommandBufferResetFlags flags = 0;
     GR_VK_CALL(gpu->vkInterface(), ResetCommandBuffer(fCmdBuffer, flags));
 
     this->onReset(gpu);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 545 matching lines @@
     fIsActive = true;
 }
 
 void GrVkSecondaryCommandBuffer::end(const GrVkGpu* gpu) {
     SkASSERT(fIsActive);
     GR_VK_CALL_ERRCHECK(gpu->vkInterface(), EndCommandBuffer(fCmdBuffer));
     this->invalidateState();
     fIsActive = false;
 }