From 33cdc6043d8a33b18ee5cf9d9a884b220f7cd82a Mon Sep 17 00:00:00 2001 From: Yiwei Zhang Date: Thu, 6 Jul 2023 15:55:46 -0700 Subject: [PATCH] venus: fix a cmd builder render_pass state leak across reset Cc: mesa-stable Signed-off-by: Yiwei Zhang Part-of: (cherry picked from commit a9f058d614929c7e65d4f8b839bd2b443729c25d) --- .pick_status.json | 2 +- src/virtio/vulkan/vn_command_buffer.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 923a18d6ba1..78108ead889 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -14834,7 +14834,7 @@ "description": "venus: fix a cmd builder render_pass state leak across reset", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/virtio/vulkan/vn_command_buffer.c b/src/virtio/vulkan/vn_command_buffer.c index ffb8cd95c6b..1b20a0e3526 100644 --- a/src/virtio/vulkan/vn_command_buffer.c +++ b/src/virtio/vulkan/vn_command_buffer.c @@ -752,6 +752,8 @@ static void vn_cmd_reset(struct vn_command_buffer *cmd) { vn_cs_encoder_reset(&cmd->cs); + + cmd->builder.render_pass = NULL; if (cmd->builder.present_src_images) { vk_free(&cmd->pool->allocator, cmd->builder.present_src_images); cmd->builder.present_src_images = NULL;