From 6ebe70614672c554f76228a296c5d46642f9e0d1 Mon Sep 17 00:00:00 2001 From: Jon Ashburn Date: Fri, 22 May 2015 09:51:03 -0600 Subject: loader: Return NULL for WSI entrypoints if extension not enabled --- loader/loader.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'loader/loader.c') diff --git a/loader/loader.c b/loader/loader.c index a5b8e48b..1f7adc13 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -1381,9 +1381,10 @@ LOADER_EXPORT void * VKAPI vkGetInstanceProcAddr(VkInstance instance, const char return addr; /* return any extension global entrypoints */ - addr = wsi_lunarg_GetInstanceProcAddr(instance, pName); + bool wsi_enabled; + addr = wsi_lunarg_GetInstanceProcAddr(instance, pName, &wsi_enabled); if (addr) - return addr; + return (wsi_enabled) ? addr : NULL; /* return the instance dispatch table entrypoint for extensions */ const VkLayerInstanceDispatchTable *disp_table = * (VkLayerInstanceDispatchTable **) instance; @@ -1413,9 +1414,10 @@ LOADER_EXPORT void * VKAPI vkGetDeviceProcAddr(VkDevice device, const char * pNa } /* return any extension device entrypoints the loader knows about */ - addr = wsi_lunarg_GetDeviceProcAddr(device, pName); + bool wsi_enabled; + addr = wsi_lunarg_GetDeviceProcAddr(device, pName, &wsi_enabled); if (addr) - return addr; + return (wsi_enabled) ? addr : NULL; /* return the dispatch table entrypoint for the fastest case */ const VkLayerDispatchTable *disp_table = * (VkLayerDispatchTable **) device; -- cgit v1.2.3