commit 8cc5f19f439d31e832b137664b75b11607096eb3
author Greg Daniel <egdaniel@google.com> Fri Oct 02 10:45:43 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Oct 02 17:42:34 2020 +0000
tree c627ebe351e10e7fe75085966e576c1a1bac0ac7
parent 36366209d4124d99be561545e02b0a165bd829c4

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>

src/gpu/vk/GrVkPipelineState.h

diff --git a/src/gpu/vk/GrVkPipelineState.h b/src/gpu/vk/GrVkPipelineState.h
index dce75f1..036366a 100644
--- a/src/gpu/vk/GrVkPipelineState.h
+++ b/src/gpu/vk/GrVkPipelineState.h
@@ -62,8 +62,7 @@
                             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);