From a934a3d1245d823650a18830bab2f6b7b4b4dbbe Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Wed, 6 Feb 2019 17:37:58 +0000 Subject: [PATCH] anv: assert that color attachment are valid This reverts commit d76e7779884775bcebf235adb0e8367816b9b95d. Let's make this obvious that there is an application issue if it tries to access an attachment that doesn't exist in the current pass. Signed-off-by: Lionel Landwerlin Fixes: d76e7779884775 ("anv: Handle VK_ATTACHMENT_UNUSED in colorAttachment") Reviewed-by: Jason Ekstrand --- src/intel/vulkan/anv_blorp.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/intel/vulkan/anv_blorp.c b/src/intel/vulkan/anv_blorp.c index fbe3e82af59..f4eaf8f4db1 100644 --- a/src/intel/vulkan/anv_blorp.c +++ b/src/intel/vulkan/anv_blorp.c @@ -1013,10 +1013,7 @@ clear_color_attachment(struct anv_cmd_buffer *cmd_buffer, { const struct anv_subpass *subpass = cmd_buffer->state.subpass; const uint32_t color_att = attachment->colorAttachment; - - if (color_att == VK_ATTACHMENT_UNUSED) - return; - + assert(color_att < subpass->color_count); const uint32_t att_idx = subpass->color_attachments[color_att].attachment; if (att_idx == VK_ATTACHMENT_UNUSED) -- 2.30.2