Index: src/gpu/vk/GrVkProgramBuilder.cpp |
diff --git a/src/gpu/vk/GrVkProgramBuilder.cpp b/src/gpu/vk/GrVkProgramBuilder.cpp |
index 916b8c3b5f92546a846153e9ab954d7ee5720187..ccd0646f4dfc4838e258e3bc35d7d6bf0ca5c404 100644 |
--- a/src/gpu/vk/GrVkProgramBuilder.cpp |
+++ b/src/gpu/vk/GrVkProgramBuilder.cpp |
@@ -285,33 +285,10 @@ GrVkProgram* GrVkProgramBuilder::finalize(const DrawArgs& args, |
return nullptr; |
} |
- |
- GrVkDescriptorPool::DescriptorTypeCounts typeCounts; |
- typeCounts.setTypeCount(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 2); |
- SkASSERT(numSamplers < 256); |
- typeCounts.setTypeCount(VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, (uint8_t)numSamplers); |
- GrVkDescriptorPool* descriptorPool = |
- fGpu->resourceProvider().findOrCreateCompatibleDescriptorPool(typeCounts); |
- |
- VkDescriptorSetAllocateInfo dsAllocateInfo; |
- memset(&dsAllocateInfo, 0, sizeof(VkDescriptorSetAllocateInfo)); |
- dsAllocateInfo.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO; |
- dsAllocateInfo.pNext = nullptr; |
- dsAllocateInfo.descriptorPool = descriptorPool->descPool(); |
- dsAllocateInfo.descriptorSetCount = 2; |
- dsAllocateInfo.pSetLayouts = dsLayout; |
- |
- VkDescriptorSet descriptorSets[2]; |
- GR_VK_CALL_ERRCHECK(fGpu->vkInterface(), AllocateDescriptorSets(fGpu->device(), |
- &dsAllocateInfo, |
- descriptorSets)); |
- |
return new GrVkProgram(fGpu, |
pipeline, |
pipelineLayout, |
dsLayout, |
- descriptorPool, |
- descriptorSets, |
fUniformHandles, |
fUniformHandler.fUniforms, |
fUniformHandler.fCurrentVertexUBOOffset, |