From caaab9f5e3354277ff814927438eab358ca7655c Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 18 Aug 2022 12:18:12 -0400 Subject: [PATCH] vk/render_pass: don't deref null resolve attachments Fixes: d2990b65997 ("vulkan: hook up VK_EXT_multisampled_render_to_single_sampled") Reviewed-by: Jason Ekstrand Part-of: (cherry picked from commit 9474ff72dda61fa7df58d735f4d3b45574e6758d) --- .pick_status.json | 2 +- src/vulkan/runtime/vk_render_pass.c | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index b0450f14bd1..3b54be0ddbd 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -76,7 +76,7 @@ "description": "vk/render_pass: don't deref null resolve attachments", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "d2990b659978c2cce6668ee6ceb2570592c81f32" }, diff --git a/src/vulkan/runtime/vk_render_pass.c b/src/vulkan/runtime/vk_render_pass.c index 046bcf6b4fd..451c25670a4 100644 --- a/src/vulkan/runtime/vk_render_pass.c +++ b/src/vulkan/runtime/vk_render_pass.c @@ -1839,22 +1839,24 @@ begin_subpass(struct vk_command_buffer *cmd_buffer, if (depth_resolve_mode != VK_RESOLVE_MODE_NONE) { depth_attachment.resolveMode = depth_resolve_mode; - if (sp_att->resolve) + if (sp_att->resolve) { depth_attachment.resolveImageView = vk_image_view_to_handle(res_att_state->image_view); - depth_attachment.resolveImageLayout = - sp_att->resolve->layout; + depth_attachment.resolveImageLayout = + sp_att->resolve->layout; + } resolved_aspects |= VK_IMAGE_ASPECT_DEPTH_BIT; } if (stencil_resolve_mode != VK_RESOLVE_MODE_NONE) { stencil_attachment.resolveMode = stencil_resolve_mode; - if (sp_att->resolve) + if (sp_att->resolve) { stencil_attachment.resolveImageView = vk_image_view_to_handle(res_att_state->image_view); - stencil_attachment.resolveImageLayout = - sp_att->resolve->stencil_layout; + stencil_attachment.resolveImageLayout = + sp_att->resolve->stencil_layout; + } resolved_aspects |= VK_IMAGE_ASPECT_STENCIL_BIT; }