commit 59a4732ea48a9bfcf00a43e092a816c6b6bae71b
author Tony Barbour <tony@LunarG.com> Wed Jun 24 16:06:58 2015 -0600
committer Tony Barbour <tony@LunarG.com> Thu Jun 25 15:17:05 2015 -0600
tree b0ecd3ac5877fe8ffd2a6d02c72c573bea4eaaf8
parent c01988b099d37626f1de37943a5fa64d4899b23c

vulkan.h: V108 -- Static Types, Bug# 13919

layers/basic.cpp

diff --git a/layers/basic.cpp b/layers/basic.cpp
index 59ec08d..990f669 100644
--- a/layers/basic.cpp
+++ b/layers/basic.cpp
@@ -61,38 +61,23 @@
     }
 };
 
-VK_LAYER_EXPORT VkResult VKAPI vkGetGlobalExtensionInfo(
-                                               VkExtensionInfoType infoType,
+VK_LAYER_EXPORT VkResult VKAPI vkGetGlobalExtensionProperties(
                                                uint32_t extensionIndex,
-                                               size_t*  pDataSize,
-                                               void*    pData)
+                                               VkExtensionProperties*    pData)
 {
     /* This entrypoint is NOT going to init it's own dispatch table since loader calls here early */
     uint32_t *count;
 
-    if (pDataSize == NULL)
-        return VK_ERROR_INVALID_POINTER;
+    if (extensionIndex >= BASIC_LAYER_EXT_ARRAY_SIZE)
+        return VK_ERROR_INVALID_VALUE;
+    memcpy((VkExtensionProperties *) pData, &basicExts[extensionIndex], sizeof(VkExtensionProperties));
 
-    switch (infoType) {
-        case VK_EXTENSION_INFO_TYPE_COUNT:
-            *pDataSize = sizeof(uint32_t);
-            if (pData == NULL)
-                return VK_SUCCESS;
-            count = (uint32_t *) pData;
-            *count = BASIC_LAYER_EXT_ARRAY_SIZE;
-            break;
-        case VK_EXTENSION_INFO_TYPE_PROPERTIES:
-            *pDataSize = sizeof(VkExtensionProperties);
-            if (pData == NULL)
-                return VK_SUCCESS;
-            if (extensionIndex >= BASIC_LAYER_EXT_ARRAY_SIZE)
-                return VK_ERROR_INVALID_VALUE;
-            memcpy((VkExtensionProperties *) pData, &basicExts[extensionIndex], sizeof(VkExtensionProperties));
-            break;
-        default:
-            return VK_ERROR_INVALID_VALUE;
-    };
+    return VK_SUCCESS;
+}
 
+VK_LAYER_EXPORT VkResult VKAPI vkGetGlobalExtensionCount(uint32_t* pCount)
+{
+    *pCount = BASIC_LAYER_EXT_ARRAY_SIZE;
     return VK_SUCCESS;
 }
 
@@ -181,8 +166,10 @@
         return (void *) vkDestroyInstance;
     if (!strcmp("vkEnumeratePhysicalDevices", pName))
         return (void*) vkEnumeratePhysicalDevices;
-    if (!strcmp("vkGetGlobalExtensionInfo", pName))
-        return (void*) vkGetGlobalExtensionInfo;
+    if (!strcmp("vkGetGlobalExtensionCount", pName))
+        return (void*) vkGetGlobalExtensionCount;
+    if (!strcmp("vkGetGlobalExtensionProperties", pName))
+        return (void*) vkGetGlobalExtensionProperties;
     if (!strcmp("vkCreateDevice", pName))
         return (void *) vkCreateDevice;
     else