From 56ef08970fe2d91f2ae59aaf54d0181df3967af9 Mon Sep 17 00:00:00 2001 From: Piers Daniell Date: Tue, 5 Apr 2016 17:28:06 -0600 Subject: loader: Fix regression with dEQP-VK.api.object_management.alloc_callback_fail.device When the loader vkCreateDevice trampoline code calls down to vkCreateDevice don't update the dev->device field with a bogus device handle. Change-Id: I703acb5283650ab0013483bda0f478da9b46e3ea --- loader/loader.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/loader/loader.c b/loader/loader.c index e5b9efe0..5850676a 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -3559,6 +3559,9 @@ VkResult loader_create_device_chain(const struct loader_physical_device_tramp *p loader_create_info.pNext = &create_info_disp; res = fpCreateDevice(pd->phys_dev, &loader_create_info, pAllocator, &created_device); + if (res != VK_SUCCESS) { + return res; + } dev->device = created_device; } else { // Couldn't find CreateDevice function! -- cgit v1.2.3