From 4e58a0e4d8b43ba6009bc076b6a83b57a0e98739 Mon Sep 17 00:00:00 2001 From: Jon Ashburn Date: Mon, 28 Mar 2016 13:58:16 -0600 Subject: [PATCH] loader: Remove the instance_info in the layer chain structure Simplifies code, the loader instance structure is already passed down from trampoline code to terminator code via the pInstance parameter. It doesn't need to be added to this pCreatInfo pNext list structure. Layers which modifiy pInstance whould do it on the way up the chain not going down the chain. Change-Id: I59581b94871c094995787808cf5ae2955ad0191a --- include/vulkan/vk_layer.h | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/include/vulkan/vk_layer.h b/include/vulkan/vk_layer.h index 95d8802..2a45800 100644 --- a/include/vulkan/vk_layer.h +++ b/include/vulkan/vk_layer.h @@ -263,22 +263,9 @@ typedef enum VkLayerDbgAction_ { typedef enum VkLayerFunction_ { VK_LAYER_LINK_INFO = 0, - VK_LAYER_DEVICE_INFO = 1, - VK_LAYER_INSTANCE_INFO = 2 + VK_LAYER_DEVICE_INFO = 1 } VkLayerFunction; -/* - * When creating the device chain the loader needs to pass - * down information about it's device structure needed at - * the end of the chain. Passing the data via the - * VkLayerInstanceInfo avoids issues with finding the - * exact instance being used. - */ -typedef struct VkLayerInstanceInfo_ { - void *instance_info; - PFN_vkGetInstanceProcAddr pfnNextGetInstanceProcAddr; -} VkLayerInstanceInfo; - typedef struct VkLayerInstanceLink_ { struct VkLayerInstanceLink_ *pNext; PFN_vkGetInstanceProcAddr pfnNextGetInstanceProcAddr; @@ -302,7 +289,6 @@ typedef struct { VkLayerFunction function; union { VkLayerInstanceLink *pLayerInfo; - VkLayerInstanceInfo instanceInfo; } u; } VkLayerInstanceCreateInfo;