Reuse sampler descriptor set allocations in Vulkan

src/gpu/vk/GrVkDescriptorSetManager.cpp

 /*
 * Copyright 2016 Google Inc.
 *
 * Use of this source code is governed by a BSD-style license that can be
 * found in the LICENSE file.
 */
 
 #include "GrVkDescriptorSetManager.h"
 
 #include "GrVkDescriptorPool.h"
 #include "GrVkDescriptorSet.h"
 #include "GrVkGpu.h"
+#include "GrVkUniformHandler.h"
+#include "glsl/GrGLSLSampler.h"
 
 GrVkDescriptorSetManager::GrVkDescriptorSetManager(GrVkGpu* gpu,
                                                    VkDescriptorSetLayout layout,
                                                    VkDescriptorType type,
-                                                   uint32_t samplerCount)
-    : fPoolManager(layout, type, samplerCount, gpu)
-    , fNumSamplerBindings(samplerCount) {
+                                                   uint32_t descCountPerSet,
+                                                   const GrVkUniformHandler* uniformHandler)
+    : fPoolManager(layout, type, descCountPerSet, gpu) {
+    if (type == VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER) {
+        SkASSERT(uniformHandler);
+        SkASSERT((int)descCountPerSet == uniformHandler->numSamplers());
+        for (int i = 0; i < uniformHandler->numSamplers(); ++i) {
+            fBindingVisibilities.push_back(uniformHandler->getSampler(i).visibility());
+        }
+    } else {
+        SkASSERT(type == VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER);
+        SkASSERT(2 == descCountPerSet);
+        // We set the visibility of the first binding to the vertex shader and the second to the
+        // fragment shader.
+        fBindingVisibilities.push_back(kVertex_GrShaderFlag);
+        fBindingVisibilities.push_back(kFragment_GrShaderFlag);
+    }
 }
 
 const GrVkDescriptorSet* GrVkDescriptorSetManager::getDescriptorSet(GrVkGpu* gpu,
                                                                     const Handle& handle) {
     const GrVkDescriptorSet* ds = nullptr;
     int count = fFreeSets.count();
     if (count > 0) {
         ds = fFreeSets[count - 1];
         fFreeSets.removeShuffle(count - 1);
     } else {
@@ skipping 22 matching lines @@
 
 void GrVkDescriptorSetManager::abandon() {
     fPoolManager.abandonGPUResources();
 
     for (int i = 0; i < fFreeSets.count(); ++i) {
         fFreeSets[i]->unrefAndAbandon();
     }
     fFreeSets.reset();
 }
 
+VkDescriptorSetLayout GrVkDescriptorSetManager::layout() const { return fPoolManager.fDescLayout; }

[jvanverth1, 2016/07/25 19:12:56]

Put in .h file?

[egdaniel, 2016/07/26 13:33:19]

Done.

+
+bool GrVkDescriptorSetManager::isCompatible(VkDescriptorType type,
+                                            const GrVkUniformHandler* uniHandler) const {
+    SkASSERT(uniHandler);
+    if (type != fPoolManager.fDescType) {
+        return false;
+    }
+
+    if (type == VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER) {
+        if (fBindingVisibilities.count() != uniHandler->numSamplers()) {
+            return false;
+        }
+        for (int i = 0; i < uniHandler->numSamplers(); ++i) {
+            if (uniHandler->getSampler(i).visibility() != fBindingVisibilities[i]) {
+                return false;
+            }
+        }
+    }
+    return true;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 
 void GrVkDescriptorSetManager::DescriptorPoolManager::getNewPool(GrVkGpu* gpu) {
     if (fPool) {
         fPool->unref(gpu);
         uint32_t newPoolSize = fMaxDescriptors + ((fMaxDescriptors + 1) >> 1);
         if (newPoolSize < kMaxDescriptors) {
             fMaxDescriptors = newPoolSize;
         } else {
             fMaxDescriptors = kMaxDescriptors;
@@ skipping 22 matching lines @@
     dsAllocateInfo.pNext = nullptr;
     dsAllocateInfo.descriptorPool = fPool->descPool();
     dsAllocateInfo.descriptorSetCount = 1;
     dsAllocateInfo.pSetLayouts = &fDescLayout;
     GR_VK_CALL_ERRCHECK(gpu->vkInterface(), AllocateDescriptorSets(gpu->device(),
                                                                    &dsAllocateInfo,
                                                                    ds));
 }
 
 void GrVkDescriptorSetManager::DescriptorPoolManager::freeGPUResources(const GrVkGpu* gpu) {
-    // The layout should be owned by the class which owns the DescriptorSetManager so it will
-    // take care of destroying it.
-    fDescLayout = VK_NULL_HANDLE;
+    if (fDescLayout) {
+        GR_VK_CALL(gpu->vkInterface(), DestroyDescriptorSetLayout(gpu->device(), fDescLayout,

[jvanverth1, 2016/07/25 19:12:56]

Is there any way to create this in the DescriptorPoolManager? It seems this
should be created and destroyed in the same code area.

[egdaniel, 2016/07/26 13:33:19]

Done.

+                                                                  nullptr));
+        fDescLayout = VK_NULL_HANDLE;
+    }
 
     if (fPool) {
         fPool->unref(gpu);
         fPool = nullptr;
     }
 }
 
 void GrVkDescriptorSetManager::DescriptorPoolManager::abandonGPUResources() {
     fDescLayout = VK_NULL_HANDLE;
     if (fPool) {
         fPool->unrefAndAbandon();
         fPool = nullptr;
     }
 }