From b5116d3cb7b6d81532fa15f8d94942ce94051652 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Mon, 22 Jul 2019 10:12:48 +0200 Subject: radv: fix crash in vkCmdClearAttachments with unused attachment depth_stencil_attachment and/or ds_resolve attachment can be NULL. This fixes crashes with dEQP-VK.renderpass.suballocation.unused_clear_attachments.* Cc: 19.1 Signed-off-by: Samuel Pitoiset Reviewed-by: Bas Nieuwenhuizen --- src/amd/vulkan/radv_meta_clear.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/amd') diff --git a/src/amd/vulkan/radv_meta_clear.c b/src/amd/vulkan/radv_meta_clear.c index dd2ba402f40..b93ba3e0b29 100644 --- a/src/amd/vulkan/radv_meta_clear.c +++ b/src/amd/vulkan/radv_meta_clear.c @@ -1688,7 +1688,7 @@ emit_clear(struct radv_cmd_buffer *cmd_buffer, if (ds_resolve_clear) ds_att = subpass->ds_resolve_attachment; - if (ds_att->attachment == VK_ATTACHMENT_UNUSED) + if (!ds_att || ds_att->attachment == VK_ATTACHMENT_UNUSED) return; VkImageLayout image_layout = ds_att->layout; -- cgit v1.2.3