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

radv: use common command buffer status code.

Browse Source 
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16922>
This commit is contained in:
Dave Airlie
2022-06-08 10:46:11 +10:00
committed by Marge Bot
parent a26755458e
commit a0819382fc
3 changed files with 2 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/amd/vulkan/radv_cmd_buffer.c
+2 -15
View File
@@ -420,8 +420,6 @@ radv_create_cmd_buffer(struct vk_command_pool *pool,
list_inithead(&cmd_buffer->upload.list);
cmd_buffer->status = RADV_CMD_BUFFER_STATUS_INITIAL;
return VK_SUCCESS;
}
@@ -481,8 +479,6 @@ radv_reset_cmd_buffer(struct vk_command_buffer *vk_cmd_buffer,
}
radv_cmd_buffer_reset_rendering(cmd_buffer);
cmd_buffer->status = RADV_CMD_BUFFER_STATUS_INITIAL;
}
const struct vk_command_buffer_ops radv_cmd_buffer_ops = {
@@ -5260,12 +5256,7 @@ radv_BeginCommandBuffer(VkCommandBuffer commandBuffer, const VkCommandBufferBegi
RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer);
VkResult result = VK_SUCCESS;
if (cmd_buffer->status != RADV_CMD_BUFFER_STATUS_INITIAL) {
/* If the command buffer has already been resetted with
* vkResetCommandBuffer, no need to do it again.
*/
radv_reset_cmd_buffer(&cmd_buffer->vk, 0);
}
vk_command_buffer_begin(&cmd_buffer->vk, pBeginInfo);
memset(&cmd_buffer->state, 0, sizeof(cmd_buffer->state));
cmd_buffer->state.last_primitive_reset_en = -1;
@@ -5366,8 +5357,6 @@ radv_BeginCommandBuffer(VkCommandBuffer commandBuffer, const VkCommandBufferBegi
radv_describe_begin_cmd_buffer(cmd_buffer);
cmd_buffer->status = RADV_CMD_BUFFER_STATUS_RECORDING;
return result;
}
@@ -5755,9 +5744,7 @@ radv_EndCommandBuffer(VkCommandBuffer commandBuffer)
if (result != VK_SUCCESS)
return vk_error(cmd_buffer, result);
cmd_buffer->status = RADV_CMD_BUFFER_STATUS_EXECUTABLE;
return vk_command_buffer_get_record_result(&cmd_buffer->vk);
return vk_command_buffer_end(&cmd_buffer->vk);
}
static void
src/amd/vulkan/radv_device.c
-1
View File
@@ -5471,7 +5471,6 @@ radv_queue_submit_normal(struct radv_queue *queue, struct vk_queue_submit *submi
if ((cmd_buffer->usage_flags & VK_COMMAND_BUFFER_USAGE_SIMULTANEOUS_USE_BIT))
can_patch = false;
cmd_buffer->status = RADV_CMD_BUFFER_STATUS_PENDING;
use_ace |= radv_cmd_buffer_needs_ace(cmd_buffer);
}
src/amd/vulkan/radv_private.h
-9
View File
@@ -1635,14 +1635,6 @@ struct radv_cmd_buffer_upload {
struct list_head list;
};
enum radv_cmd_buffer_status {
RADV_CMD_BUFFER_STATUS_INVALID,
RADV_CMD_BUFFER_STATUS_INITIAL,
RADV_CMD_BUFFER_STATUS_RECORDING,
RADV_CMD_BUFFER_STATUS_EXECUTABLE,
RADV_CMD_BUFFER_STATUS_PENDING,
};
struct radv_cmd_buffer {
struct vk_command_buffer vk;
@@ -1650,7 +1642,6 @@ struct radv_cmd_buffer {
struct util_dynarray cached_vertex_formats;
VkCommandBufferUsageFlags usage_flags;
enum radv_cmd_buffer_status status;
struct radeon_cmdbuf *cs;
struct radv_cmd_state state;
struct radv_buffer *vertex_binding_buffers[MAX_VBS];