From 3d3c488790d74bb21e435ab0976d20fb7409aeac Mon Sep 17 00:00:00 2001 From: Jon Ashburn Date: Fri, 1 Apr 2016 11:49:39 -0600 Subject: [PATCH] loader: Fix createDev treminator to init the logicalDevs ICD dev Last commit on physDev detanglement was incompatible with the fix to simplify the chaining loader_device_info. Change-Id: I0468178bcffb114a9bf3038c773cf1912ad5ac72 --- loader/loader.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/loader/loader.c b/loader/loader.c index eecbc75..ff793ea 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -3850,19 +3850,18 @@ terminator_CreateDevice(VkPhysicalDevice physicalDevice, } } - VkDevice localDevice; // TODO: Why does fpCreateDevice behave differently than // this_icd->CreateDevice? // VkResult res = fpCreateDevice(phys_dev->phys_dev, &localCreateInfo, // pAllocator, &localDevice); res = phys_dev->this_icd->CreateDevice(phys_dev->phys_dev, &localCreateInfo, - pAllocator, &localDevice); + pAllocator, &dev->device); if (res != VK_SUCCESS) { return res; } - *pDevice = localDevice; + *pDevice = dev->device; loader_add_logical_device(phys_dev->this_icd->this_instance, phys_dev->this_icd, dev); /* Init dispatch pointer in new device object */ -- 2.7.4