Mesa (main): panvk: Close batch when ending a command buffer

[GitLab Mirror]

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

Author: Tomeu Vizoso <tomeu.vizoso at collabora.com>
Date:   Thu Jul 22 15:40:45 2021 +0200

panvk: Close batch when ending a command buffer

In some cases, there will be an open batch because an event operation
has been recorded, or a non-rendering command.

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

---

 src/panfrost/vulkan/panvk_cmd_buffer.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/panfrost/vulkan/panvk_cmd_buffer.c b/src/panfrost/vulkan/panvk_cmd_buffer.c
index fc48e79338a..3ef5f019ab3 100644
--- a/src/panfrost/vulkan/panvk_cmd_buffer.c
+++ b/src/panfrost/vulkan/panvk_cmd_buffer.c
@@ -327,6 +327,9 @@ panvk_EndCommandBuffer(VkCommandBuffer commandBuffer)
 {
    VK_FROM_HANDLE(panvk_cmd_buffer, cmdbuf, commandBuffer);
 
+   if (cmdbuf->state.batch)
+      panvk_cmd_close_batch(cmdbuf);
+
    cmdbuf->status = PANVK_CMD_BUFFER_STATUS_EXECUTABLE;
 
    return cmdbuf->record_result;