diff options
| author | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-06-22 17:45:21 -0600 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-06-24 15:38:03 -0600 |
| commit | 10ff338de8a7701dd196444f0bf698d154c63bce (patch) | |
| tree | 37f851b3b3a8819f00e04dc762632183cac34d31 | |
| parent | 174f6b1dca26e59b11a22f9e5c43f937a4cbcf55 (diff) | |
| download | usermoji-10ff338de8a7701dd196444f0bf698d154c63bce.tar.xz | |
loader: Use loader_GetInstanceProcAddr
By using the vkGetInstanceProcAddr function in the loader's
instance dispatch table we will trace that function
during initialization of layers. Don't want to do that so
call loader internal function.
| -rw-r--r-- | loader/loader.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/loader/loader.c b/loader/loader.c index e940ef62..70f2a059 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -66,6 +66,8 @@ static void loader_remove_layer_lib( struct loader_struct loader = {0}; +static void * VKAPI loader_GetInstanceProcAddr(VkInstance instance, const char * pName); + enum loader_debug { LOADER_INFO_BIT = VK_BIT(0), LOADER_WARN_BIT = VK_BIT(1), @@ -83,7 +85,7 @@ uint32_t g_loader_log_msgs = 0; loader_platform_thread_mutex loader_lock; const VkLayerInstanceDispatchTable instance_disp = { - .GetInstanceProcAddr = vkGetInstanceProcAddr, + .GetInstanceProcAddr = loader_GetInstanceProcAddr, .CreateInstance = loader_CreateInstance, .DestroyInstance = loader_DestroyInstance, .EnumeratePhysicalDevices = loader_EnumeratePhysicalDevices, @@ -1803,7 +1805,7 @@ VkResult loader_CreateDevice( return res; } -LOADER_EXPORT void * VKAPI vkGetInstanceProcAddr(VkInstance instance, const char * pName) +static void * VKAPI loader_GetInstanceProcAddr(VkInstance instance, const char * pName) { if (instance == VK_NULL_HANDLE) return NULL; @@ -1840,7 +1842,12 @@ LOADER_EXPORT void * VKAPI vkGetInstanceProcAddr(VkInstance instance, const char return NULL; } -LOADER_EXPORT void * VKAPI vkGetDeviceProcAddr(VkDevice device, const char * pName) +LOADER_EXPORT void * VKAPI vkGetInstanceProcAddr(VkInstance instance, const char * pName) +{ + return loader_GetInstanceProcAddr(instance, pName); +} + +static void * VKAPI loader_GetDeviceProcAddr(VkDevice device, const char * pName) { if (device == VK_NULL_HANDLE) { return NULL; @@ -1877,6 +1884,11 @@ LOADER_EXPORT void * VKAPI vkGetDeviceProcAddr(VkDevice device, const char * pNa } } +LOADER_EXPORT void * VKAPI vkGetDeviceProcAddr(VkDevice device, const char * pName) +{ + return loader_GetDeviceProcAddr(device, pName); +} + LOADER_EXPORT VkResult VKAPI vkGetGlobalExtensionInfo( VkExtensionInfoType infoType, uint32_t extensionIndex, |