Grow descriptor pools by 1.5

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2121243002

Review-Url: https://codereview.chromium.org/2121243002

diff --git a/src/gpu/vk/GrVkPipelineState.cpp b/src/gpu/vk/GrVkPipelineState.cpp
index 8280e62c2a6ccbf5771e15a120ab47e6c9c13839..10a1ac9204acdee19b2377c91b58fc240ff24f7a 100644 (file)
--- a/src/gpu/vk/GrVkPipelineState.cpp
+++ b/src/gpu/vk/GrVkPipelineState.cpp
@@ -398,8 +398,9 @@ void GrVkPipelineState::addUniformResources(GrVkCommandBuffer& commandBuffer) {
 void GrVkPipelineState::DescriptorPoolManager::getNewPool(GrVkGpu* gpu) {
     if (fPool) {
         fPool->unref(gpu);
-        if (fMaxDescriptors < kMaxDescLimit >> 1) {
-            fMaxDescriptors = fMaxDescriptors << 1;
+        uint32_t newPoolSize = fMaxDescriptors + ((fMaxDescriptors + 1) >> 1);
+        if (newPoolSize < kMaxDescLimit) {
+            fMaxDescriptors = newPoolSize;
         } else {
             fMaxDescriptors = kMaxDescLimit;
         }

diff --git a/src/gpu/vk/GrVkResourceProvider.cpp b/src/gpu/vk/GrVkResourceProvider.cpp
index 19a2f7d87fe8a0468dd7aaae8a33d8ac90c1fc16..7980a2d5f48da7b106a95c22d8210ef2fc74926e 100644 (file)
--- a/src/gpu/vk/GrVkResourceProvider.cpp
+++ b/src/gpu/vk/GrVkResourceProvider.cpp
@@ -196,8 +196,9 @@ void GrVkResourceProvider::getUniformDescriptorSet(VkDescriptorSet* ds,
     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;
         }