Mesa (main): panvk: Pass the render target index to panvk_meta_clear_attachment()

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 555e6626c2a7275f400e16aeea7ca2ec57f58ab5
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=555e6626c2a7275f400e16aeea7ca2ec57f58ab5

Author: Boris Brezillon <boris.brezillon at collabora.com>
Date:   Thu Sep 30 11:36:50 2021 +0200

panvk: Pass the render target index to panvk_meta_clear_attachment()

The attachment index and render target don't necessarily match. We need
to explicitly pass the render target index to
panvk_meta_clear_attachment() so it can select the correct shader and
emit a valid RSD.

Signed-off-by: Boris Brezillon <boris.brezillon at collabora.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13136>

---

 src/panfrost/vulkan/panvk_vX_meta_clear.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/panfrost/vulkan/panvk_vX_meta_clear.c b/src/panfrost/vulkan/panvk_vX_meta_clear.c
index b62c78db3c7..073b69bff30 100644
--- a/src/panfrost/vulkan/panvk_vX_meta_clear.c
+++ b/src/panfrost/vulkan/panvk_vX_meta_clear.c
@@ -287,7 +287,7 @@ panvk_meta_get_format_type(enum pipe_format format)
 
 static void
 panvk_meta_clear_attachment(struct panvk_cmd_buffer *cmdbuf,
-                            uint32_t attachment,
+                            unsigned attachment, unsigned rt,
                             VkImageAspectFlags mask,
                             const VkClearValue *clear_value,
                             const VkClearRect *clear_rect)
@@ -324,15 +324,14 @@ panvk_meta_clear_attachment(struct panvk_cmd_buffer *cmdbuf,
                                                   rect, sizeof(rect), 64);
 
    enum glsl_base_type base_type = panvk_meta_get_format_type(att->format);
-   mali_ptr shader = meta->clear_attachment[attachment][base_type].shader;
+   mali_ptr shader = meta->clear_attachment[rt][base_type].shader;
    struct pan_shader_info *shader_info =
-      &meta->clear_attachment[attachment][base_type].shader_info;
+      &meta->clear_attachment[rt][base_type].shader_info;
 
    mali_ptr rsd =
       panvk_meta_clear_attachments_emit_rsd(pdev,
                                             &cmdbuf->desc_pool.base,
-                                            att->format,
-                                            attachment,
+                                            att->format, rt,
                                             shader_info,
                                             shader);
 
@@ -514,10 +513,10 @@ panvk_per_arch(CmdClearAttachments)(VkCommandBuffer commandBuffer,
    for (unsigned i = 0; i < attachmentCount; i++) {
       for (unsigned j = 0; j < rectCount; j++) {
 
-         uint32_t attachment;
+         uint32_t attachment, rt = 0;
          if (pAttachments[i].aspectMask & VK_IMAGE_ASPECT_COLOR_BIT) {
-            unsigned idx = pAttachments[i].colorAttachment;
-            attachment = subpass->color_attachments[idx].idx;
+            rt = pAttachments[i].colorAttachment;
+            attachment = subpass->color_attachments[rt].idx;
          } else {
             attachment = subpass->zs_attachment.idx;
          }
@@ -525,7 +524,7 @@ panvk_per_arch(CmdClearAttachments)(VkCommandBuffer commandBuffer,
          if (attachment == VK_ATTACHMENT_UNUSED)
                continue;
 
-         panvk_meta_clear_attachment(cmdbuf, attachment,
+         panvk_meta_clear_attachment(cmdbuf, attachment, rt,
                                      pAttachments[i].aspectMask,
                                      &pAttachments[i].clearValue,
                                      &pRects[j]);