Mesa (main): panvk: Fix panvk_copy_fb_desc()

[GitLab Mirror]

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

Author: Boris Brezillon <boris.brezillon at collabora.com>
Date:   Fri Aug 27 13:00:20 2021 +0200

panvk: Fix panvk_copy_fb_desc()

We should not skip the copy when the batch is attached a framebuffer
descriptor, quite the opposite. Let's drop the check instead of reversing
it since we are guaranteed to have an FB attached when
panvk_copy_fb_desc() is called.

Fixes: 792a0ab0b146 ("panvk: Prepare per-gen split")
Signed-off-by: Boris Brezillon <boris.brezillon at collabora.com>
Reviewed-by: Boris Brezillon <boris.brezillon at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12590>

---

 src/panfrost/vulkan/panvk_vX_cmd_buffer.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/panfrost/vulkan/panvk_vX_cmd_buffer.c b/src/panfrost/vulkan/panvk_vX_cmd_buffer.c
index ef991dd02cc..d9abbc8a798 100644
--- a/src/panfrost/vulkan/panvk_vX_cmd_buffer.c
+++ b/src/panfrost/vulkan/panvk_vX_cmd_buffer.c
@@ -99,10 +99,6 @@ static void
 panvk_copy_fb_desc(struct panvk_cmd_buffer *cmdbuf, void *src)
 {
    struct panvk_batch *batch = cmdbuf->state.batch;
-
-   if (batch->fb.desc.gpu)
-      return;
-
    const struct panvk_subpass *subpass = cmdbuf->state.subpass;
    uint32_t size = pan_size(MULTI_TARGET_FRAMEBUFFER);