Mesa (staging/21.3): zink: set aspectMask for renderpass2 VkAttachmentReference2 structs

[GitLab Mirror]

Module: Mesa
Branch: staging/21.3
Commit: bf66b729e780f5f8b318c524c167b44b2d3578c7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=bf66b729e780f5f8b318c524c167b44b2d3578c7

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Wed Oct 27 16:32:55 2021 -0400

zink: set aspectMask for renderpass2 VkAttachmentReference2 structs

this is otherwise just garbage

fixes #5569

cc: mesa-stable

Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13561>
(cherry picked from commit 4d9fc17ae8c24a8f4e40a17600e8d4205c27b2bf)

---

 .pick_status.json                           | 2 +-
 src/gallium/drivers/zink/zink_render_pass.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 5f6c00bc9c3..b35fff27030 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -175,7 +175,7 @@
         "description": "zink: set aspectMask for renderpass2 VkAttachmentReference2 structs",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/drivers/zink/zink_render_pass.c b/src/gallium/drivers/zink/zink_render_pass.c
index 265bf941e22..22511915a34 100644
--- a/src/gallium/drivers/zink/zink_render_pass.c
+++ b/src/gallium/drivers/zink/zink_render_pass.c
@@ -168,6 +168,7 @@ create_render_pass2(struct zink_screen *screen, struct zink_render_pass_state *s
       color_refs[i].pNext = NULL;
       color_refs[i].attachment = i;
       color_refs[i].layout = layout;
+      color_refs[i].aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
       dep_pipeline |= VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
       if (rt->fbfetch)
          memcpy(&input_attachments[input_count++], &color_refs[i], sizeof(VkAttachmentReference2));