From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Mon, 22 Jul 2019 08:12:48 +0000 (+0200)
Subject: radv: fix crash in vkCmdClearAttachments with unused attachment
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b5116d3cb7b6d81532fa15f8d94942ce94051652;p=mesa.git

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 <mesa-stable@lists.freedesktop.org>
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
---

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;