OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

venus: refactor vn_EndCommandBuffer

Browse Source 
Add vn_cmd_submit as a wrapper to vn_instance_ring_submit.  It is also
designed such that it can be called from any of the vn_Cmd* functions.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11896>
This commit is contained in:
Chia-I Wu
2021-07-14 16:08:25 -07:00
committed by Marge Bot
parent f144d91496
commit 12d18abfe7
1 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -654,6 +654,33 @@ vn_BeginCommandBuffer(VkCommandBuffer commandBuffer,
return VK_SUCCESS; return VK_SUCCESS;
} }
static VkResult
vn_cmd_submit(struct vn_command_buffer *cmd)
{
struct vn_instance *instance = cmd->device->instance;
if (cmd->state != VN_COMMAND_BUFFER_STATE_RECORDING)
return VK_ERROR_OUT_OF_HOST_MEMORY;
vn_cs_encoder_commit(&cmd->cs);
if (vn_cs_encoder_get_fatal(&cmd->cs)) {
cmd->state = VN_COMMAND_BUFFER_STATE_INVALID;
vn_cs_encoder_reset(&cmd->cs);
return VK_ERROR_OUT_OF_HOST_MEMORY;
}
vn_instance_wait_roundtrip(instance, cmd->cs.current_buffer_roundtrip);
VkResult result = vn_instance_ring_submit(instance, &cmd->cs);
if (result != VK_SUCCESS) {
cmd->state = VN_COMMAND_BUFFER_STATE_INVALID;
return result;
}
vn_cs_encoder_reset(&cmd->cs);
return VK_SUCCESS;
}
VkResult VkResult
vn_EndCommandBuffer(VkCommandBuffer commandBuffer) vn_EndCommandBuffer(VkCommandBuffer commandBuffer)
{ {
@@ -662,9 +689,6 @@ vn_EndCommandBuffer(VkCommandBuffer commandBuffer)
struct vn_instance *instance = cmd->device->instance; struct vn_instance *instance = cmd->device->instance;
size_t cmd_size; size_t cmd_size;
if (cmd->state != VN_COMMAND_BUFFER_STATE_RECORDING)
return vn_error(instance, VK_ERROR_OUT_OF_HOST_MEMORY);
cmd_size = vn_sizeof_vkEndCommandBuffer(commandBuffer); cmd_size = vn_sizeof_vkEndCommandBuffer(commandBuffer);
if (!vn_cs_encoder_reserve(&cmd->cs, cmd_size)) { if (!vn_cs_encoder_reserve(&cmd->cs, cmd_size)) {
cmd->state = VN_COMMAND_BUFFER_STATE_INVALID; cmd->state = VN_COMMAND_BUFFER_STATE_INVALID;
@@ -672,22 +696,13 @@ vn_EndCommandBuffer(VkCommandBuffer commandBuffer)
} }
vn_encode_vkEndCommandBuffer(&cmd->cs, 0, commandBuffer); vn_encode_vkEndCommandBuffer(&cmd->cs, 0, commandBuffer);
vn_cs_encoder_commit(&cmd->cs);
if (vn_cs_encoder_get_fatal(&cmd->cs)) { VkResult result = vn_cmd_submit(cmd);
cmd->state = VN_COMMAND_BUFFER_STATE_INVALID;
return vn_error(instance, VK_ERROR_OUT_OF_HOST_MEMORY);
}
vn_instance_wait_roundtrip(instance, cmd->cs.current_buffer_roundtrip);
VkResult result = vn_instance_ring_submit(instance, &cmd->cs);
if (result != VK_SUCCESS) { if (result != VK_SUCCESS) {
cmd->state = VN_COMMAND_BUFFER_STATE_INVALID; cmd->state = VN_COMMAND_BUFFER_STATE_INVALID;
return vn_error(instance, result); return vn_error(instance, result);
} }
vn_cs_encoder_reset(&cmd->cs);
cmd->state = VN_COMMAND_BUFFER_STATE_EXECUTABLE; cmd->state = VN_COMMAND_BUFFER_STATE_EXECUTABLE;
return VK_SUCCESS; return VK_SUCCESS;