[Mesa-stable] [Mesa-dev] [PATCH] radv: fix crash in vkCmdClearAttachments with unused attachment

[Juan A. Suarez Romero]

On Mon, 2019-07-22 at 10:12 +0200, Samuel Pitoiset wrote:
> 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 at lists.freedesktop.org>
> Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
> ---


This does not apply cleanly, so I've resolved it as 
https://gitlab.freedesktop.org/mesa/mesa/commit/e1800b20f44670829ce4d3ec9c0df2f9f2d87976


	J.A.

>  src/amd/vulkan/radv_meta_clear.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> 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;