diff options
| author | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-06-07 17:27:05 -0600 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-06-18 10:18:19 -0600 |
| commit | ffcfbad51d9beced737627ae9657baba3d281697 (patch) | |
| tree | d31bfabf91d983622803d188ec94700adcc23285 | |
| parent | e7e2c6f8ccc462f24a42e38ab032bac365e0a152 (diff) | |
| download | usermoji-ffcfbad51d9beced737627ae9657baba3d281697.tar.xz | |
loader: Remove obsolete extension / layer code
| -rw-r--r-- | layers/param_checker.cpp | 1 | ||||
| -rw-r--r-- | loader/trampoline.c | 28 | ||||
| -rw-r--r-- | loader/wsi_lunarg.c | 2 |
3 files changed, 0 insertions, 31 deletions
diff --git a/layers/param_checker.cpp b/layers/param_checker.cpp index dc53099a..79903f3f 100644 --- a/layers/param_checker.cpp +++ b/layers/param_checker.cpp @@ -194,7 +194,6 @@ void PostCreateInstance(VkResult result, const VkInstanceCreateInfo *pCreateInfo VK_LAYER_EXPORT VkResult VKAPI vkCreateInstance(const VkInstanceCreateInfo* pCreateInfo, VkInstance* pInstance) { loader_platform_thread_once(&initOnce, initParamChecker); - initInstanceTable((const VkBaseLayerObject *) (*pInstance)); PreCreateInstance(pCreateInfo->pAppInfo, pCreateInfo->pAllocCb); VkResult result = instance_dispatch_table(*pInstance)->CreateInstance(pCreateInfo, pInstance); diff --git a/loader/trampoline.c b/loader/trampoline.c index d22df048..572db27b 100644 --- a/loader/trampoline.c +++ b/loader/trampoline.c @@ -73,34 +73,6 @@ LOADER_EXPORT VkResult VKAPI vkCreateInstance( sizeof(VkExtensionProperties) * ptr_instance->app_extension_count); } -#if 0 - /* - * Now that we have list of enabled extensions, verify that their dependencies - * have been satisfied. - * If A depends on B, then B should come after A in the list. - */ - for (i = 0; i < ptr_instance->app_extension_count; i++) { - if (ptr_instance->app_extension_props[i].dependencyCount == 0) - continue; - - const VkExtensionProperties *dependencies = ptr_instance->app_extension_props[i].pDependencyList; - const VkExtensionProperties *enabled_extensions = &ptr_instance->app_extension_props[i+1]; - uint32_t dependency_extensions_count = ptr_instance->app_extension_count - i - 1; - for (dependency = 0; dependency < ptr_instance->app_extension_props[i].dependencyCount; dependency++) { - bool found = false; - for (j = 0; j < dependency_extensions_count; j++) { - if (compare_vk_extension_properties(&dependencies[j], &enabled_extensions[j])) { - found = true; - } - } - if (!found) { - /* TODO: Log message about extension dependency not found */ - return VK_ERROR_INVALID_EXTENSION; - } - } - } -#endif - ptr_instance->disp = malloc(sizeof(VkLayerInstanceDispatchTable)); if (ptr_instance->disp == NULL) return VK_ERROR_OUT_OF_HOST_MEMORY; diff --git a/loader/wsi_lunarg.c b/loader/wsi_lunarg.c index 57e6d118..5cd9585d 100644 --- a/loader/wsi_lunarg.c +++ b/loader/wsi_lunarg.c @@ -131,8 +131,6 @@ static const struct loader_extension_property wsi_lunarg_extension_info = { .name = VK_WSI_LUNARG_EXTENSION_NAME, .version = VK_WSI_LUNARG_REVISION, .description = "loader: LunarG WSI extension", -// .dependencyCount = 0, -// .pDependencyList = NULL, }, .origin = VK_EXTENSION_ORIGIN_LOADER, .hosted = true, |