Mesa (master): radv: remove unnecessary goto in radv_create_cmd_buffer()
Samuel Pitoiset
hakzsam at kemper.freedesktop.org
Mon Sep 11 19:58:40 UTC 2017
Module: Mesa
Branch: master
Commit: 03542d166381ebee1404850475b7076fbd0da2c4
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=03542d166381ebee1404850475b7076fbd0da2c4
Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date: Mon Sep 11 17:52:25 2017 +0200
radv: remove unnecessary goto in radv_create_cmd_buffer()
Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Dave Airlie <airlied at redhat.com>
---
src/amd/vulkan/radv_cmd_buffer.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index c2e93d352c..e152e56ce3 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -142,7 +142,6 @@ static VkResult radv_create_cmd_buffer(
VkCommandBuffer* pCommandBuffer)
{
struct radv_cmd_buffer *cmd_buffer;
- VkResult result;
unsigned ring;
cmd_buffer = vk_alloc(&pool->alloc, sizeof(*cmd_buffer), 8,
VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
@@ -171,8 +170,8 @@ static VkResult radv_create_cmd_buffer(
cmd_buffer->cs = device->ws->cs_create(device->ws, ring);
if (!cmd_buffer->cs) {
- result = VK_ERROR_OUT_OF_HOST_MEMORY;
- goto fail;
+ vk_free(&cmd_buffer->pool->alloc, cmd_buffer);
+ return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
}
*pCommandBuffer = radv_cmd_buffer_to_handle(cmd_buffer);
@@ -182,11 +181,6 @@ static VkResult radv_create_cmd_buffer(
list_inithead(&cmd_buffer->upload.list);
return VK_SUCCESS;
-
-fail:
- vk_free(&cmd_buffer->pool->alloc, cmd_buffer);
-
- return result;
}
static void
More information about the mesa-commit
mailing list