venus: fix cmd state leak across implicit reset
authorYiwei Zhang <zzyiwei@chromium.org>
Mon, 10 Jul 2023 23:31:48 +0000 (16:31 -0700)
committerMarge Bot <emma+marge@anholt.net>
Sat, 22 Jul 2023 01:49:42 +0000 (01:49 +0000)
Reset cmd states during vkBeginCommandBuffer regardless of the
VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT for simplicity.

Cc: mesa-stable
Signed-off-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24103>

src/virtio/vulkan/vn_command_buffer.c

index fefa844..1d9e282 100644 (file)
@@ -1015,8 +1015,8 @@ vn_BeginCommandBuffer(VkCommandBuffer commandBuffer,
    struct vn_instance *instance = cmd->pool->device->instance;
    size_t cmd_size;
 
-   vn_cs_encoder_reset(&cmd->cs);
-   cmd->draw_cmd_batched = 0;
+   /* reset regardless of VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT */
+   vn_cmd_reset(cmd);
 
    struct vn_command_buffer_begin_info local_begin_info;
    pBeginInfo =