From c8805f45447f1240c8b16a10f9101df69bc0ca62 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Mon, 6 Jun 2022 13:57:59 +1000 Subject: [PATCH] nvk: add record result to cmd_buffer. This keeps track of recording errors so end command buffer can report them Part-of: --- src/nouveau/vulkan/nvk_cmd_buffer.c | 7 +++++-- src/nouveau/vulkan/nvk_cmd_buffer.h | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/nouveau/vulkan/nvk_cmd_buffer.c b/src/nouveau/vulkan/nvk_cmd_buffer.c index 91024b71688..a02cf08634e 100644 --- a/src/nouveau/vulkan/nvk_cmd_buffer.c +++ b/src/nouveau/vulkan/nvk_cmd_buffer.c @@ -54,7 +54,9 @@ nvk_reset_cmd_buffer(struct nvk_cmd_buffer *cmd_buffer) nouveau_ws_push_reset(cmd_buffer->push); memset(&cmd_buffer->state, 0, sizeof(cmd_buffer->state)); - return VK_SUCCESS; + cmd_buffer->record_result = VK_SUCCESS; + + return cmd_buffer->record_result; } VKAPI_ATTR VkResult VKAPI_CALL @@ -269,7 +271,8 @@ nvk_BeginCommandBuffer(VkCommandBuffer commandBuffer, VKAPI_ATTR VkResult VKAPI_CALL nvk_EndCommandBuffer(VkCommandBuffer commandBuffer) { - return VK_SUCCESS; + VK_FROM_HANDLE(nvk_cmd_buffer, cmd, commandBuffer); + return cmd->record_result; } VKAPI_ATTR void VKAPI_CALL diff --git a/src/nouveau/vulkan/nvk_cmd_buffer.h b/src/nouveau/vulkan/nvk_cmd_buffer.h index 96b9ac4a7f0..7e4f65e4eb2 100644 --- a/src/nouveau/vulkan/nvk_cmd_buffer.h +++ b/src/nouveau/vulkan/nvk_cmd_buffer.h @@ -52,6 +52,7 @@ struct nvk_cmd_buffer { struct nouveau_ws_push *push; bool reset_on_submit; + VkResult record_result; uint64_t tls_space_needed; };