Remove unnessary uniform barriers in Vulkan.

src/gpu/vk/GrVkPipelineState.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 "GrVkPipelineState.h"
 
 #include "GrPipeline.h"
@@ skipping 218 matching lines @@
         descriptorWrites[0].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
         descriptorWrites[0].pNext = nullptr;
         descriptorWrites[0].dstSet = fDescriptorSets[GrVkUniformHandler::kUniformBufferDescSet];
         descriptorWrites[0].dstBinding = GrVkUniformHandler::kVertexBinding;
         descriptorWrites[0].dstArrayElement = 0;
         descriptorWrites[0].descriptorCount = 1;
         descriptorWrites[0].descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
         descriptorWrites[0].pImageInfo = nullptr;
         descriptorWrites[0].pBufferInfo = &vertBufferInfo;
         descriptorWrites[0].pTexelBufferView = nullptr;
-
-        fVertexUniformBuffer->addMemoryBarrier(gpu,
-                                               VK_ACCESS_HOST_WRITE_BIT,
-                                               VK_ACCESS_UNIFORM_READ_BIT,
-                                               VK_PIPELINE_STAGE_HOST_BIT,
-                                               VK_PIPELINE_STAGE_VERTEX_SHADER_BIT,
-                                               false);
     }
 
     VkDescriptorBufferInfo fragBufferInfo;
     // Fragment Uniform Buffer
     if (fFragmentUniformBuffer.get()) {
         if (0 == uniformBindingUpdateCount) {
             firstUniformWrite = 1;
         }
         ++uniformBindingUpdateCount;
         memset(&fragBufferInfo, 0, sizeof(VkDescriptorBufferInfo));
         fragBufferInfo.buffer = fFragmentUniformBuffer->buffer();
         fragBufferInfo.offset = 0;
         fragBufferInfo.range = fFragmentUniformBuffer->size();
 
         descriptorWrites[1].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
         descriptorWrites[1].pNext = nullptr;
         descriptorWrites[1].dstSet = fDescriptorSets[GrVkUniformHandler::kUniformBufferDescSet];
         descriptorWrites[1].dstBinding = GrVkUniformHandler::kFragBinding;;
         descriptorWrites[1].dstArrayElement = 0;
         descriptorWrites[1].descriptorCount = 1;
         descriptorWrites[1].descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
         descriptorWrites[1].pImageInfo = nullptr;
         descriptorWrites[1].pBufferInfo = &fragBufferInfo;
         descriptorWrites[1].pTexelBufferView = nullptr;
-
-        fFragmentUniformBuffer->addMemoryBarrier(gpu,
-                                                 VK_ACCESS_HOST_WRITE_BIT,
-                                                 VK_ACCESS_UNIFORM_READ_BIT,
-                                                 VK_PIPELINE_STAGE_HOST_BIT,
-                                                 VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT,
-                                                 false);
     }
 
     if (uniformBindingUpdateCount) {
         GR_VK_CALL(gpu->vkInterface(), UpdateDescriptorSets(gpu->device(),
                                                             uniformBindingUpdateCount,
                                                             &descriptorWrites[firstUniformWrite],
                                                             0, nullptr));
     }
 }
 
@@ skipping 132 matching lines @@
         fPool = gpu->resourceProvider().findOrCreateCompatibleDescriptorPool(fDescType,
                                                                              fMaxDescriptors);
     }
     SkASSERT(fPool || !fMaxDescriptors);
 }
 
 void GrVkPipelineState::DescriptorPoolManager::getNewDescriptorSet(GrVkGpu* gpu, VkDescriptorSet* ds) {
     if (!fMaxDescriptors) {
         return;
     }
-    if (fCurrentDescriptorCount == fMaxDescriptors) {
+    fCurrentDescriptorCount += fDescCountPerSet;
+    if (fCurrentDescriptorCount > fMaxDescriptors) {
         this->getNewPool(gpu);
-        fCurrentDescriptorCount = 0;
+        fCurrentDescriptorCount = fDescCountPerSet;
     }
-    fCurrentDescriptorCount += fDescCountPerSet;
 
     VkDescriptorSetAllocateInfo dsAllocateInfo;
     memset(&dsAllocateInfo, 0, sizeof(VkDescriptorSetAllocateInfo));
     dsAllocateInfo.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO;
     dsAllocateInfo.pNext = nullptr;
     dsAllocateInfo.descriptorPool = fPool->descPool();
     dsAllocateInfo.descriptorSetCount = 1;
     dsAllocateInfo.pSetLayouts = &fDescLayout;
     GR_VK_CALL_ERRCHECK(gpu->vkInterface(), AllocateDescriptorSets(gpu->device(),
                                                                    &dsAllocateInfo,
@@ skipping 56 matching lines @@
 
     b.add32(get_blend_info_key(pipeline));
 
     b.add32(primitiveType);
 
     // Set key length
     int keyLength = key->count();
     SkASSERT(0 == (keyLength % 4));
     *reinterpret_cast<uint32_t*>(key->begin()) = SkToU32(keyLength);
 }