diff options
| author | Jon Ashburn <jon@lunarg.com> | 2015-05-18 15:28:32 -0600 |
|---|---|---|
| committer | Courtney Goeltzenleuchter <courtney@LunarG.com> | 2015-06-17 19:47:02 -0600 |
| commit | d343f86fb88353f5de7f75b916bbb6286d435b2c (patch) | |
| tree | 5ddeaab58e9bb8c63f4e1af2b29a7fb5adbb7d00 | |
| parent | 25b2b7ed4c5d833c0227ca70ba29ec81137ce17b (diff) | |
| download | usermoji-d343f86fb88353f5de7f75b916bbb6286d435b2c.tar.xz | |
loader: Remove GetGlobalExtensionInfo trampoline
Wasn't working correctly for now remove GetGlobalExtensionInfo from
the instance layer chain.
| -rw-r--r-- | loader/loader.c | 4 | ||||
| -rw-r--r-- | loader/loader.h | 2 | ||||
| -rw-r--r-- | loader/trampoline.c | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/loader/loader.c b/loader/loader.c index 9cbee3f9..37fea219 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -80,7 +80,7 @@ VkLayerInstanceDispatchTable instance_disp = { .EnumeratePhysicalDevices = loader_EnumeratePhysicalDevices, .GetPhysicalDeviceInfo = loader_GetPhysicalDeviceInfo, .CreateDevice = loader_CreateDevice, - .GetGlobalExtensionInfo = loader_GetGlobalExtensionInfo, + .GetGlobalExtensionInfo = vkGetGlobalExtensionInfo, .GetPhysicalDeviceExtensionInfo = loader_GetPhysicalDeviceExtensionInfo, .EnumerateLayers = loader_EnumerateLayers, .GetMultiDeviceCompatibility = loader_GetMultiDeviceCompatibility, @@ -1444,7 +1444,7 @@ LOADER_EXPORT void * VKAPI vkGetProcAddr(VkPhysicalDevice gpu, const char * pNam //TODO how is layer extension going to be enabled? //Need to call createInstance on the layer or something -VkResult loader_GetGlobalExtensionInfo( +LOADER_EXPORT VkResult VKAPI vkGetGlobalExtensionInfo( VkExtensionInfoType infoType, uint32_t extensionIndex, size_t* pDataSize, diff --git a/loader/loader.h b/loader/loader.h index 54a97584..e93f2585 100644 --- a/loader/loader.h +++ b/loader/loader.h @@ -163,11 +163,13 @@ VkResult loader_CreateDevice( const VkDeviceCreateInfo* pCreateInfo, VkDevice* pDevice); +#if 0 VkResult VKAPI loader_GetGlobalExtensionInfo( VkExtensionInfoType infoType, uint32_t extensionIndex, size_t* pDataSize, void* pData); +#endif VkResult loader_GetPhysicalDeviceExtensionInfo( VkPhysicalDevice gpu, diff --git a/loader/trampoline.c b/loader/trampoline.c index 15d2c5e5..908b47d7 100644 --- a/loader/trampoline.c +++ b/loader/trampoline.c @@ -154,6 +154,7 @@ LOADER_EXPORT VkResult VKAPI vkDestroyDevice(VkDevice device) return res; } +#if 0 //TODO get working on layer instance chain LOADER_EXPORT VkResult VKAPI vkGetGlobalExtensionInfo( VkExtensionInfoType infoType, uint32_t extensionIndex, @@ -162,6 +163,7 @@ LOADER_EXPORT VkResult VKAPI vkGetGlobalExtensionInfo( { return instance_disp.GetGlobalExtensionInfo(infoType, extensionIndex, pDataSize, pData); } +#endif LOADER_EXPORT VkResult VKAPI vkGetPhysicalDeviceExtensionInfo( VkPhysicalDevice gpu, |