From f1bcb9be46898580c9928c3dc9078f9f3e0be67d Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Wed, 6 Feb 2019 17:48:38 +0000 Subject: [PATCH] radv: assert that colorAttachment is valid for CmdClearAttachment This partially reverts a change from b7a93cbdede05a ("radv: Handle VK_ATTACHMENT_UNUSED in CmdClearAttachment") which fixed actual issues but also started to accept invalid values for the colorAttachment field. This change asserts that the field is valid for the current pass. Signed-off-by: Lionel Landwerlin Fixes: b7a93cbdede05a ("radv: Handle VK_ATTACHMENT_UNUSED in CmdClearAttachment") Reviewed-by: Bas Nieuwenhuizen --- src/amd/vulkan/radv_meta_clear.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/amd/vulkan/radv_meta_clear.c b/src/amd/vulkan/radv_meta_clear.c index 35da5fb1a6a..4f557092838 100644 --- a/src/amd/vulkan/radv_meta_clear.c +++ b/src/amd/vulkan/radv_meta_clear.c @@ -1522,9 +1522,7 @@ emit_clear(struct radv_cmd_buffer *cmd_buffer, if (aspects & VK_IMAGE_ASPECT_COLOR_BIT) { const uint32_t subpass_att = clear_att->colorAttachment; - if (subpass_att == VK_ATTACHMENT_UNUSED) - return; - + assert(subpass_att < subpass->color_count); const uint32_t pass_att = subpass->color_attachments[subpass_att].attachment; if (pass_att == VK_ATTACHMENT_UNUSED) return; -- 2.30.2