anv/radv: release memory allocated by glsl types during spirv_to_nir
[mesa.git] / src / amd / vulkan / radv_pass.c
index ac9f93812161f74ec83dec0ff0748ef543cdd785..4d1e38a780e89e3092665e0e9b8c433a50bd206a 100644 (file)
 
 #include "vk_util.h"
 
+static void
+radv_render_pass_add_subpass_dep(struct radv_render_pass *pass,
+                                const VkSubpassDependency2KHR *dep)
+{
+       uint32_t src = dep->srcSubpass;
+       uint32_t dst = dep->dstSubpass;
+
+       /* Ignore subpass self-dependencies as they allow the app to call
+        * vkCmdPipelineBarrier() inside the render pass and the driver should
+        * only do the barrier when called, not when starting the render pass.
+        */
+       if (src == dst)
+               return;
+
+       /* Accumulate all ingoing external dependencies to the first subpass. */
+       if (src == VK_SUBPASS_EXTERNAL)
+               dst = 0;
+
+       if (dst == VK_SUBPASS_EXTERNAL) {
+               if (dep->dstStageMask != VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT)
+                       pass->end_barrier.src_stage_mask |= dep->srcStageMask;
+               pass->end_barrier.src_access_mask |= dep->srcAccessMask;
+               pass->end_barrier.dst_access_mask |= dep->dstAccessMask;
+       } else {
+               if (dep->dstStageMask != VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT)
+                       pass->subpasses[dst].start_barrier.src_stage_mask |= dep->srcStageMask;
+               pass->subpasses[dst].start_barrier.src_access_mask |= dep->srcAccessMask;
+               pass->subpasses[dst].start_barrier.dst_access_mask |= dep->dstAccessMask;
+       }
+}
+
 static void
 radv_render_pass_compile(struct radv_render_pass *pass)
 {
        for (uint32_t i = 0; i < pass->subpass_count; i++) {
                struct radv_subpass *subpass = &pass->subpasses[i];
+               uint32_t color_sample_count = 1, depth_sample_count = 1;
 
                /* We don't allow depth_stencil_attachment to be non-NULL and
                 * be VK_ATTACHMENT_UNUSED.  This way something can just check
@@ -54,6 +86,46 @@ radv_render_pass_compile(struct radv_render_pass *pass)
 
                        pass_att->last_subpass_idx = i;
                }
+
+               subpass->has_color_att = false;
+               for (uint32_t j = 0; j < subpass->color_count; j++) {
+                       struct radv_subpass_attachment *subpass_att =
+                               &subpass->color_attachments[j];
+                       if (subpass_att->attachment == VK_ATTACHMENT_UNUSED)
+                               continue;
+
+                       subpass->has_color_att = true;
+
+                       struct radv_render_pass_attachment *pass_att =
+                               &pass->attachments[subpass_att->attachment];
+
+                       color_sample_count = pass_att->samples;
+               }
+
+               if (subpass->depth_stencil_attachment) {
+                       const uint32_t a =
+                               subpass->depth_stencil_attachment->attachment;
+                       struct radv_render_pass_attachment *pass_att =
+                               &pass->attachments[a];
+                       depth_sample_count = pass_att->samples;
+               }
+
+               subpass->max_sample_count = MAX2(color_sample_count,
+                                                depth_sample_count);
+
+               /* We have to handle resolve attachments specially */
+               subpass->has_resolve = false;
+               if (subpass->resolve_attachments) {
+                       for (uint32_t j = 0; j < subpass->color_count; j++) {
+                               struct radv_subpass_attachment *resolve_att =
+                                       &subpass->resolve_attachments[j];
+
+                               if (resolve_att->attachment == VK_ATTACHMENT_UNUSED)
+                                       continue;
+
+                               subpass->has_resolve = true;
+                       }
+               }
        }
 }
 
@@ -139,7 +211,6 @@ VkResult radv_CreateRenderPass(
        p = pass->subpass_attachments;
        for (uint32_t i = 0; i < pCreateInfo->subpassCount; i++) {
                const VkSubpassDescription *desc = &pCreateInfo->pSubpasses[i];
-               uint32_t color_sample_count = 1, depth_sample_count = 1;
                struct radv_subpass *subpass = &pass->subpasses[i];
 
                subpass->input_count = desc->inputAttachmentCount;
@@ -171,26 +242,18 @@ VkResult radv_CreateRenderPass(
                                        .attachment = desc->pColorAttachments[j].attachment,
                                        .layout = desc->pColorAttachments[j].layout,
                                };
-                               if (desc->pColorAttachments[j].attachment != VK_ATTACHMENT_UNUSED) {
-                                       color_sample_count = pCreateInfo->pAttachments[desc->pColorAttachments[j].attachment].samples;
-                               }
                        }
                }
 
-               subpass->has_resolve = false;
                if (desc->pResolveAttachments) {
                        subpass->resolve_attachments = p;
                        p += desc->colorAttachmentCount;
 
                        for (uint32_t j = 0; j < desc->colorAttachmentCount; j++) {
-                               uint32_t a = desc->pResolveAttachments[j].attachment;
                                subpass->resolve_attachments[j] = (struct radv_subpass_attachment) {
                                        .attachment = desc->pResolveAttachments[j].attachment,
                                        .layout = desc->pResolveAttachments[j].layout,
                                };
-                               if (a != VK_ATTACHMENT_UNUSED) {
-                                       subpass->has_resolve = true;
-                               }
                        }
                }
 
@@ -201,36 +264,21 @@ VkResult radv_CreateRenderPass(
                                .attachment = desc->pDepthStencilAttachment->attachment,
                                .layout = desc->pDepthStencilAttachment->layout,
                        };
-                       if (desc->pDepthStencilAttachment->attachment != VK_ATTACHMENT_UNUSED) {
-                               depth_sample_count = pCreateInfo->pAttachments[desc->pDepthStencilAttachment->attachment].samples;
-                       }
                }
-
-               subpass->max_sample_count = MAX2(color_sample_count,
-                                                depth_sample_count);
        }
 
        for (unsigned i = 0; i < pCreateInfo->dependencyCount; ++i) {
-               uint32_t src = pCreateInfo->pDependencies[i].srcSubpass;
-               uint32_t dst = pCreateInfo->pDependencies[i].dstSubpass;
-
-               /* Ignore subpass self-dependencies as they allow the app to
-                * call vkCmdPipelineBarrier() inside the render pass and the
-                * driver should only do the barrier when called, not when
-                * starting the render pass.
-                */
-               if (src == dst)
-                       continue;
-
-               if (dst == VK_SUBPASS_EXTERNAL) {
-                       pass->end_barrier.src_stage_mask = pCreateInfo->pDependencies[i].srcStageMask;
-                       pass->end_barrier.src_access_mask = pCreateInfo->pDependencies[i].srcAccessMask;
-                       pass->end_barrier.dst_access_mask = pCreateInfo->pDependencies[i].dstAccessMask;
-               } else {
-                       pass->subpasses[dst].start_barrier.src_stage_mask = pCreateInfo->pDependencies[i].srcStageMask;
-                       pass->subpasses[dst].start_barrier.src_access_mask = pCreateInfo->pDependencies[i].srcAccessMask;
-                       pass->subpasses[dst].start_barrier.dst_access_mask = pCreateInfo->pDependencies[i].dstAccessMask;
-               }
+               /* Convert to a Dependency2KHR */
+               struct VkSubpassDependency2KHR dep2 = {
+                       .srcSubpass       = pCreateInfo->pDependencies[i].srcSubpass,
+                       .dstSubpass       = pCreateInfo->pDependencies[i].dstSubpass,
+                       .srcStageMask     = pCreateInfo->pDependencies[i].srcStageMask,
+                       .dstStageMask     = pCreateInfo->pDependencies[i].dstStageMask,
+                       .srcAccessMask    = pCreateInfo->pDependencies[i].srcAccessMask,
+                       .dstAccessMask    = pCreateInfo->pDependencies[i].dstAccessMask,
+                       .dependencyFlags  = pCreateInfo->pDependencies[i].dependencyFlags,
+               };
+               radv_render_pass_add_subpass_dep(pass, &dep2);
        }
 
        radv_render_pass_compile(pass);
@@ -311,7 +359,6 @@ VkResult radv_CreateRenderPass2KHR(
        p = pass->subpass_attachments;
        for (uint32_t i = 0; i < pCreateInfo->subpassCount; i++) {
                const VkSubpassDescription2KHR *desc = &pCreateInfo->pSubpasses[i];
-               uint32_t color_sample_count = 1, depth_sample_count = 1;
                struct radv_subpass *subpass = &pass->subpasses[i];
 
                subpass->input_count = desc->inputAttachmentCount;
@@ -341,26 +388,18 @@ VkResult radv_CreateRenderPass2KHR(
                                        .attachment = desc->pColorAttachments[j].attachment,
                                        .layout = desc->pColorAttachments[j].layout,
                                };
-                               if (desc->pColorAttachments[j].attachment != VK_ATTACHMENT_UNUSED) {
-                                       color_sample_count = pCreateInfo->pAttachments[desc->pColorAttachments[j].attachment].samples;
-                               }
                        }
                }
 
-               subpass->has_resolve = false;
                if (desc->pResolveAttachments) {
                        subpass->resolve_attachments = p;
                        p += desc->colorAttachmentCount;
 
                        for (uint32_t j = 0; j < desc->colorAttachmentCount; j++) {
-                               uint32_t a = desc->pResolveAttachments[j].attachment;
                                subpass->resolve_attachments[j] = (struct radv_subpass_attachment) {
                                        .attachment = desc->pResolveAttachments[j].attachment,
                                        .layout = desc->pResolveAttachments[j].layout,
                                };
-                               if (a != VK_ATTACHMENT_UNUSED) {
-                                       subpass->has_resolve = true;
-                               }
                        }
                }
 
@@ -371,36 +410,12 @@ VkResult radv_CreateRenderPass2KHR(
                                .attachment = desc->pDepthStencilAttachment->attachment,
                                .layout = desc->pDepthStencilAttachment->layout,
                        };
-                       if (desc->pDepthStencilAttachment->attachment != VK_ATTACHMENT_UNUSED) {
-                               depth_sample_count = pCreateInfo->pAttachments[desc->pDepthStencilAttachment->attachment].samples;
-                       }
                }
-
-               subpass->max_sample_count = MAX2(color_sample_count,
-                                                depth_sample_count);
        }
 
        for (unsigned i = 0; i < pCreateInfo->dependencyCount; ++i) {
-               uint32_t src = pCreateInfo->pDependencies[i].srcSubpass;
-               uint32_t dst = pCreateInfo->pDependencies[i].dstSubpass;
-
-               /* Ignore subpass self-dependencies as they allow the app to
-                * call vkCmdPipelineBarrier() inside the render pass and the
-                * driver should only do the barrier when called, not when
-                * starting the render pass.
-                */
-               if (src == dst)
-                       continue;
-
-               if (dst == VK_SUBPASS_EXTERNAL) {
-                       pass->end_barrier.src_stage_mask = pCreateInfo->pDependencies[i].srcStageMask;
-                       pass->end_barrier.src_access_mask = pCreateInfo->pDependencies[i].srcAccessMask;
-                       pass->end_barrier.dst_access_mask = pCreateInfo->pDependencies[i].dstAccessMask;
-               } else {
-                       pass->subpasses[dst].start_barrier.src_stage_mask = pCreateInfo->pDependencies[i].srcStageMask;
-                       pass->subpasses[dst].start_barrier.src_access_mask = pCreateInfo->pDependencies[i].srcAccessMask;
-                       pass->subpasses[dst].start_barrier.dst_access_mask = pCreateInfo->pDependencies[i].dstAccessMask;
-               }
+               radv_render_pass_add_subpass_dep(pass,
+                                                &pCreateInfo->pDependencies[i]);
        }
 
        radv_render_pass_compile(pass);