Grow descriptor pools by 1.5

src/gpu/vk/GrVkResourceProvider.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 "GrVkResourceProvider.h"
 
 #include "GrTextureParams.h"
@@ skipping 178 matching lines @@
                                                                  GrPrimitiveType primitiveType,
                                                                  const GrVkRenderPass& renderPass) {
     return fPipelineStateCache->refPipelineState(pipeline, proc, primitiveType, renderPass);
 }
 
 void GrVkResourceProvider::getUniformDescriptorSet(VkDescriptorSet* ds,
                                                    const GrVkDescriptorPool** outPool) {
     fCurrentUniformDescCount += kNumUniformDescPerSet;
     if (fCurrentUniformDescCount > fCurrMaxUniDescriptors) {
         fUniformDescPool->unref(fGpu);
-        if (fCurrMaxUniDescriptors < kMaxUniformDescriptors >> 1) {
-            fCurrMaxUniDescriptors = fCurrMaxUniDescriptors << 1;
+        uint32_t newPoolSize = fCurrMaxUniDescriptors + ((fCurrMaxUniDescriptors + 1) >> 1);
+        if (newPoolSize < kMaxUniformDescriptors) {
+            fCurrMaxUniDescriptors = newPoolSize;
         } else {
             fCurrMaxUniDescriptors = kMaxUniformDescriptors;
         }
         fUniformDescPool =
             this->findOrCreateCompatibleDescriptorPool(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,
                                                        fCurrMaxUniDescriptors);
         fCurrentUniformDescCount = kNumUniformDescPerSet;
     }
     SkASSERT(fUniformDescPool);
 
@@ skipping 145 matching lines @@
 }
 
 void GrVkResourceProvider::CompatibleRenderPassSet::abandonResources() {
     for (int i = 0; i < fRenderPasses.count(); ++i) {
         if (fRenderPasses[i]) {
             fRenderPasses[i]->unrefAndAbandon();
             fRenderPasses[i] = nullptr;
         }
     }
 }