Add support for getting vulkan descriptor sets without a GrVkUniformHandler.

src/gpu/vk/GrVkDescriptorSetManager.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 GrVkDescriptorSetManager_DEFINED
 #define GrVkDescriptorSetManager_DEFINED
 
@@ skipping 11 matching lines @@
  * This class handles the allocation of descriptor sets for a given VkDescriptorSetLayout. It will
  * try to reuse previously allocated descriptor sets if they are no longer in use by other objects.
  */
 class GrVkDescriptorSetManager {
 public:
     GR_DEFINE_RESOURCE_HANDLE_CLASS(Handle);
 
     GrVkDescriptorSetManager(GrVkGpu* gpu,
                              VkDescriptorType,
                              const GrVkUniformHandler* handler = nullptr);
+
+    GrVkDescriptorSetManager(GrVkGpu* gpu,
+                             VkDescriptorType,
+                             const uint32_t* visibilities,

[jvanverth1, 2016/08/23 20:43:07]

Suggestion: use a const SkTArray<uint32_t>& rather than a raw pointer and count.

+                             int visibilityCount);
+
     ~GrVkDescriptorSetManager() {}
 
     void abandon();
     void release(const GrVkGpu* gpu);
 
     VkDescriptorSetLayout layout() const { return fPoolManager.fDescLayout; }
 
     const GrVkDescriptorSet* getDescriptorSet(GrVkGpu* gpu, const Handle& handle);
 
     void recycleDescriptorSet(const GrVkDescriptorSet*);
 
     bool isCompatible(VkDescriptorType type, const GrVkUniformHandler*) const;
+    bool isCompatible(VkDescriptorType type,
+                      const uint32_t* visibilities,
+                      int visibilityCount) const;
 
 private:
     struct DescriptorPoolManager {
         DescriptorPoolManager(VkDescriptorType type, GrVkGpu* gpu,
                               const GrVkUniformHandler* handler = nullptr);
+        DescriptorPoolManager(VkDescriptorType type, GrVkGpu* gpu,
+                              const uint32_t* visibilities, int visibilityCount);
+
 
         ~DescriptorPoolManager() {
             SkASSERT(!fDescLayout);
             SkASSERT(!fPool);
         }
 
         void getNewDescriptorSet(GrVkGpu* gpu, VkDescriptorSet* ds);
 
         void freeGPUResources(const GrVkGpu* gpu);
         void abandonGPUResources();
 
         VkDescriptorSetLayout  fDescLayout;
         VkDescriptorType       fDescType;
         uint32_t               fDescCountPerSet;
         uint32_t               fMaxDescriptors;
         uint32_t               fCurrentDescriptorCount;
         GrVkDescriptorPool*    fPool;
 
     private:
         enum {
             kUniformDescPerSet = 2,
             kMaxDescriptors = 1024,
             kStartNumDescriptors = 16, // must be less than kMaxUniformDescriptors
         };
 
+        void init(GrVkGpu* gpu, VkDescriptorType type, const GrVkUniformHandler* uniformHandler,
+                  const uint32_t* visibilities, int visibilityCount);
+
         void getNewPool(GrVkGpu* gpu);
     };
 
     DescriptorPoolManager                    fPoolManager;
     SkTArray<const GrVkDescriptorSet*, true> fFreeSets;
     SkSTArray<4, uint32_t>                   fBindingVisibilities;
 };
 
 #endif