Switch uniforms to be descriptor set 0 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 19 matching lines @@
                                      const BuiltinUniformHandles& builtinUniformHandles,
                                      const UniformInfoArray& uniforms,
                                      uint32_t vertexUniformSize,
                                      uint32_t fragmentUniformSize,
                                      uint32_t numSamplers,
                                      GrGLSLPrimitiveProcessor* geometryProcessor,
                                      GrGLSLXferProcessor* xferProcessor,
                                      const GrGLSLFragProcs& fragmentProcessors)
     : fPipeline(pipeline)
     , fPipelineLayout(layout)
+    , fStartDS(SK_MaxS32)
+    , fDSCount(0)
     , fBuiltinUniformHandles(builtinUniformHandles)
     , fGeometryProcessor(geometryProcessor)
     , fXferProcessor(xferProcessor)
     , fFragmentProcessors(fragmentProcessors)
     , fDesc(desc)
     , fDataManager(uniforms, vertexUniformSize, fragmentUniformSize)
     , fSamplerPoolManager(dsLayout[GrVkUniformHandler::kSamplerDescSet],
                           VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, numSamplers, gpu)
     , fUniformPoolManager(dsLayout[GrVkUniformHandler::kUniformBufferDescSet],
-                          VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 2, gpu) {
+                          VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,
+                          (vertexUniformSize || fragmentUniformSize) ? 2 : 0, gpu) {
     fSamplers.setReserve(numSamplers);
     fTextureViews.setReserve(numSamplers);
     fTextures.setReserve(numSamplers);
 
     fDescriptorSets[0] = VK_NULL_HANDLE;
     fDescriptorSets[1] = VK_NULL_HANDLE;
 
     // Currently we are always binding a descriptor set for uniform buffers.
-    fStartDS = GrVkUniformHandler::kUniformBufferDescSet;
-    fDSCount = 1;
+    if (vertexUniformSize || fragmentUniformSize) {
+        fDSCount++;
+        fStartDS = GrVkUniformHandler::kUniformBufferDescSet;
+    }
     if (numSamplers) {
         fDSCount++;
         fStartDS = SkTMin(fStartDS, (int)GrVkUniformHandler::kSamplerDescSet);
     }
 
     fVertexUniformBuffer.reset(GrVkUniformBuffer::Create(gpu, vertexUniformSize, true));
     fFragmentUniformBuffer.reset(GrVkUniformBuffer::Create(gpu, fragmentUniformSize, true));
 
     fNumSamplers = numSamplers;
 }
@@ skipping 112 matching lines @@
         append_texture_bindings(processor, &textureBindings);
     }
 
     fXferProcessor->setData(fDataManager, pipeline.getXferProcessor());
     append_texture_bindings(pipeline.getXferProcessor(), &textureBindings);
 
     // Get new descriptor sets
     if (fNumSamplers) {
         fSamplerPoolManager.getNewDescriptorSet(gpu,
                                              &fDescriptorSets[GrVkUniformHandler::kSamplerDescSet]);
+        this->writeSamplers(gpu, textureBindings);
     }
-    fUniformPoolManager.getNewDescriptorSet(gpu,
+
+
+    if (fVertexUniformBuffer.get() || fFragmentUniformBuffer.get()) {
+        fUniformPoolManager.getNewDescriptorSet(gpu,
                                        &fDescriptorSets[GrVkUniformHandler::kUniformBufferDescSet]);
-
-    this->writeUniformBuffers(gpu);
-
-    this->writeSamplers(gpu, textureBindings);
+        this->writeUniformBuffers(gpu);
+    }
 }
 
 void GrVkPipelineState::writeUniformBuffers(const GrVkGpu* gpu) {
     fDataManager.uploadUniformBuffers(gpu, fVertexUniformBuffer, fFragmentUniformBuffer);
 
     VkWriteDescriptorSet descriptorWrites[2];
     memset(descriptorWrites, 0, 2 * sizeof(VkWriteDescriptorSet));
 
     uint32_t firstUniformWrite = 0;
     uint32_t uniformBindingUpdateCount = 0;
 
     VkDescriptorBufferInfo vertBufferInfo;
     // Vertex Uniform Buffer
     if (fVertexUniformBuffer.get()) {
         ++uniformBindingUpdateCount;
         memset(&vertBufferInfo, 0, sizeof(VkDescriptorBufferInfo));
         vertBufferInfo.buffer = fVertexUniformBuffer->buffer();
         vertBufferInfo.offset = 0;
         vertBufferInfo.range = fVertexUniformBuffer->size();
 
         descriptorWrites[0].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
         descriptorWrites[0].pNext = nullptr;
-        descriptorWrites[0].dstSet = fDescriptorSets[1];
+        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,
@@ skipping 10 matching lines @@
             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[1];
+        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,
@@ skipping 224 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);
 }