From 32b8694ccdb9e22b6aac236f2e28cebe12520174 Mon Sep 17 00:00:00 2001 From: Jon Ashburn Date: Wed, 27 Jan 2016 10:56:10 -0700 Subject: loader: Fix createInstance to pass pAllocator down Also fix bug where createDevice failure removes logical device from icd struct --- loader/loader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'loader/loader.c') diff --git a/loader/loader.c b/loader/loader.c index a51312ea..9040f3f2 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -193,7 +193,7 @@ void* loader_heap_realloc( return NULL; memcpy(new_ptr, pMemory, orig_size); instance->alloc_callbacks.pfnFree(instance->alloc_callbacks.pUserData, pMemory); - return new_ptr; + return new_ptr; } return realloc(pMemory, size); } @@ -3712,13 +3712,13 @@ VKAPI_ATTR VkResult VKAPI_CALL loader_CreateDevice( /* activate any layers on device chain which terminates with device*/ res = loader_enable_device_layers(inst, icd, &dev->activated_layer_list, pCreateInfo, &inst->device_layer_list); if (res != VK_SUCCESS) { - loader_destroy_logical_device(inst, dev); + loader_remove_logical_device(inst, icd, dev); return res; } res = loader_create_device_chain(physicalDevice, pCreateInfo, pAllocator, inst, icd, dev); if (res != VK_SUCCESS) { - loader_destroy_logical_device(inst, dev); + loader_remove_logical_device(inst, icd, dev); return res; } -- cgit v1.2.3