[PATCH 4/4] winevulkan: Free all command buffers when vkAllocateCommandBuffers() fails.
Józef Kucia
jkucia at codeweavers.com
Thu Aug 30 05:22:34 CDT 2018
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
---
dlls/winevulkan/vulkan.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c
index f500602e96d5..4e0d999ddb41 100644
--- a/dlls/winevulkan/vulkan.c
+++ b/dlls/winevulkan/vulkan.c
@@ -540,25 +540,24 @@ VkResult WINAPI wine_vkAllocateCommandBuffers(VkDevice device,
buffers[i]->base.loader_magic = VULKAN_ICD_MAGIC_VALUE;
buffers[i]->device = device;
+ list_add_tail(&pool->command_buffers, &buffers[i]->pool_link);
res = device->funcs.p_vkAllocateCommandBuffers(device->device,
&allocate_info_host, &buffers[i]->command_buffer);
if (res != VK_SUCCESS)
{
ERR("Failed to allocate command buffer, res=%d.\n", res);
+ buffers[i]->command_buffer = VK_NULL_HANDLE;
break;
}
-
- list_add_tail(&pool->command_buffers, &buffers[i]->pool_link);
}
if (res != VK_SUCCESS)
{
- wine_vk_free_command_buffers(device, pool, i, buffers);
+ wine_vk_free_command_buffers(device, pool, i + 1, buffers);
memset(buffers, 0, allocate_info->commandBufferCount * sizeof(*buffers));
- return res;
}
- return VK_SUCCESS;
+ return res;
}
void WINAPI wine_vkCmdExecuteCommands(VkCommandBuffer buffer, uint32_t count,
--
2.16.4
More information about the wine-devel
mailing list