Mesa (main): anv/pass: Don't set first_subpass_layout for stencil-only attachments

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 6612dcc4258b8c50b497afd7c276bbe3fd11d652
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6612dcc4258b8c50b497afd7c276bbe3fd11d652

Author: Jason Ekstrand <jason at jlekstrand.net>
Date:   Tue Oct 26 12:38:18 2021 -0500

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

Cc: mesa-stable at lists.freedesktop.org

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13980>

---

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