vk: Fix vkCreate/DestroyRenderPass

While updating vkDestroyObject, I discovered that vkDestroyPass reliably
crashes. That hasn't been an issue yet, though, because it is never
called.

In vkCreateRenderPass:
    - Don't allocate empty attachment arrays.
    - Ensure that pointers to empty attachment arrays are NULL.
    - Store VkRenderPassCreateInfo::subpassCount as
      anv_render_pass::subpass_count.

In vkDestroyRenderPass:
    - Fix loop bounds: s/attachment_count/subpass_count/
    - Don't call anv_device_free on null pointers.

diff --git a/src/vulkan/device.c b/src/vulkan/device.c
index 7e230249d073577801e8ead770db4226f86085d7..a4165ac1c817edec2177536fa065fad0aad2091a 100644 (file)
--- a/src/vulkan/device.c
+++ b/src/vulkan/device.c
@@ -4045,7 +4045,14 @@ VkResult anv_CreateRenderPass(
    if (pass == NULL)
       return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
 
+   /* Clear the subpasses along with the parent pass. This required because
+    * each array member of anv_subpass must be a valid pointer if not NULL.
+    */
+   memset(pass, 0, size);
+
    pass->attachment_count = pCreateInfo->attachmentCount;
+   pass->subpass_count = pCreateInfo->subpassCount;
+
    size = pCreateInfo->attachmentCount * sizeof(*pass->attachments);
    pass->attachments = anv_device_alloc(device, size, 8,
                                         VK_SYSTEM_ALLOC_TYPE_API_OBJECT);
@@ -4063,25 +4070,39 @@ VkResult anv_CreateRenderPass(
       struct anv_subpass *subpass = &pass->subpasses[i];
 
       subpass->input_count = desc->inputCount;
-      subpass->input_attachments =
-         anv_device_alloc(device, desc->inputCount * sizeof(uint32_t),
-                          8, VK_SYSTEM_ALLOC_TYPE_API_OBJECT);
-      for (uint32_t j = 0; j < desc->inputCount; j++)
-         subpass->input_attachments[j] = desc->inputAttachments[j].attachment;
-
       subpass->color_count = desc->colorCount;
-      subpass->color_attachments =
-         anv_device_alloc(device, desc->colorCount * sizeof(uint32_t),
-                          8, VK_SYSTEM_ALLOC_TYPE_API_OBJECT);
-      for (uint32_t j = 0; j < desc->colorCount; j++)
-         subpass->color_attachments[j] = desc->colorAttachments[j].attachment;
+
+      if (desc->inputCount > 0) {
+         subpass->input_attachments =
+            anv_device_alloc(device, desc->inputCount * sizeof(uint32_t),
+                             8, VK_SYSTEM_ALLOC_TYPE_API_OBJECT);
+
+         for (uint32_t j = 0; j < desc->inputCount; j++) {
+            subpass->input_attachments[j]
+               = desc->inputAttachments[j].attachment;
+         }
+      }
+
+      if (desc->colorCount > 0) {
+         subpass->color_attachments =
+            anv_device_alloc(device, desc->colorCount * sizeof(uint32_t),
+                             8, VK_SYSTEM_ALLOC_TYPE_API_OBJECT);
+
+         for (uint32_t j = 0; j < desc->colorCount; j++) {
+            subpass->color_attachments[j]
+               = desc->colorAttachments[j].attachment;
+         }
+      }
 
       if (desc->resolveAttachments) {
          subpass->resolve_attachments =
             anv_device_alloc(device, desc->colorCount * sizeof(uint32_t),
                              8, VK_SYSTEM_ALLOC_TYPE_API_OBJECT);
-         for (uint32_t j = 0; j < desc->colorCount; j++)
-            subpass->resolve_attachments[j] = desc->resolveAttachments[j].attachment;
+
+         for (uint32_t j = 0; j < desc->colorCount; j++) {
+            subpass->resolve_attachments[j]
+               = desc->resolveAttachments[j].attachment;
+         }
       }
 
       subpass->depth_stencil_attachment = desc->depthStencilAttachment.attachment;
@@ -4101,10 +4122,18 @@ VkResult anv_DestroyRenderPass(
 
    anv_device_free(device, pass->attachments);
 
-   for (uint32_t i = 0; i < pass->attachment_count; i++) {
-      anv_device_free(device, pass->subpasses[i].input_attachments);
-      anv_device_free(device, pass->subpasses[i].color_attachments);
-      anv_device_free(device, pass->subpasses[i].resolve_attachments);
+   for (uint32_t i = 0; i < pass->subpass_count; i++) {
+      /* In VkSubpassCreateInfo, each of the attachment arrays may be null.
+       * Don't free the null arrays.
+       */
+      struct anv_subpass *subpass = &pass->subpasses[i];
+
+      if (subpass->input_attachments)
+         anv_device_free(device, subpass->input_attachments);
+      if (subpass->color_attachments)
+         anv_device_free(device, subpass->color_attachments);
+      if (subpass->resolve_attachments)
+         anv_device_free(device, subpass->resolve_attachments);
    }
 
    anv_device_free(device, pass);

diff --git a/src/vulkan/private.h b/src/vulkan/private.h
index 949962b8c048caebf1944cb2d80f7b38c380f6d0..2990634dc6fdaab6d20c7b07d3447c5f5efac567 100644 (file)
--- a/src/vulkan/private.h
+++ b/src/vulkan/private.h
@@ -959,8 +959,9 @@ struct anv_render_pass_attachment {
 
 struct anv_render_pass {
    uint32_t                                     attachment_count;
-   struct anv_render_pass_attachment *          attachments;
+   uint32_t                                     subpass_count;
 
+   struct anv_render_pass_attachment *          attachments;
    struct anv_subpass                           subpasses[0];
 };