Always bind input attachment to all pipelines in subpasses that uses one.

The vulkan spec says that if a subpass has an input attachment that the
input attachment descriptor set must be bound to all pipelines in that
subpass. This includes pipelines that don't actually use the input
attachment.

Bug: chromium:1134454
Change-Id: I9a544a9a457dde80d315010a626ae74eb422bb9b
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/321779
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>

Author: egdaniel

src/gpu/vk/GrVkOpsRenderPass.cpp

@@ -563,9 +563,11 @@ bool GrVkOpsRenderPass::onBindTextures(const GrPrimitiveProcessor& primProc,
                                                    this->currentCommandBuffer())) {
         return false;
     }
-    return fCurrentPipelineState->setAndBindInputAttachment(
-            fGpu, static_cast<GrVkRenderTarget*>(fRenderTarget), pipeline,
-            this->currentCommandBuffer());
+    if (fSelfDependencyFlags == SelfDependencyFlags::kForInputAttachment) {
+        return fCurrentPipelineState->setAndBindInputAttachment(
+                fGpu, static_cast<GrVkRenderTarget*>(fRenderTarget), this->currentCommandBuffer());
+    }
+    return true;
 }
 
 void GrVkOpsRenderPass::onBindBuffers(sk_sp<const GrBuffer> indexBuffer,

src/gpu/vk/GrVkPipelineState.cpp

@@ -219,22 +219,19 @@ bool GrVkPipelineState::setAndBindTextures(GrVkGpu* gpu,
 
 bool GrVkPipelineState::setAndBindInputAttachment(GrVkGpu* gpu,
                                                   GrVkRenderTarget* renderTarget,
-                                                  const GrPipeline& pipeline,
                                                   GrVkCommandBuffer* commandBuffer) {
-    if (pipeline.usesInputAttachment()) {
-        SkASSERT(renderTarget->supportsInputAttachmentUsage());
-        const GrVkDescriptorSet* descriptorSet = renderTarget->inputDescSet(gpu);
-        if (!descriptorSet) {
-            return false;
-        }
-        commandBuffer->bindDescriptorSets(gpu, this, fPipeline->layout(),
-                                          GrVkUniformHandler::kInputDescSet, /*setCount=*/1,
-                                          descriptorSet->descriptorSet(),
-                                          /*dynamicOffsetCount=*/0, /*dynamicOffsets=*/nullptr);
-        // We don't add the input resource to the command buffer to track since the input will be
-        // the same as the color attachment which is already tracked on the command buffer.
-        commandBuffer->addRecycledResource(descriptorSet);
+    SkASSERT(renderTarget->supportsInputAttachmentUsage());
+    const GrVkDescriptorSet* descriptorSet = renderTarget->inputDescSet(gpu);
+    if (!descriptorSet) {
+        return false;
     }
+    commandBuffer->bindDescriptorSets(gpu, this, fPipeline->layout(),
+                                      GrVkUniformHandler::kInputDescSet, /*setCount=*/1,
+                                      descriptorSet->descriptorSet(),
+                                      /*dynamicOffsetCount=*/0, /*dynamicOffsets=*/nullptr);
+    // We don't add the input resource to the command buffer to track since the input will be
+    // the same as the color attachment which is already tracked on the command buffer.
+    commandBuffer->addRecycledResource(descriptorSet);
     return true;
 }
 

src/gpu/vk/GrVkPipelineState.h

@@ -62,8 +62,7 @@ class GrVkPipelineState {
                             const GrSurfaceProxy* const primitiveProcessorTextures[],
                             GrVkCommandBuffer*);
 
-    bool setAndBindInputAttachment(GrVkGpu*, GrVkRenderTarget* renderTarget, const GrPipeline&,
-                                   GrVkCommandBuffer*);
+    bool setAndBindInputAttachment(GrVkGpu*, GrVkRenderTarget* renderTarget, GrVkCommandBuffer*);
 
     void bindPipeline(const GrVkGpu* gpu, GrVkCommandBuffer* commandBuffer);
 

src/gpu/vk/GrVkPipelineStateBuilder.cpp

@@ -183,7 +183,7 @@ GrVkPipelineState* GrVkPipelineStateBuilder::finalize(const GrProgramDesc& desc,
 
     dsLayout[GrVkUniformHandler::kInputDescSet] = resourceProvider.getInputDSLayout();
 
-    bool usesInput = fProgramInfo.pipeline().usesInputAttachment();
+    bool usesInput = SkToBool(fProgramInfo.renderPassBarriers() & GrXferBarrierFlags::kTexture);
     uint32_t layoutCount =
             usesInput ? GrVkUniformHandler::kDescSetCount : (GrVkUniformHandler::kDescSetCount - 1);
     // Create the VkPipelineLayout