OSDN Git Service

anv: assert that color attachment are valid
authorLionel Landwerlin <lionel.g.landwerlin@intel.com>
Wed, 6 Feb 2019 17:37:58 +0000 (17:37 +0000)
committerLionel Landwerlin <lionel.g.landwerlin@intel.com>
Fri, 8 Feb 2019 00:18:16 +0000 (00:18 +0000)
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 <lionel.g.landwerlin@intel.com>
Fixes: d76e7779884775 ("anv: Handle VK_ATTACHMENT_UNUSED in colorAttachment")
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
src/intel/vulkan/anv_blorp.c

index fbe3e82..f4eaf8f 100644 (file)
@@ -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)