From 6612dcc4258b8c50b497afd7c276bbe3fd11d652 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Tue, 26 Oct 2021 12:38:18 -0500 Subject: [PATCH] anv/pass: Don't set first_subpass_layout for stencil-only attachments Cc: mesa-stable@lists.freedesktop.org Reviewed-by: Lionel Landwerlin Part-of: --- src/intel/vulkan/anv_pass.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/intel/vulkan/anv_pass.c b/src/intel/vulkan/anv_pass.c index 491525e7399..91e4efd4533 100644 --- a/src/intel/vulkan/anv_pass.c +++ b/src/intel/vulkan/anv_pass.c @@ -107,7 +107,11 @@ anv_render_pass_compile(struct anv_render_pass *pass) all_usage |= subpass_att->usage; - if (pass_att->first_subpass_layout == VK_IMAGE_LAYOUT_UNDEFINED) { + /* first_subpass_layout only applies to color and depth. + * See genX(cmd_buffer_setup_attachments) + */ + if (vk_format_aspects(pass_att->format) != VK_IMAGE_ASPECT_STENCIL_BIT && + pass_att->first_subpass_layout == VK_IMAGE_LAYOUT_UNDEFINED) { pass_att->first_subpass_layout = subpass_att->layout; assert(pass_att->first_subpass_layout != VK_IMAGE_LAYOUT_UNDEFINED); }