Add DescriptorPool and set manager to GrVkProgram

src/gpu/vk/GrVkResourceProvider.h

 /*
 * Copyright 2016 Google Inc.
 *
 * Use of this source code is governed by a BSD-style license that can be
 * found in the LICENSE file.
 */
 
 #ifndef GrVkResourceProvider_DEFINED
 #define GrVkResourceProvider_DEFINED
 
@@ skipping 31 matching lines @@
                                  const GrVkRenderPass& renderPass,
                                  VkPipelineLayout layout);
 
     // Finds or creates a simple render pass that matches the target, increments the refcount,
     // and returns.
     const GrVkRenderPass* findOrCreateCompatibleRenderPass(const GrVkRenderTarget& target);
 
     GrVkCommandBuffer* createCommandBuffer();
     void checkCommandBuffers();
 
-    // Finds or creates a compatible GrVkDescriptorPool for the requested DescriptorTypeCount.
+    // Finds or creates a compatible GrVkDescriptorPool for the requested type and count.
     // The refcount is incremented and a pointer returned.
     // TODO: Currently this will just create a descriptor pool without holding onto a ref itself
     //       so we currently do not reuse them. Rquires knowing if another draw is currently using
     //       the GrVkDescriptorPool, the ability to reset pools, and the ability to purge pools out
     //       of our cache of GrVkDescriptorPools.
-    GrVkDescriptorPool* findOrCreateCompatibleDescriptorPool(
-                                        const GrVkDescriptorPool::DescriptorTypeCounts& typeCounts);
+    GrVkDescriptorPool* findOrCreateCompatibleDescriptorPool(VkDescriptorType type, uint32_t count);
 
     // Finds or creates a compatible GrVkSampler based on the GrTextureParams.
     // The refcount is incremented and a pointer returned.
     GrVkSampler* findOrCreateCompatibleSampler(const GrTextureParams&);
 
     // Destroy any cached resources. To be called before destroying the VkDevice.
     // The assumption is that all queues are idle and all command buffers are finished.
     // For resource tracing to work properly, this should be called after unrefing all other
     // resource usages.
     void destroyResources();
@@ skipping 15 matching lines @@
 
     // Array of CommandBuffers that are currently in flight
     SkSTArray<4, GrVkCommandBuffer*> fActiveCommandBuffers;
 
     // Stores GrVkSampler objects that we've already created so we can reuse them across multiple
     // programs
     SkTDynamicHash<GrVkSampler, uint8_t> fSamplers;
 };
 
 #endif