summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2021-10-27 16:32:55 -0400
committerEric Engestrom <eric@engestrom.ch>2021-11-03 20:15:44 +0000
commit88da00b28b48450712db99a4b02f1ac7f734c8f7 (patch)
treed2d5cdb6d3fdd7252cf128911577fee9e489ce06
parentd57b43827a68ec68b9510ac99e5ec49e2a9fc5d9 (diff)
downloadmesa-88da00b28b48450712db99a4b02f1ac7f734c8f7.tar.gz
zink: set aspectMask for renderpass2 VkAttachmentReference2 structs
this is otherwise just garbage fixes #5569 cc: mesa-stable Reviewed-by: Dave Airlie <airlied@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13561> (cherry picked from commit 4d9fc17ae8c24a8f4e40a17600e8d4205c27b2bf)
-rw-r--r--.pick_status.json2
-rw-r--r--src/gallium/drivers/zink/zink_render_pass.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/.pick_status.json b/.pick_status.json
index 1e17434ebb2..f824e08b973 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1750,7 +1750,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));