diff options
| author | Jon Ashburn <jon@lunarg.com> | 2016-04-28 12:03:57 -0600 |
|---|---|---|
| committer | Jon Ashburn <jon@lunarg.com> | 2016-04-28 12:11:19 -0600 |
| commit | 65b115b1506379f56ae219098ec1301ebdfebfa9 (patch) | |
| tree | 3df556c79bc138b9b70e685e6c2d3545652eb317 | |
| parent | c08063f2d700b503af3821848d918cd9ae25504f (diff) | |
| download | usermoji-65b115b1506379f56ae219098ec1301ebdfebfa9.tar.xz | |
loader: don't remove loader structs from CreateInfo for ICD
pNext/sType extension structs that are unknown to a component must
be ignored by those components (layers, loader, ICDs). Loader was
stripping off the pNext structs it added to DeviceCreateInfo and
InstanceCreateInfo. Remove this stripping as the loader passes needed
info to layers and ICDs via this.
Change-Id: I49f169660474cffba276afac0c224e1b74eaa4bc
| -rw-r--r-- | loader/loader.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/loader/loader.c b/loader/loader.c index f16965c1..18ffec82 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -1008,24 +1008,6 @@ get_dev_extension_property(const char *name, return NULL; } -/* - * This function will return the pNext pointer of any - * CreateInfo extensions that are not loader extensions. - * This is used to skip past the loader extensions prepended - * to the list during CreateInstance and CreateDevice. - */ -void *loader_strip_create_extensions(const void *pNext) { - VkLayerInstanceCreateInfo *create_info = (VkLayerInstanceCreateInfo *)pNext; - - while ( - create_info && - (create_info->sType == VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO || - create_info->sType == VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO)) { - create_info = (VkLayerInstanceCreateInfo *)create_info->pNext; - } - - return create_info; -} /* * For Instance extensions implemented within the loader (i.e. DEBUG_REPORT @@ -3575,9 +3557,6 @@ terminator_CreateInstance(const VkInstanceCreateInfo *pCreateInfo, icd_create_info.enabledLayerCount = 0; icd_create_info.ppEnabledLayerNames = NULL; - // strip off the VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO entries - icd_create_info.pNext = loader_strip_create_extensions(pCreateInfo->pNext); - /* * NOTE: Need to filter the extensions to only those * supported by the ICD. @@ -3720,7 +3699,6 @@ terminator_CreateDevice(VkPhysicalDevice physicalDevice, VkDeviceCreateInfo localCreateInfo; memcpy(&localCreateInfo, pCreateInfo, sizeof(localCreateInfo)); - localCreateInfo.pNext = loader_strip_create_extensions(pCreateInfo->pNext); /* * NOTE: Need to filter the extensions to only those |