From 020f0eb8cf27350b2d097ca1a231aed0959d0aba Mon Sep 17 00:00:00 2001 From: Jon Ashburn Date: Tue, 26 May 2015 13:57:35 -0600 Subject: loader: Add wsi extension to loader's list of global extensions --- loader/loader.c | 8 +------- loader/wsi_lunarg.c | 6 ++++++ loader/wsi_lunarg.h | 3 +++ 3 files changed, 10 insertions(+), 7 deletions(-) (limited to 'loader') diff --git a/loader/loader.c b/loader/loader.c index 08dd8a35..55e8ac67 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -58,13 +58,6 @@ void loader_add_to_ext_list( static void loader_deactivate_instance_layers(struct loader_instance *instance); -enum intel_ext_type { - LOADER_EXT_DEBUG_REPORT, - - LOADER_EXT_COUNT, - LOADER_EXT_INVALID = LOADER_EXT_COUNT, -}; - /* TODO: do we need to lock around access to linked lists and such? */ struct loader_struct loader = {0}; @@ -447,6 +440,7 @@ void loader_coalesce_extensions(void) // Traverse loader's extensions, adding non-duplicate extensions to the list debug_report_add_instance_extensions(&loader.global_extensions); + wsi_lunarg_add_instance_extensions(&loader.global_extensions); } static void loader_icd_destroy( diff --git a/loader/wsi_lunarg.c b/loader/wsi_lunarg.c index 91be8124..57e6d118 100644 --- a/loader/wsi_lunarg.c +++ b/loader/wsi_lunarg.c @@ -138,6 +138,12 @@ static const struct loader_extension_property wsi_lunarg_extension_info = { .hosted = true, }; +void wsi_lunarg_add_instance_extensions( + struct loader_extension_list *ext_list) +{ + loader_add_to_ext_list(ext_list, 1, &wsi_lunarg_extension_info); +} + void wsi_lunarg_create_instance( struct loader_instance *ptr_instance) { diff --git a/loader/wsi_lunarg.h b/loader/wsi_lunarg.h index 57c2e624..da022c39 100644 --- a/loader/wsi_lunarg.h +++ b/loader/wsi_lunarg.h @@ -34,6 +34,9 @@ VkResult loader_GetDisplayInfoWSI( size_t* pDataSize, void* pData); +void wsi_lunarg_add_instance_extensions( + struct loader_extension_list *ext_list); + void wsi_lunarg_create_instance( struct loader_instance *ptr_instance); -- cgit v1.2.3