AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

venus: use common cmd pool_link

Browse Source 
We only implement the destroy func to leverage the existing link, and we
only give vk_command_buffer the ops but not the pool.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34083>
This commit is contained in:
Yiwei Zhang
2025-03-14 20:37:41 -07:00
committed by Marge Bot
parent 4c0635ee04
commit 5b11c3ff0a
2 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/virtio/vulkan/vn_command_buffer.c
View File

@@ -719,7 +719,6 @@ vn_CreateCommandPool(VkDevice device,
vn_command_pool_base_init(&pool->base, &dev->base, pCreateInfo, alloc);
list_inithead(&pool->command_buffers);
list_inithead(&pool->free_query_records);
vn_cached_storage_init(&pool->storage, alloc);
@@ -774,14 +773,6 @@ vn_DestroyCommandPool(VkDevice device,
vn_async_vkDestroyCommandPool(dev->primary_ring, device, commandPool,
NULL);
list_for_each_entry_safe(struct vn_command_buffer, cmd,
&pool->command_buffers, head) {
vn_cmd_reset(cmd);
vn_cs_encoder_fini(&cmd->cs);
vn_command_buffer_base_fini(&cmd->base);
vk_free(alloc, cmd);
}
list_for_each_entry_safe(struct vn_cmd_query_record, record,
&pool->free_query_records, head)
vk_free(alloc, record);
@@ -801,9 +792,11 @@ vn_ResetCommandPool(VkDevice device,
struct vn_device *dev = vn_device_from_handle(device);
struct vn_command_pool *pool = vn_command_pool_from_handle(commandPool);
list_for_each_entry_safe(struct vn_command_buffer, cmd,
&pool->command_buffers, head)
list_for_each_entry_safe(struct vk_command_buffer, cmd_vk,
&pool->base.vk.command_buffers, pool_link) {
struct vn_command_buffer *cmd = vn_cmd_from_vk(cmd_vk);
vn_cmd_reset(cmd);
}
if (flags & VK_COMMAND_POOL_RESET_RELEASE_RESOURCES_BIT) {
list_for_each_entry_safe(struct vn_cmd_query_record, record,
@@ -834,6 +827,20 @@ vn_TrimCommandPool(VkDevice device,
/* command buffer commands */
static void
vn_cmd_destroy(struct vk_command_buffer *cmd_vk)
{
struct vn_command_buffer *cmd = vn_cmd_from_vk(cmd_vk);
vn_cmd_reset(cmd);
vn_cs_encoder_fini(&cmd->cs);
vn_command_buffer_base_fini(&cmd->base);
vk_free(&cmd_vk->pool->alloc, cmd);
}
static const struct vk_command_buffer_ops vn_cmd_ops = {
.destroy = vn_cmd_destroy,
};
VkResult
vn_AllocateCommandBuffers(VkDevice device,
const VkCommandBufferAllocateInfo *pAllocateInfo,
@@ -853,7 +860,6 @@ vn_AllocateCommandBuffers(VkDevice device,
for (uint32_t j = 0; j < i; j++) {
cmd = vn_command_buffer_from_handle(pCommandBuffers[j]);
vn_cs_encoder_fini(&cmd->cs);
list_del(&cmd->head);
vn_command_buffer_base_fini(&cmd->base);
vk_free(alloc, cmd);
}
@@ -862,7 +868,7 @@ vn_AllocateCommandBuffers(VkDevice device,
return vn_error(dev->instance, VK_ERROR_OUT_OF_HOST_MEMORY);
}
vn_command_buffer_base_init(&cmd->base, &pool->base, NULL,
vn_command_buffer_base_init(&cmd->base, &pool->base, &vn_cmd_ops,
pAllocateInfo->level);
cmd->base.vk.state = MESA_VK_COMMAND_BUFFER_STATE_INITIAL;
vn_cs_encoder_init(&cmd->cs, dev->instance,
@@ -870,8 +876,6 @@ vn_AllocateCommandBuffers(VkDevice device,
list_inithead(&cmd->builder.query_records);
list_addtail(&cmd->head, &pool->command_buffers);
VkCommandBuffer cmd_handle = vn_command_buffer_to_handle(cmd);
pCommandBuffers[i] = cmd_handle;
}
@@ -903,8 +907,6 @@ vn_FreeCommandBuffers(VkDevice device,
if (!cmd)
continue;
list_del(&cmd->head);
vn_cmd_reset(cmd);
vn_cs_encoder_fini(&cmd->cs);
vn_command_buffer_base_fini(&cmd->base);

8
src/virtio/vulkan/vn_command_buffer.h
View File

@@ -77,8 +77,6 @@ struct vn_command_buffer {
struct vn_command_buffer_builder builder;
struct vn_query_feedback_cmd *linked_qfb_cmd;
struct list_head head;
};
VK_DEFINE_HANDLE_CASTS(vn_command_buffer,
base.vk.base,
@@ -91,6 +89,12 @@ vn_cmd_pool(struct vn_command_buffer *cmd)
return container_of(cmd->base.vk.pool, struct vn_command_pool, base.vk);
}
static inline struct vn_command_buffer *
vn_cmd_from_vk(struct vk_command_buffer *cmd_vk)
{
return container_of(cmd_vk, struct vn_command_buffer, base.vk);
}
/* Queries recorded to support qfb.
* - query_count is the actual queries used with multiview considered
* - copy is whether the record is for result copy or query reset