anv/pass: Don't set first_subpass_layout for stencil-only attachments

Cc: mesa-stable@lists.freedesktop.org

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13980>
(cherry picked from commit 6612dcc425)
This commit is contained in:
Jason Ekstrand 2021-10-26 12:38:18 -05:00 committed by Eric Engestrom
parent 0051b41362
commit 5a106c47d7
2 changed files with 6 additions and 2 deletions

View file

@ -4756,7 +4756,7 @@
"description": "anv/pass: Don't set first_subpass_layout for stencil-only attachments",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null
},

View file

@ -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);
}