From 18b1ec76dfd3aba5cfc0c9d34af2c142f62ce723 Mon Sep 17 00:00:00 2001 From: Jon Ashburn Date: Mon, 6 Apr 2015 10:58:22 -0600 Subject: loader: refactor layer activation function to handle more general inputs Renamed structure types as well. TODO: verify vk-layer-generate.py v2: fix LoaderEntrypointsSubcommand (olv) --- loader/loader.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'loader/loader.h') diff --git a/loader/loader.h b/loader/loader.h index 2967322b..77c50c9a 100644 --- a/loader/loader.h +++ b/loader/loader.h @@ -67,14 +67,22 @@ static inline void loader_init_data(void *obj, const void *data) static inline void *loader_unwrap_gpu(VkPhysicalGpu *gpu) { - const VK_BASE_LAYER_OBJECT *wrap = (const VK_BASE_LAYER_OBJECT *) *gpu; + const VkBaseLayerObject *wrap = (const VkBaseLayerObject *) *gpu; *gpu = (VkPhysicalGpu) wrap->nextObject; return loader_get_data(wrap->baseObject); } -extern uint32_t loader_activate_layers(VkPhysicalGpu gpu, const VkDeviceCreateInfo* pCreateInfo); +struct loader_instance { + struct loader_icd *icds; + struct loader_instance *next; + uint32_t extension_count; + char **extension_names; +}; + +extern uint32_t loader_activate_layers(struct loader_icd *icd, uint32_t gpu_index, uint32_t ext_count, const char *const* ext_names); +extern struct loader_icd * loader_get_icd(const VkBaseLayerObject *gpu, uint32_t *gpu_index); #define MAX_LAYER_LIBRARIES 64 #endif /* LOADER_H */ -- cgit v1.2.3