turnip: use common command record result.

Reviewed-by: Jason Ekstrand <jason.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16918>
This commit is contained in:
Dave Airlie
2022-06-08 06:25:18 +10:00
committed by Marge Bot
parent b644c7ca9f
commit 3c092f5cd8
3 changed files with 13 additions and 17 deletions
+3 -3
View File
@@ -909,7 +909,7 @@ r3d_src_common(struct tu_cmd_buffer *cmd,
2, /* allocate space for a sampler too */
A6XX_TEX_CONST_DWORDS, &texture);
if (result != VK_SUCCESS) {
cmd->record_result = result;
vk_command_buffer_set_error(&cmd->vk, result);
return;
}
@@ -1991,7 +1991,7 @@ tu_copy_image_to_image(struct tu_cmd_buffer *cmd,
staging_layout.size,
&staging_bo);
if (result != VK_SUCCESS) {
cmd->record_result = result;
vk_command_buffer_set_error(&cmd->vk, result);
return;
}
@@ -2156,7 +2156,7 @@ tu_CmdUpdateBuffer(VkCommandBuffer commandBuffer,
struct tu_cs_memory tmp;
VkResult result = tu_cs_alloc(&cmd->sub_cs, DIV_ROUND_UP(dataSize, 64), 64 / 4, &tmp);
if (result != VK_SUCCESS) {
cmd->record_result = result;
vk_command_buffer_set_error(&cmd->vk, result);
return;
}
+10 -12
View File
@@ -1127,7 +1127,7 @@ tu_emit_input_attachments(struct tu_cmd_buffer *cmd,
VkResult result = tu_cs_alloc(&cmd->sub_cs, subpass->input_count * 2,
A6XX_TEX_CONST_DWORDS, &texture);
if (result != VK_SUCCESS) {
cmd->record_result = result;
vk_command_buffer_set_error(&cmd->vk, result);
return (struct tu_draw_state) {};
}
@@ -1659,8 +1659,6 @@ tu_reset_cmd_buffer(struct tu_cmd_buffer *cmd_buffer)
{
vk_command_buffer_reset(&cmd_buffer->vk);
cmd_buffer->record_result = VK_SUCCESS;
tu_cs_reset(&cmd_buffer->cs);
tu_cs_reset(&cmd_buffer->draw_cs);
tu_cs_reset(&cmd_buffer->tile_store_cs);
@@ -1689,7 +1687,7 @@ tu_reset_cmd_buffer(struct tu_cmd_buffer *cmd_buffer)
cmd_buffer->status = TU_CMD_BUFFER_STATUS_INITIAL;
return cmd_buffer->record_result;
return vk_command_buffer_get_record_result(&cmd_buffer->vk);
}
VKAPI_ATTR VkResult VKAPI_CALL
@@ -2179,7 +2177,7 @@ tu_CmdBindDescriptorSets(VkCommandBuffer commandBuffer,
layout->dynamic_offset_size / (4 * A6XX_TEX_CONST_DWORDS),
A6XX_TEX_CONST_DWORDS, &dynamic_desc_set);
if (result != VK_SUCCESS) {
cmd->record_result = result;
vk_command_buffer_set_error(&cmd->vk, result);
return;
}
@@ -2257,7 +2255,7 @@ tu_CmdPushDescriptorSetKHR(VkCommandBuffer commandBuffer,
DIV_ROUND_UP(layout->size, A6XX_TEX_CONST_DWORDS * 4),
A6XX_TEX_CONST_DWORDS, &set_mem);
if (result != VK_SUCCESS) {
cmd->record_result = result;
vk_command_buffer_set_error(&cmd->vk, result);
return;
}
@@ -2302,7 +2300,7 @@ tu_CmdPushDescriptorSetWithTemplateKHR(VkCommandBuffer commandBuffer,
DIV_ROUND_UP(layout->size, A6XX_TEX_CONST_DWORDS * 4),
A6XX_TEX_CONST_DWORDS, &set_mem);
if (result != VK_SUCCESS) {
cmd->record_result = result;
vk_command_buffer_set_error(&cmd->vk, result);
return;
}
@@ -2540,7 +2538,7 @@ tu_EndCommandBuffer(VkCommandBuffer commandBuffer)
cmd_buffer->status = TU_CMD_BUFFER_STATUS_EXECUTABLE;
return cmd_buffer->record_result;
return vk_command_buffer_get_record_result(&cmd_buffer->vk);
}
VKAPI_ATTR void VKAPI_CALL
@@ -3648,14 +3646,14 @@ tu_CmdExecuteCommands(VkCommandBuffer commandBuffer,
result = tu_cs_add_entries(&cmd->draw_cs, &secondary->draw_cs);
if (result != VK_SUCCESS) {
cmd->record_result = result;
vk_command_buffer_set_error(&cmd->vk, result);
break;
}
result = tu_cs_add_entries(&cmd->draw_epilogue_cs,
&secondary->draw_epilogue_cs);
if (result != VK_SUCCESS) {
cmd->record_result = result;
vk_command_buffer_set_error(&cmd->vk, result);
break;
}
@@ -3967,7 +3965,7 @@ tu_CmdBeginRenderPass2(VkCommandBuffer commandBuffer,
VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
if (!cmd->state.attachments) {
cmd->record_result = VK_ERROR_OUT_OF_HOST_MEMORY;
vk_command_buffer_set_error(&cmd->vk, VK_ERROR_OUT_OF_HOST_MEMORY);
return;
}
@@ -4772,7 +4770,7 @@ tu6_emit_vs_params(struct tu_cmd_buffer *cmd,
struct tu_cs cs;
VkResult result = tu_cs_begin_sub_stream(&cmd->sub_cs, 3 + (offset ? 8 : 0), &cs);
if (result != VK_SUCCESS) {
cmd->record_result = result;
vk_command_buffer_set_error(&cmd->vk, result);
return;
}
-2
View File
@@ -564,8 +564,6 @@ struct tu_cmd_buffer
struct tu_subpass dynamic_subpass;
struct tu_framebuffer dynamic_framebuffer;
VkResult record_result;
struct tu_cs cs;
struct tu_cs draw_cs;
struct tu_cs tile_store_cs;