From 5b375de3f112671efdc71dbf1548b5722a7f1ec0 Mon Sep 17 00:00:00 2001 From: baldurk Date: Thu, 14 Jan 2016 18:16:40 +0100 Subject: [PATCH] Make sure instance gets wrapped/init'd even if vkCreateInstance fails --- renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp index 1612a3209..8af2cb14f 100644 --- a/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp +++ b/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp @@ -140,8 +140,7 @@ VkResult WrappedVulkan::vkCreateInstance( GetResourceManager()->WrapResource(m_Instance, m_Instance); - if(ret != VK_SUCCESS) - return ret; + *pInstance = m_Instance; // should only be called during capture RDCASSERT(m_State >= WRITING); @@ -160,8 +159,6 @@ VkResult WrappedVulkan::vkCreateInstance( } InitInstanceExtensionTables(m_Instance); - - *pInstance = m_Instance; m_DbgMsgCallback = VK_NULL_HANDLE; m_PhysicalDevice = VK_NULL_HANDLE; @@ -170,7 +167,7 @@ VkResult WrappedVulkan::vkCreateInstance( m_Queue = VK_NULL_HANDLE; m_InternalCmds.Reset(); - return VK_SUCCESS; + return ret; } void WrappedVulkan::Shutdown()