android: Update vulkan_wrapper, add source script

* Finally check in the script that generates the wrapper
* Update the script to handle split vulkan files
* Update the checked in vulkan_wrapper.*
* Add a README descrbing how to use the script

4 files changed, 1613 insertions, 55 deletions

diff --git a/common/README.md b/common/README.md
new file mode 100644
index 00000000..3e496bee
--- /dev/null
+++ b/common/README.md
@@ -0,0 +1,28 @@
+# Generating vulkan_wrapper
+
+The script for generating the vulkan_wrapper is based on the work done by @olvaffe for Hologram's dispatch table:
+https://github.com/LunarG/VulkanSamples/blob/master/Sample-Programs/Hologram/generate-dispatch-table
+
+The wrapper is used to support applications that don't want to link directly against libvulkan.so, which is not
+present on Android before 7.0 (Nougat).
+
+The wrapper only contains core functions and WSI extensions.
+
+To regenerate the wrappers:
+
+    cd scripts
+    pushd ../Vulkan-Headers/include/vulkan
+    ../../../scripts/generate_vulkan_wrapper.py parse vulkan.h > parsed_header
+
+Copy contents of parsed_header into generate_vulkan_wrapper.py between the sections that read:
+
+    # generated by "generate_vulkan_wrapper.py parse vulkan.h"
+    # end of generated code
+
+Then run the script:
+
+    popd
+    ./generate_vulkan_wrapper.py ../common/vulkan_wrapper.h
+    ./generate_vulkan_wrapper.py ../common/vulkan_wrapper.cpp
+    clang-format -i vulkan_wrapper.h
+    clang-format -i vulkan_wrapper.cpp
diff --git a/common/vulkan_wrapper.cpp b/common/vulkan_wrapper.cpp
index b51290ce..876ae403 100644
--- a/common/vulkan_wrapper.cpp
+++ b/common/vulkan_wrapper.cpp
@@ -22,7 +22,7 @@ extern "C" {
 #include <dlfcn.h>
 
 int InitVulkan(void) {
-    void *libvulkan = dlopen("libvulkan.so", RTLD_NOW | RTLD_LOCAL);
+    void* libvulkan = dlopen("libvulkan.so", RTLD_NOW | RTLD_LOCAL);
     if (!libvulkan) return 0;
 
     // Vulkan supported, set function addresses
@@ -31,8 +31,6 @@ int InitVulkan(void) {
     vkEnumeratePhysicalDevices = reinterpret_cast<PFN_vkEnumeratePhysicalDevices>(dlsym(libvulkan, "vkEnumeratePhysicalDevices"));
     vkGetPhysicalDeviceFeatures =
         reinterpret_cast<PFN_vkGetPhysicalDeviceFeatures>(dlsym(libvulkan, "vkGetPhysicalDeviceFeatures"));
-    vkGetPhysicalDeviceFeatures2 =
-        reinterpret_cast<PFN_vkGetPhysicalDeviceFeatures2>(dlsym(libvulkan, "vkGetPhysicalDeviceFeatures2"));
     vkGetPhysicalDeviceFormatProperties =
         reinterpret_cast<PFN_vkGetPhysicalDeviceFormatProperties>(dlsym(libvulkan, "vkGetPhysicalDeviceFormatProperties"));
     vkGetPhysicalDeviceImageFormatProperties = reinterpret_cast<PFN_vkGetPhysicalDeviceImageFormatProperties>(
@@ -185,6 +183,55 @@ int InitVulkan(void) {
     vkCmdNextSubpass = reinterpret_cast<PFN_vkCmdNextSubpass>(dlsym(libvulkan, "vkCmdNextSubpass"));
     vkCmdEndRenderPass = reinterpret_cast<PFN_vkCmdEndRenderPass>(dlsym(libvulkan, "vkCmdEndRenderPass"));
     vkCmdExecuteCommands = reinterpret_cast<PFN_vkCmdExecuteCommands>(dlsym(libvulkan, "vkCmdExecuteCommands"));
+    vkEnumerateInstanceVersion = reinterpret_cast<PFN_vkEnumerateInstanceVersion>(dlsym(libvulkan, "vkEnumerateInstanceVersion"));
+    vkBindBufferMemory2 = reinterpret_cast<PFN_vkBindBufferMemory2>(dlsym(libvulkan, "vkBindBufferMemory2"));
+    vkBindImageMemory2 = reinterpret_cast<PFN_vkBindImageMemory2>(dlsym(libvulkan, "vkBindImageMemory2"));
+    vkGetDeviceGroupPeerMemoryFeatures =
+        reinterpret_cast<PFN_vkGetDeviceGroupPeerMemoryFeatures>(dlsym(libvulkan, "vkGetDeviceGroupPeerMemoryFeatures"));
+    vkCmdSetDeviceMask = reinterpret_cast<PFN_vkCmdSetDeviceMask>(dlsym(libvulkan, "vkCmdSetDeviceMask"));
+    vkCmdDispatchBase = reinterpret_cast<PFN_vkCmdDispatchBase>(dlsym(libvulkan, "vkCmdDispatchBase"));
+    vkEnumeratePhysicalDeviceGroups =
+        reinterpret_cast<PFN_vkEnumeratePhysicalDeviceGroups>(dlsym(libvulkan, "vkEnumeratePhysicalDeviceGroups"));
+    vkGetImageMemoryRequirements2 =
+        reinterpret_cast<PFN_vkGetImageMemoryRequirements2>(dlsym(libvulkan, "vkGetImageMemoryRequirements2"));
+    vkGetBufferMemoryRequirements2 =
+        reinterpret_cast<PFN_vkGetBufferMemoryRequirements2>(dlsym(libvulkan, "vkGetBufferMemoryRequirements2"));
+    vkGetImageSparseMemoryRequirements2 =
+        reinterpret_cast<PFN_vkGetImageSparseMemoryRequirements2>(dlsym(libvulkan, "vkGetImageSparseMemoryRequirements2"));
+    vkGetPhysicalDeviceFeatures2 =
+        reinterpret_cast<PFN_vkGetPhysicalDeviceFeatures2>(dlsym(libvulkan, "vkGetPhysicalDeviceFeatures2"));
+    vkGetPhysicalDeviceProperties2 =
+        reinterpret_cast<PFN_vkGetPhysicalDeviceProperties2>(dlsym(libvulkan, "vkGetPhysicalDeviceProperties2"));
+    vkGetPhysicalDeviceFormatProperties2 =
+        reinterpret_cast<PFN_vkGetPhysicalDeviceFormatProperties2>(dlsym(libvulkan, "vkGetPhysicalDeviceFormatProperties2"));
+    vkGetPhysicalDeviceImageFormatProperties2 = reinterpret_cast<PFN_vkGetPhysicalDeviceImageFormatProperties2>(
+        dlsym(libvulkan, "vkGetPhysicalDeviceImageFormatProperties2"));
+    vkGetPhysicalDeviceQueueFamilyProperties2 = reinterpret_cast<PFN_vkGetPhysicalDeviceQueueFamilyProperties2>(
+        dlsym(libvulkan, "vkGetPhysicalDeviceQueueFamilyProperties2"));
+    vkGetPhysicalDeviceMemoryProperties2 =
+        reinterpret_cast<PFN_vkGetPhysicalDeviceMemoryProperties2>(dlsym(libvulkan, "vkGetPhysicalDeviceMemoryProperties2"));
+    vkGetPhysicalDeviceSparseImageFormatProperties2 = reinterpret_cast<PFN_vkGetPhysicalDeviceSparseImageFormatProperties2>(
+        dlsym(libvulkan, "vkGetPhysicalDeviceSparseImageFormatProperties2"));
+    vkTrimCommandPool = reinterpret_cast<PFN_vkTrimCommandPool>(dlsym(libvulkan, "vkTrimCommandPool"));
+    vkGetDeviceQueue2 = reinterpret_cast<PFN_vkGetDeviceQueue2>(dlsym(libvulkan, "vkGetDeviceQueue2"));
+    vkCreateSamplerYcbcrConversion =
+        reinterpret_cast<PFN_vkCreateSamplerYcbcrConversion>(dlsym(libvulkan, "vkCreateSamplerYcbcrConversion"));
+    vkDestroySamplerYcbcrConversion =
+        reinterpret_cast<PFN_vkDestroySamplerYcbcrConversion>(dlsym(libvulkan, "vkDestroySamplerYcbcrConversion"));
+    vkCreateDescriptorUpdateTemplate =
+        reinterpret_cast<PFN_vkCreateDescriptorUpdateTemplate>(dlsym(libvulkan, "vkCreateDescriptorUpdateTemplate"));
+    vkDestroyDescriptorUpdateTemplate =
+        reinterpret_cast<PFN_vkDestroyDescriptorUpdateTemplate>(dlsym(libvulkan, "vkDestroyDescriptorUpdateTemplate"));
+    vkUpdateDescriptorSetWithTemplate =
+        reinterpret_cast<PFN_vkUpdateDescriptorSetWithTemplate>(dlsym(libvulkan, "vkUpdateDescriptorSetWithTemplate"));
+    vkGetPhysicalDeviceExternalBufferProperties = reinterpret_cast<PFN_vkGetPhysicalDeviceExternalBufferProperties>(
+        dlsym(libvulkan, "vkGetPhysicalDeviceExternalBufferProperties"));
+    vkGetPhysicalDeviceExternalFenceProperties = reinterpret_cast<PFN_vkGetPhysicalDeviceExternalFenceProperties>(
+        dlsym(libvulkan, "vkGetPhysicalDeviceExternalFenceProperties"));
+    vkGetPhysicalDeviceExternalSemaphoreProperties = reinterpret_cast<PFN_vkGetPhysicalDeviceExternalSemaphoreProperties>(
+        dlsym(libvulkan, "vkGetPhysicalDeviceExternalSemaphoreProperties"));
+    vkGetDescriptorSetLayoutSupport =
+        reinterpret_cast<PFN_vkGetDescriptorSetLayoutSupport>(dlsym(libvulkan, "vkGetDescriptorSetLayoutSupport"));
     vkDestroySurfaceKHR = reinterpret_cast<PFN_vkDestroySurfaceKHR>(dlsym(libvulkan, "vkDestroySurfaceKHR"));
     vkGetPhysicalDeviceSurfaceSupportKHR =
         reinterpret_cast<PFN_vkGetPhysicalDeviceSurfaceSupportKHR>(dlsym(libvulkan, "vkGetPhysicalDeviceSurfaceSupportKHR"));
@@ -199,6 +246,13 @@ int InitVulkan(void) {
     vkGetSwapchainImagesKHR = reinterpret_cast<PFN_vkGetSwapchainImagesKHR>(dlsym(libvulkan, "vkGetSwapchainImagesKHR"));
     vkAcquireNextImageKHR = reinterpret_cast<PFN_vkAcquireNextImageKHR>(dlsym(libvulkan, "vkAcquireNextImageKHR"));
     vkQueuePresentKHR = reinterpret_cast<PFN_vkQueuePresentKHR>(dlsym(libvulkan, "vkQueuePresentKHR"));
+    vkGetDeviceGroupPresentCapabilitiesKHR =
+        reinterpret_cast<PFN_vkGetDeviceGroupPresentCapabilitiesKHR>(dlsym(libvulkan, "vkGetDeviceGroupPresentCapabilitiesKHR"));
+    vkGetDeviceGroupSurfacePresentModesKHR =
+        reinterpret_cast<PFN_vkGetDeviceGroupSurfacePresentModesKHR>(dlsym(libvulkan, "vkGetDeviceGroupSurfacePresentModesKHR"));
+    vkGetPhysicalDevicePresentRectanglesKHR =
+        reinterpret_cast<PFN_vkGetPhysicalDevicePresentRectanglesKHR>(dlsym(libvulkan, "vkGetPhysicalDevicePresentRectanglesKHR"));
+    vkAcquireNextImage2KHR = reinterpret_cast<PFN_vkAcquireNextImage2KHR>(dlsym(libvulkan, "vkAcquireNextImage2KHR"));
     vkGetPhysicalDeviceDisplayPropertiesKHR =
         reinterpret_cast<PFN_vkGetPhysicalDeviceDisplayPropertiesKHR>(dlsym(libvulkan, "vkGetPhysicalDeviceDisplayPropertiesKHR"));
     vkGetPhysicalDeviceDisplayPlanePropertiesKHR = reinterpret_cast<PFN_vkGetPhysicalDeviceDisplayPlanePropertiesKHR>(
@@ -214,17 +268,76 @@ int InitVulkan(void) {
         reinterpret_cast<PFN_vkCreateDisplayPlaneSurfaceKHR>(dlsym(libvulkan, "vkCreateDisplayPlaneSurfaceKHR"));
     vkCreateSharedSwapchainsKHR =
         reinterpret_cast<PFN_vkCreateSharedSwapchainsKHR>(dlsym(libvulkan, "vkCreateSharedSwapchainsKHR"));
+    vkGetPhysicalDeviceFeatures2KHR =
+        reinterpret_cast<PFN_vkGetPhysicalDeviceFeatures2KHR>(dlsym(libvulkan, "vkGetPhysicalDeviceFeatures2KHR"));
+    vkGetPhysicalDeviceProperties2KHR =
+        reinterpret_cast<PFN_vkGetPhysicalDeviceProperties2KHR>(dlsym(libvulkan, "vkGetPhysicalDeviceProperties2KHR"));
+    vkGetPhysicalDeviceFormatProperties2KHR =
+        reinterpret_cast<PFN_vkGetPhysicalDeviceFormatProperties2KHR>(dlsym(libvulkan, "vkGetPhysicalDeviceFormatProperties2KHR"));
+    vkGetPhysicalDeviceImageFormatProperties2KHR = reinterpret_cast<PFN_vkGetPhysicalDeviceImageFormatProperties2KHR>(
+        dlsym(libvulkan, "vkGetPhysicalDeviceImageFormatProperties2KHR"));
+    vkGetPhysicalDeviceQueueFamilyProperties2KHR = reinterpret_cast<PFN_vkGetPhysicalDeviceQueueFamilyProperties2KHR>(
+        dlsym(libvulkan, "vkGetPhysicalDeviceQueueFamilyProperties2KHR"));
+    vkGetPhysicalDeviceMemoryProperties2KHR =
+        reinterpret_cast<PFN_vkGetPhysicalDeviceMemoryProperties2KHR>(dlsym(libvulkan, "vkGetPhysicalDeviceMemoryProperties2KHR"));
+    vkGetPhysicalDeviceSparseImageFormatProperties2KHR = reinterpret_cast<PFN_vkGetPhysicalDeviceSparseImageFormatProperties2KHR>(
+        dlsym(libvulkan, "vkGetPhysicalDeviceSparseImageFormatProperties2KHR"));
+    vkGetDeviceGroupPeerMemoryFeaturesKHR =
+        reinterpret_cast<PFN_vkGetDeviceGroupPeerMemoryFeaturesKHR>(dlsym(libvulkan, "vkGetDeviceGroupPeerMemoryFeaturesKHR"));
+    vkCmdSetDeviceMaskKHR = reinterpret_cast<PFN_vkCmdSetDeviceMaskKHR>(dlsym(libvulkan, "vkCmdSetDeviceMaskKHR"));
+    vkCmdDispatchBaseKHR = reinterpret_cast<PFN_vkCmdDispatchBaseKHR>(dlsym(libvulkan, "vkCmdDispatchBaseKHR"));
+    vkTrimCommandPoolKHR = reinterpret_cast<PFN_vkTrimCommandPoolKHR>(dlsym(libvulkan, "vkTrimCommandPoolKHR"));
+    vkEnumeratePhysicalDeviceGroupsKHR =
+        reinterpret_cast<PFN_vkEnumeratePhysicalDeviceGroupsKHR>(dlsym(libvulkan, "vkEnumeratePhysicalDeviceGroupsKHR"));
+    vkGetPhysicalDeviceExternalBufferPropertiesKHR = reinterpret_cast<PFN_vkGetPhysicalDeviceExternalBufferPropertiesKHR>(
+        dlsym(libvulkan, "vkGetPhysicalDeviceExternalBufferPropertiesKHR"));
+    vkGetMemoryFdKHR = reinterpret_cast<PFN_vkGetMemoryFdKHR>(dlsym(libvulkan, "vkGetMemoryFdKHR"));
+    vkGetMemoryFdPropertiesKHR = reinterpret_cast<PFN_vkGetMemoryFdPropertiesKHR>(dlsym(libvulkan, "vkGetMemoryFdPropertiesKHR"));
+    vkGetPhysicalDeviceExternalSemaphorePropertiesKHR = reinterpret_cast<PFN_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR>(
+        dlsym(libvulkan, "vkGetPhysicalDeviceExternalSemaphorePropertiesKHR"));
+    vkImportSemaphoreFdKHR = reinterpret_cast<PFN_vkImportSemaphoreFdKHR>(dlsym(libvulkan, "vkImportSemaphoreFdKHR"));
+    vkGetSemaphoreFdKHR = reinterpret_cast<PFN_vkGetSemaphoreFdKHR>(dlsym(libvulkan, "vkGetSemaphoreFdKHR"));
+    vkCmdPushDescriptorSetKHR = reinterpret_cast<PFN_vkCmdPushDescriptorSetKHR>(dlsym(libvulkan, "vkCmdPushDescriptorSetKHR"));
+    vkCmdPushDescriptorSetWithTemplateKHR =
+        reinterpret_cast<PFN_vkCmdPushDescriptorSetWithTemplateKHR>(dlsym(libvulkan, "vkCmdPushDescriptorSetWithTemplateKHR"));
+    vkCreateDescriptorUpdateTemplateKHR =
+        reinterpret_cast<PFN_vkCreateDescriptorUpdateTemplateKHR>(dlsym(libvulkan, "vkCreateDescriptorUpdateTemplateKHR"));
+    vkDestroyDescriptorUpdateTemplateKHR =
+        reinterpret_cast<PFN_vkDestroyDescriptorUpdateTemplateKHR>(dlsym(libvulkan, "vkDestroyDescriptorUpdateTemplateKHR"));
+    vkUpdateDescriptorSetWithTemplateKHR =
+        reinterpret_cast<PFN_vkUpdateDescriptorSetWithTemplateKHR>(dlsym(libvulkan, "vkUpdateDescriptorSetWithTemplateKHR"));
+    vkGetSwapchainStatusKHR = reinterpret_cast<PFN_vkGetSwapchainStatusKHR>(dlsym(libvulkan, "vkGetSwapchainStatusKHR"));
+    vkGetPhysicalDeviceExternalFencePropertiesKHR = reinterpret_cast<PFN_vkGetPhysicalDeviceExternalFencePropertiesKHR>(
+        dlsym(libvulkan, "vkGetPhysicalDeviceExternalFencePropertiesKHR"));
+    vkImportFenceFdKHR = reinterpret_cast<PFN_vkImportFenceFdKHR>(dlsym(libvulkan, "vkImportFenceFdKHR"));
+    vkGetFenceFdKHR = reinterpret_cast<PFN_vkGetFenceFdKHR>(dlsym(libvulkan, "vkGetFenceFdKHR"));
+    vkGetPhysicalDeviceSurfaceCapabilities2KHR = reinterpret_cast<PFN_vkGetPhysicalDeviceSurfaceCapabilities2KHR>(
+        dlsym(libvulkan, "vkGetPhysicalDeviceSurfaceCapabilities2KHR"));
+    vkGetPhysicalDeviceSurfaceFormats2KHR =
+        reinterpret_cast<PFN_vkGetPhysicalDeviceSurfaceFormats2KHR>(dlsym(libvulkan, "vkGetPhysicalDeviceSurfaceFormats2KHR"));
+    vkGetImageMemoryRequirements2KHR =
+        reinterpret_cast<PFN_vkGetImageMemoryRequirements2KHR>(dlsym(libvulkan, "vkGetImageMemoryRequirements2KHR"));
+    vkGetBufferMemoryRequirements2KHR =
+        reinterpret_cast<PFN_vkGetBufferMemoryRequirements2KHR>(dlsym(libvulkan, "vkGetBufferMemoryRequirements2KHR"));
+    vkGetImageSparseMemoryRequirements2KHR =
+        reinterpret_cast<PFN_vkGetImageSparseMemoryRequirements2KHR>(dlsym(libvulkan, "vkGetImageSparseMemoryRequirements2KHR"));
+    vkCreateSamplerYcbcrConversionKHR =
+        reinterpret_cast<PFN_vkCreateSamplerYcbcrConversionKHR>(dlsym(libvulkan, "vkCreateSamplerYcbcrConversionKHR"));
+    vkDestroySamplerYcbcrConversionKHR =
+        reinterpret_cast<PFN_vkDestroySamplerYcbcrConversionKHR>(dlsym(libvulkan, "vkDestroySamplerYcbcrConversionKHR"));
+    vkBindBufferMemory2KHR = reinterpret_cast<PFN_vkBindBufferMemory2KHR>(dlsym(libvulkan, "vkBindBufferMemory2KHR"));
+    vkBindImageMemory2KHR = reinterpret_cast<PFN_vkBindImageMemory2KHR>(dlsym(libvulkan, "vkBindImageMemory2KHR"));
+    vkGetDescriptorSetLayoutSupportKHR =
+        reinterpret_cast<PFN_vkGetDescriptorSetLayoutSupportKHR>(dlsym(libvulkan, "vkGetDescriptorSetLayoutSupportKHR"));
 
-#ifdef VK_USE_PLATFORM_XLIB_KHR
-    vkCreateXlibSurfaceKHR = reinterpret_cast<PFN_vkCreateXlibSurfaceKHR>(dlsym(libvulkan, "vkCreateXlibSurfaceKHR"));
-    vkGetPhysicalDeviceXlibPresentationSupportKHR = reinterpret_cast<PFN_vkGetPhysicalDeviceXlibPresentationSupportKHR>(
-        dlsym(libvulkan, "vkGetPhysicalDeviceXlibPresentationSupportKHR"));
+#ifdef VK_USE_PLATFORM_ANDROID_KHR
+    vkCreateAndroidSurfaceKHR = reinterpret_cast<PFN_vkCreateAndroidSurfaceKHR>(dlsym(libvulkan, "vkCreateAndroidSurfaceKHR"));
 #endif
 
-#ifdef VK_USE_PLATFORM_XCB_KHR
-    vkCreateXcbSurfaceKHR = reinterpret_cast<PFN_vkCreateXcbSurfaceKHR>(dlsym(libvulkan, "vkCreateXcbSurfaceKHR"));
-    vkGetPhysicalDeviceXcbPresentationSupportKHR = reinterpret_cast<PFN_vkGetPhysicalDeviceXcbPresentationSupportKHR>(
-        dlsym(libvulkan, "vkGetPhysicalDeviceXcbPresentationSupportKHR"));
+#ifdef VK_USE_PLATFORM_MIR_KHR
+    vkCreateMirSurfaceKHR = reinterpret_cast<PFN_vkCreateMirSurfaceKHR>(dlsym(libvulkan, "vkCreateMirSurfaceKHR"));
+    vkGetPhysicalDeviceMirPresentationSupportKHR = reinterpret_cast<PFN_vkGetPhysicalDeviceMirPresentationSupportKHR>(
+        dlsym(libvulkan, "vkGetPhysicalDeviceMirPresentationSupportKHR"));
 #endif
 
 #ifdef VK_USE_PLATFORM_WAYLAND_KHR
@@ -233,20 +346,44 @@ int InitVulkan(void) {
         dlsym(libvulkan, "vkGetPhysicalDeviceWaylandPresentationSupportKHR"));
 #endif
 
-#ifdef VK_USE_PLATFORM_MIR_KHR
-    vkCreateMirSurfaceKHR = reinterpret_cast<PFN_vkCreateMirSurfaceKHR>(dlsym(libvulkan, "vkCreateMirSurfaceKHR"));
-    vkGetPhysicalDeviceMirPresentationSupportKHR = reinterpret_cast<PFN_vkGetPhysicalDeviceMirPresentationSupportKHR>(
-        dlsym(libvulkan, "vkGetPhysicalDeviceMirPresentationSupportKHR"));
+#ifdef VK_USE_PLATFORM_WIN32_KHR
+    vkCreateWin32SurfaceKHR = reinterpret_cast<PFN_vkCreateWin32SurfaceKHR>(dlsym(libvulkan, "vkCreateWin32SurfaceKHR"));
+    vkGetPhysicalDeviceWin32PresentationSupportKHR = reinterpret_cast<PFN_vkGetPhysicalDeviceWin32PresentationSupportKHR>(
+        dlsym(libvulkan, "vkGetPhysicalDeviceWin32PresentationSupportKHR"));
 #endif
 
-#ifdef VK_USE_PLATFORM_ANDROID_KHR
-    vkCreateAndroidSurfaceKHR = reinterpret_cast<PFN_vkCreateAndroidSurfaceKHR>(dlsym(libvulkan, "vkCreateAndroidSurfaceKHR"));
+#ifdef VK_USE_PLATFORM_WIN32_KHR
+    vkGetMemoryWin32HandleKHR = reinterpret_cast<PFN_vkGetMemoryWin32HandleKHR>(dlsym(libvulkan, "vkGetMemoryWin32HandleKHR"));
+    vkGetMemoryWin32HandlePropertiesKHR =
+        reinterpret_cast<PFN_vkGetMemoryWin32HandlePropertiesKHR>(dlsym(libvulkan, "vkGetMemoryWin32HandlePropertiesKHR"));
 #endif
 
 #ifdef VK_USE_PLATFORM_WIN32_KHR
-    vkCreateWin32SurfaceKHR = reinterpret_cast<PFN_vkCreateWin32SurfaceKHR>(dlsym(libvulkan, "vkCreateWin32SurfaceKHR"));
-    vkGetPhysicalDeviceWin32PresentationSupportKHR = reinterpret_cast<PFN_vkGetPhysicalDeviceWin32PresentationSupportKHR>(
-        dlsym(libvulkan, "vkGetPhysicalDeviceWin32PresentationSupportKHR"));
+#endif
+
+#ifdef VK_USE_PLATFORM_WIN32_KHR
+    vkImportSemaphoreWin32HandleKHR =
+        reinterpret_cast<PFN_vkImportSemaphoreWin32HandleKHR>(dlsym(libvulkan, "vkImportSemaphoreWin32HandleKHR"));
+    vkGetSemaphoreWin32HandleKHR =
+        reinterpret_cast<PFN_vkGetSemaphoreWin32HandleKHR>(dlsym(libvulkan, "vkGetSemaphoreWin32HandleKHR"));
+#endif
+
+#ifdef VK_USE_PLATFORM_WIN32_KHR
+    vkImportFenceWin32HandleKHR =
+        reinterpret_cast<PFN_vkImportFenceWin32HandleKHR>(dlsym(libvulkan, "vkImportFenceWin32HandleKHR"));
+    vkGetFenceWin32HandleKHR = reinterpret_cast<PFN_vkGetFenceWin32HandleKHR>(dlsym(libvulkan, "vkGetFenceWin32HandleKHR"));
+#endif
+
+#ifdef VK_USE_PLATFORM_XCB_KHR
+    vkCreateXcbSurfaceKHR = reinterpret_cast<PFN_vkCreateXcbSurfaceKHR>(dlsym(libvulkan, "vkCreateXcbSurfaceKHR"));
+    vkGetPhysicalDeviceXcbPresentationSupportKHR = reinterpret_cast<PFN_vkGetPhysicalDeviceXcbPresentationSupportKHR>(
+        dlsym(libvulkan, "vkGetPhysicalDeviceXcbPresentationSupportKHR"));
+#endif
+
+#ifdef VK_USE_PLATFORM_XLIB_KHR
+    vkCreateXlibSurfaceKHR = reinterpret_cast<PFN_vkCreateXlibSurfaceKHR>(dlsym(libvulkan, "vkCreateXlibSurfaceKHR"));
+    vkGetPhysicalDeviceXlibPresentationSupportKHR = reinterpret_cast<PFN_vkGetPhysicalDeviceXlibPresentationSupportKHR>(
+        dlsym(libvulkan, "vkGetPhysicalDeviceXlibPresentationSupportKHR"));
 #endif
     return 1;
 }
@@ -256,7 +393,6 @@ PFN_vkCreateInstance vkCreateInstance;
 PFN_vkDestroyInstance vkDestroyInstance;
 PFN_vkEnumeratePhysicalDevices vkEnumeratePhysicalDevices;
 PFN_vkGetPhysicalDeviceFeatures vkGetPhysicalDeviceFeatures;
-PFN_vkGetPhysicalDeviceFeatures2 vkGetPhysicalDeviceFeatures2;
 PFN_vkGetPhysicalDeviceFormatProperties vkGetPhysicalDeviceFormatProperties;
 PFN_vkGetPhysicalDeviceImageFormatProperties vkGetPhysicalDeviceImageFormatProperties;
 PFN_vkGetPhysicalDeviceProperties vkGetPhysicalDeviceProperties;
@@ -390,6 +526,34 @@ PFN_vkCmdBeginRenderPass vkCmdBeginRenderPass;
 PFN_vkCmdNextSubpass vkCmdNextSubpass;
 PFN_vkCmdEndRenderPass vkCmdEndRenderPass;
 PFN_vkCmdExecuteCommands vkCmdExecuteCommands;
+PFN_vkEnumerateInstanceVersion vkEnumerateInstanceVersion;
+PFN_vkBindBufferMemory2 vkBindBufferMemory2;
+PFN_vkBindImageMemory2 vkBindImageMemory2;
+PFN_vkGetDeviceGroupPeerMemoryFeatures vkGetDeviceGroupPeerMemoryFeatures;
+PFN_vkCmdSetDeviceMask vkCmdSetDeviceMask;
+PFN_vkCmdDispatchBase vkCmdDispatchBase;
+PFN_vkEnumeratePhysicalDeviceGroups vkEnumeratePhysicalDeviceGroups;
+PFN_vkGetImageMemoryRequirements2 vkGetImageMemoryRequirements2;
+PFN_vkGetBufferMemoryRequirements2 vkGetBufferMemoryRequirements2;
+PFN_vkGetImageSparseMemoryRequirements2 vkGetImageSparseMemoryRequirements2;
+PFN_vkGetPhysicalDeviceFeatures2 vkGetPhysicalDeviceFeatures2;
+PFN_vkGetPhysicalDeviceProperties2 vkGetPhysicalDeviceProperties2;
+PFN_vkGetPhysicalDeviceFormatProperties2 vkGetPhysicalDeviceFormatProperties2;
+PFN_vkGetPhysicalDeviceImageFormatProperties2 vkGetPhysicalDeviceImageFormatProperties2;
+PFN_vkGetPhysicalDeviceQueueFamilyProperties2 vkGetPhysicalDeviceQueueFamilyProperties2;
+PFN_vkGetPhysicalDeviceMemoryProperties2 vkGetPhysicalDeviceMemoryProperties2;
+PFN_vkGetPhysicalDeviceSparseImageFormatProperties2 vkGetPhysicalDeviceSparseImageFormatProperties2;
+PFN_vkTrimCommandPool vkTrimCommandPool;
+PFN_vkGetDeviceQueue2 vkGetDeviceQueue2;
+PFN_vkCreateSamplerYcbcrConversion vkCreateSamplerYcbcrConversion;
+PFN_vkDestroySamplerYcbcrConversion vkDestroySamplerYcbcrConversion;
+PFN_vkCreateDescriptorUpdateTemplate vkCreateDescriptorUpdateTemplate;
+PFN_vkDestroyDescriptorUpdateTemplate vkDestroyDescriptorUpdateTemplate;
+PFN_vkUpdateDescriptorSetWithTemplate vkUpdateDescriptorSetWithTemplate;
+PFN_vkGetPhysicalDeviceExternalBufferProperties vkGetPhysicalDeviceExternalBufferProperties;
+PFN_vkGetPhysicalDeviceExternalFenceProperties vkGetPhysicalDeviceExternalFenceProperties;
+PFN_vkGetPhysicalDeviceExternalSemaphoreProperties vkGetPhysicalDeviceExternalSemaphoreProperties;
+PFN_vkGetDescriptorSetLayoutSupport vkGetDescriptorSetLayoutSupport;
 PFN_vkDestroySurfaceKHR vkDestroySurfaceKHR;
 PFN_vkGetPhysicalDeviceSurfaceSupportKHR vkGetPhysicalDeviceSurfaceSupportKHR;
 PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR vkGetPhysicalDeviceSurfaceCapabilitiesKHR;
@@ -400,6 +564,10 @@ PFN_vkDestroySwapchainKHR vkDestroySwapchainKHR;
 PFN_vkGetSwapchainImagesKHR vkGetSwapchainImagesKHR;
 PFN_vkAcquireNextImageKHR vkAcquireNextImageKHR;
 PFN_vkQueuePresentKHR vkQueuePresentKHR;
+PFN_vkGetDeviceGroupPresentCapabilitiesKHR vkGetDeviceGroupPresentCapabilitiesKHR;
+PFN_vkGetDeviceGroupSurfacePresentModesKHR vkGetDeviceGroupSurfacePresentModesKHR;
+PFN_vkGetPhysicalDevicePresentRectanglesKHR vkGetPhysicalDevicePresentRectanglesKHR;
+PFN_vkAcquireNextImage2KHR vkAcquireNextImage2KHR;
 PFN_vkGetPhysicalDeviceDisplayPropertiesKHR vkGetPhysicalDeviceDisplayPropertiesKHR;
 PFN_vkGetPhysicalDeviceDisplayPlanePropertiesKHR vkGetPhysicalDeviceDisplayPlanePropertiesKHR;
 PFN_vkGetDisplayPlaneSupportedDisplaysKHR vkGetDisplayPlaneSupportedDisplaysKHR;
@@ -408,20 +576,110 @@ PFN_vkCreateDisplayModeKHR vkCreateDisplayModeKHR;
 PFN_vkGetDisplayPlaneCapabilitiesKHR vkGetDisplayPlaneCapabilitiesKHR;
 PFN_vkCreateDisplayPlaneSurfaceKHR vkCreateDisplayPlaneSurfaceKHR;
 PFN_vkCreateSharedSwapchainsKHR vkCreateSharedSwapchainsKHR;
+PFN_vkGetPhysicalDeviceFeatures2KHR vkGetPhysicalDeviceFeatures2KHR;
+PFN_vkGetPhysicalDeviceProperties2KHR vkGetPhysicalDeviceProperties2KHR;
+PFN_vkGetPhysicalDeviceFormatProperties2KHR vkGetPhysicalDeviceFormatProperties2KHR;
+PFN_vkGetPhysicalDeviceImageFormatProperties2KHR vkGetPhysicalDeviceImageFormatProperties2KHR;
+PFN_vkGetPhysicalDeviceQueueFamilyProperties2KHR vkGetPhysicalDeviceQueueFamilyProperties2KHR;
+PFN_vkGetPhysicalDeviceMemoryProperties2KHR vkGetPhysicalDeviceMemoryProperties2KHR;
+PFN_vkGetPhysicalDeviceSparseImageFormatProperties2KHR vkGetPhysicalDeviceSparseImageFormatProperties2KHR;
+PFN_vkGetDeviceGroupPeerMemoryFeaturesKHR vkGetDeviceGroupPeerMemoryFeaturesKHR;
+PFN_vkCmdSetDeviceMaskKHR vkCmdSetDeviceMaskKHR;
+PFN_vkCmdDispatchBaseKHR vkCmdDispatchBaseKHR;
+PFN_vkTrimCommandPoolKHR vkTrimCommandPoolKHR;
+PFN_vkEnumeratePhysicalDeviceGroupsKHR vkEnumeratePhysicalDeviceGroupsKHR;
+PFN_vkGetPhysicalDeviceExternalBufferPropertiesKHR vkGetPhysicalDeviceExternalBufferPropertiesKHR;
+PFN_vkGetMemoryFdKHR vkGetMemoryFdKHR;
+PFN_vkGetMemoryFdPropertiesKHR vkGetMemoryFdPropertiesKHR;
+PFN_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR vkGetPhysicalDeviceExternalSemaphorePropertiesKHR;
+PFN_vkImportSemaphoreFdKHR vkImportSemaphoreFdKHR;
+PFN_vkGetSemaphoreFdKHR vkGetSemaphoreFdKHR;
+PFN_vkCmdPushDescriptorSetKHR vkCmdPushDescriptorSetKHR;
+PFN_vkCmdPushDescriptorSetWithTemplateKHR vkCmdPushDescriptorSetWithTemplateKHR;
+PFN_vkCreateDescriptorUpdateTemplateKHR vkCreateDescriptorUpdateTemplateKHR;
+PFN_vkDestroyDescriptorUpdateTemplateKHR vkDestroyDescriptorUpdateTemplateKHR;
+PFN_vkUpdateDescriptorSetWithTemplateKHR vkUpdateDescriptorSetWithTemplateKHR;
+PFN_vkGetSwapchainStatusKHR vkGetSwapchainStatusKHR;
+PFN_vkGetPhysicalDeviceExternalFencePropertiesKHR vkGetPhysicalDeviceExternalFencePropertiesKHR;
+PFN_vkImportFenceFdKHR vkImportFenceFdKHR;
+PFN_vkGetFenceFdKHR vkGetFenceFdKHR;
+PFN_vkGetPhysicalDeviceSurfaceCapabilities2KHR vkGetPhysicalDeviceSurfaceCapabilities2KHR;
+PFN_vkGetPhysicalDeviceSurfaceFormats2KHR vkGetPhysicalDeviceSurfaceFormats2KHR;
+PFN_vkGetImageMemoryRequirements2KHR vkGetImageMemoryRequirements2KHR;
+PFN_vkGetBufferMemoryRequirements2KHR vkGetBufferMemoryRequirements2KHR;
+PFN_vkGetImageSparseMemoryRequirements2KHR vkGetImageSparseMemoryRequirements2KHR;
+PFN_vkCreateSamplerYcbcrConversionKHR vkCreateSamplerYcbcrConversionKHR;
+PFN_vkDestroySamplerYcbcrConversionKHR vkDestroySamplerYcbcrConversionKHR;
+PFN_vkBindBufferMemory2KHR vkBindBufferMemory2KHR;
+PFN_vkBindImageMemory2KHR vkBindImageMemory2KHR;
+PFN_vkGetDescriptorSetLayoutSupportKHR vkGetDescriptorSetLayoutSupportKHR;
+PFN_vkCreateDebugReportCallbackEXT vkCreateDebugReportCallbackEXT;
+PFN_vkDestroyDebugReportCallbackEXT vkDestroyDebugReportCallbackEXT;
+PFN_vkDebugReportMessageEXT vkDebugReportMessageEXT;
+PFN_vkDebugMarkerSetObjectTagEXT vkDebugMarkerSetObjectTagEXT;
+PFN_vkDebugMarkerSetObjectNameEXT vkDebugMarkerSetObjectNameEXT;
+PFN_vkCmdDebugMarkerBeginEXT vkCmdDebugMarkerBeginEXT;
+PFN_vkCmdDebugMarkerEndEXT vkCmdDebugMarkerEndEXT;
+PFN_vkCmdDebugMarkerInsertEXT vkCmdDebugMarkerInsertEXT;
+PFN_vkCmdDrawIndirectCountAMD vkCmdDrawIndirectCountAMD;
+PFN_vkCmdDrawIndexedIndirectCountAMD vkCmdDrawIndexedIndirectCountAMD;
+PFN_vkGetShaderInfoAMD vkGetShaderInfoAMD;
+PFN_vkGetPhysicalDeviceExternalImageFormatPropertiesNV vkGetPhysicalDeviceExternalImageFormatPropertiesNV;
+PFN_vkCmdProcessCommandsNVX vkCmdProcessCommandsNVX;
+PFN_vkCmdReserveSpaceForCommandsNVX vkCmdReserveSpaceForCommandsNVX;
+PFN_vkCreateIndirectCommandsLayoutNVX vkCreateIndirectCommandsLayoutNVX;
+PFN_vkDestroyIndirectCommandsLayoutNVX vkDestroyIndirectCommandsLayoutNVX;
+PFN_vkCreateObjectTableNVX vkCreateObjectTableNVX;
+PFN_vkDestroyObjectTableNVX vkDestroyObjectTableNVX;
+PFN_vkRegisterObjectsNVX vkRegisterObjectsNVX;
+PFN_vkUnregisterObjectsNVX vkUnregisterObjectsNVX;
+PFN_vkGetPhysicalDeviceGeneratedCommandsPropertiesNVX vkGetPhysicalDeviceGeneratedCommandsPropertiesNVX;
+PFN_vkCmdSetViewportWScalingNV vkCmdSetViewportWScalingNV;
+PFN_vkReleaseDisplayEXT vkReleaseDisplayEXT;
+PFN_vkGetPhysicalDeviceSurfaceCapabilities2EXT vkGetPhysicalDeviceSurfaceCapabilities2EXT;
+PFN_vkDisplayPowerControlEXT vkDisplayPowerControlEXT;
+PFN_vkRegisterDeviceEventEXT vkRegisterDeviceEventEXT;
+PFN_vkRegisterDisplayEventEXT vkRegisterDisplayEventEXT;
+PFN_vkGetSwapchainCounterEXT vkGetSwapchainCounterEXT;
+PFN_vkGetRefreshCycleDurationGOOGLE vkGetRefreshCycleDurationGOOGLE;
+PFN_vkGetPastPresentationTimingGOOGLE vkGetPastPresentationTimingGOOGLE;
+PFN_vkCmdSetDiscardRectangleEXT vkCmdSetDiscardRectangleEXT;
+PFN_vkSetHdrMetadataEXT vkSetHdrMetadataEXT;
+PFN_vkSetDebugUtilsObjectNameEXT vkSetDebugUtilsObjectNameEXT;
+PFN_vkSetDebugUtilsObjectTagEXT vkSetDebugUtilsObjectTagEXT;
+PFN_vkQueueBeginDebugUtilsLabelEXT vkQueueBeginDebugUtilsLabelEXT;
+PFN_vkQueueEndDebugUtilsLabelEXT vkQueueEndDebugUtilsLabelEXT;
+PFN_vkQueueInsertDebugUtilsLabelEXT vkQueueInsertDebugUtilsLabelEXT;
+PFN_vkCmdBeginDebugUtilsLabelEXT vkCmdBeginDebugUtilsLabelEXT;
+PFN_vkCmdEndDebugUtilsLabelEXT vkCmdEndDebugUtilsLabelEXT;
+PFN_vkCmdInsertDebugUtilsLabelEXT vkCmdInsertDebugUtilsLabelEXT;
+PFN_vkCreateDebugUtilsMessengerEXT vkCreateDebugUtilsMessengerEXT;
+PFN_vkDestroyDebugUtilsMessengerEXT vkDestroyDebugUtilsMessengerEXT;
+PFN_vkSubmitDebugUtilsMessageEXT vkSubmitDebugUtilsMessageEXT;
+PFN_vkCmdSetSampleLocationsEXT vkCmdSetSampleLocationsEXT;
+PFN_vkGetPhysicalDeviceMultisamplePropertiesEXT vkGetPhysicalDeviceMultisamplePropertiesEXT;
+PFN_vkCreateValidationCacheEXT vkCreateValidationCacheEXT;
+PFN_vkDestroyValidationCacheEXT vkDestroyValidationCacheEXT;
+PFN_vkMergeValidationCachesEXT vkMergeValidationCachesEXT;
+PFN_vkGetValidationCacheDataEXT vkGetValidationCacheDataEXT;
+PFN_vkGetMemoryHostPointerPropertiesEXT vkGetMemoryHostPointerPropertiesEXT;
+PFN_vkCmdWriteBufferMarkerAMD vkCmdWriteBufferMarkerAMD;
 
-#ifdef VK_USE_PLATFORM_XLIB_KHR
-PFN_vkCreateXlibSurfaceKHR vkCreateXlibSurfaceKHR;
-PFN_vkGetPhysicalDeviceXlibPresentationSupportKHR vkGetPhysicalDeviceXlibPresentationSupportKHR;
+#ifdef VK_USE_PLATFORM_ANDROID_KHR
+PFN_vkCreateAndroidSurfaceKHR vkCreateAndroidSurfaceKHR;
 #endif
 
-#ifdef VK_USE_PLATFORM_XCB_KHR
-PFN_vkCreateXcbSurfaceKHR vkCreateXcbSurfaceKHR;
-PFN_vkGetPhysicalDeviceXcbPresentationSupportKHR vkGetPhysicalDeviceXcbPresentationSupportKHR;
+#ifdef VK_USE_PLATFORM_ANDROID_KHR
+PFN_vkGetAndroidHardwareBufferPropertiesANDROID vkGetAndroidHardwareBufferPropertiesANDROID;
+PFN_vkGetMemoryAndroidHardwareBufferANDROID vkGetMemoryAndroidHardwareBufferANDROID;
 #endif
 
-#ifdef VK_USE_PLATFORM_WAYLAND_KHR
-PFN_vkCreateWaylandSurfaceKHR vkCreateWaylandSurfaceKHR;
-PFN_vkGetPhysicalDeviceWaylandPresentationSupportKHR vkGetPhysicalDeviceWaylandPresentationSupportKHR;
+#ifdef VK_USE_PLATFORM_IOS_MVK
+PFN_vkCreateIOSSurfaceMVK vkCreateIOSSurfaceMVK;
+#endif
+
+#ifdef VK_USE_PLATFORM_MACOS_MVK
+PFN_vkCreateMacOSSurfaceMVK vkCreateMacOSSurfaceMVK;
 #endif
 
 #ifdef VK_USE_PLATFORM_MIR_KHR
@@ -429,17 +687,59 @@ PFN_vkCreateMirSurfaceKHR vkCreateMirSurfaceKHR;
 PFN_vkGetPhysicalDeviceMirPresentationSupportKHR vkGetPhysicalDeviceMirPresentationSupportKHR;
 #endif
 
-#ifdef VK_USE_PLATFORM_ANDROID_KHR
-PFN_vkCreateAndroidSurfaceKHR vkCreateAndroidSurfaceKHR;
+#ifdef VK_USE_PLATFORM_VI_NN
+PFN_vkCreateViSurfaceNN vkCreateViSurfaceNN;
+#endif
+
+#ifdef VK_USE_PLATFORM_WAYLAND_KHR
+PFN_vkCreateWaylandSurfaceKHR vkCreateWaylandSurfaceKHR;
+PFN_vkGetPhysicalDeviceWaylandPresentationSupportKHR vkGetPhysicalDeviceWaylandPresentationSupportKHR;
 #endif
 
 #ifdef VK_USE_PLATFORM_WIN32_KHR
 PFN_vkCreateWin32SurfaceKHR vkCreateWin32SurfaceKHR;
 PFN_vkGetPhysicalDeviceWin32PresentationSupportKHR vkGetPhysicalDeviceWin32PresentationSupportKHR;
 #endif
-PFN_vkCreateDebugReportCallbackEXT vkCreateDebugReportCallbackEXT;
-PFN_vkDestroyDebugReportCallbackEXT vkDestroyDebugReportCallbackEXT;
-PFN_vkDebugReportMessageEXT vkDebugReportMessageEXT;
+
+#ifdef VK_USE_PLATFORM_WIN32_KHR
+PFN_vkGetMemoryWin32HandleKHR vkGetMemoryWin32HandleKHR;
+PFN_vkGetMemoryWin32HandlePropertiesKHR vkGetMemoryWin32HandlePropertiesKHR;
+#endif
+
+#ifdef VK_USE_PLATFORM_WIN32_KHR
+#endif
+
+#ifdef VK_USE_PLATFORM_WIN32_KHR
+PFN_vkImportSemaphoreWin32HandleKHR vkImportSemaphoreWin32HandleKHR;
+PFN_vkGetSemaphoreWin32HandleKHR vkGetSemaphoreWin32HandleKHR;
+#endif
+
+#ifdef VK_USE_PLATFORM_WIN32_KHR
+PFN_vkImportFenceWin32HandleKHR vkImportFenceWin32HandleKHR;
+PFN_vkGetFenceWin32HandleKHR vkGetFenceWin32HandleKHR;
+#endif
+
+#ifdef VK_USE_PLATFORM_WIN32_KHR
+PFN_vkGetMemoryWin32HandleNV vkGetMemoryWin32HandleNV;
+#endif
+
+#ifdef VK_USE_PLATFORM_WIN32_KHR
+#endif
+
+#ifdef VK_USE_PLATFORM_XCB_KHR
+PFN_vkCreateXcbSurfaceKHR vkCreateXcbSurfaceKHR;
+PFN_vkGetPhysicalDeviceXcbPresentationSupportKHR vkGetPhysicalDeviceXcbPresentationSupportKHR;
+#endif
+
+#ifdef VK_USE_PLATFORM_XLIB_KHR
+PFN_vkCreateXlibSurfaceKHR vkCreateXlibSurfaceKHR;
+PFN_vkGetPhysicalDeviceXlibPresentationSupportKHR vkGetPhysicalDeviceXlibPresentationSupportKHR;
+#endif
+
+#ifdef VK_USE_PLATFORM_XLIB_XRANDR_EXT
+PFN_vkAcquireXlibDisplayEXT vkAcquireXlibDisplayEXT;
+PFN_vkGetRandROutputDisplayEXT vkGetRandROutputDisplayEXT;
+#endif
 
 #ifdef __cplusplus
 }
diff --git a/common/vulkan_wrapper.h b/common/vulkan_wrapper.h
index 3fa3ac36..93ec8a7a 100644
--- a/common/vulkan_wrapper.h
+++ b/common/vulkan_wrapper.h
@@ -29,12 +29,11 @@ extern "C" {
  */
 int InitVulkan(void);
 
-// VK_core
+// VK_core_0
 extern PFN_vkCreateInstance vkCreateInstance;
 extern PFN_vkDestroyInstance vkDestroyInstance;
 extern PFN_vkEnumeratePhysicalDevices vkEnumeratePhysicalDevices;
 extern PFN_vkGetPhysicalDeviceFeatures vkGetPhysicalDeviceFeatures;
-extern PFN_vkGetPhysicalDeviceFeatures2 vkGetPhysicalDeviceFeatures2;
 extern PFN_vkGetPhysicalDeviceFormatProperties vkGetPhysicalDeviceFormatProperties;
 extern PFN_vkGetPhysicalDeviceImageFormatProperties vkGetPhysicalDeviceImageFormatProperties;
 extern PFN_vkGetPhysicalDeviceProperties vkGetPhysicalDeviceProperties;
@@ -169,6 +168,36 @@ extern PFN_vkCmdNextSubpass vkCmdNextSubpass;
 extern PFN_vkCmdEndRenderPass vkCmdEndRenderPass;
 extern PFN_vkCmdExecuteCommands vkCmdExecuteCommands;
 
+// VK_core_1
+extern PFN_vkEnumerateInstanceVersion vkEnumerateInstanceVersion;
+extern PFN_vkBindBufferMemory2 vkBindBufferMemory2;
+extern PFN_vkBindImageMemory2 vkBindImageMemory2;
+extern PFN_vkGetDeviceGroupPeerMemoryFeatures vkGetDeviceGroupPeerMemoryFeatures;
+extern PFN_vkCmdSetDeviceMask vkCmdSetDeviceMask;
+extern PFN_vkCmdDispatchBase vkCmdDispatchBase;
+extern PFN_vkEnumeratePhysicalDeviceGroups vkEnumeratePhysicalDeviceGroups;
+extern PFN_vkGetImageMemoryRequirements2 vkGetImageMemoryRequirements2;
+extern PFN_vkGetBufferMemoryRequirements2 vkGetBufferMemoryRequirements2;
+extern PFN_vkGetImageSparseMemoryRequirements2 vkGetImageSparseMemoryRequirements2;
+extern PFN_vkGetPhysicalDeviceFeatures2 vkGetPhysicalDeviceFeatures2;
+extern PFN_vkGetPhysicalDeviceProperties2 vkGetPhysicalDeviceProperties2;
+extern PFN_vkGetPhysicalDeviceFormatProperties2 vkGetPhysicalDeviceFormatProperties2;
+extern PFN_vkGetPhysicalDeviceImageFormatProperties2 vkGetPhysicalDeviceImageFormatProperties2;
+extern PFN_vkGetPhysicalDeviceQueueFamilyProperties2 vkGetPhysicalDeviceQueueFamilyProperties2;
+extern PFN_vkGetPhysicalDeviceMemoryProperties2 vkGetPhysicalDeviceMemoryProperties2;
+extern PFN_vkGetPhysicalDeviceSparseImageFormatProperties2 vkGetPhysicalDeviceSparseImageFormatProperties2;
+extern PFN_vkTrimCommandPool vkTrimCommandPool;
+extern PFN_vkGetDeviceQueue2 vkGetDeviceQueue2;
+extern PFN_vkCreateSamplerYcbcrConversion vkCreateSamplerYcbcrConversion;
+extern PFN_vkDestroySamplerYcbcrConversion vkDestroySamplerYcbcrConversion;
+extern PFN_vkCreateDescriptorUpdateTemplate vkCreateDescriptorUpdateTemplate;
+extern PFN_vkDestroyDescriptorUpdateTemplate vkDestroyDescriptorUpdateTemplate;
+extern PFN_vkUpdateDescriptorSetWithTemplate vkUpdateDescriptorSetWithTemplate;
+extern PFN_vkGetPhysicalDeviceExternalBufferProperties vkGetPhysicalDeviceExternalBufferProperties;
+extern PFN_vkGetPhysicalDeviceExternalFenceProperties vkGetPhysicalDeviceExternalFenceProperties;
+extern PFN_vkGetPhysicalDeviceExternalSemaphoreProperties vkGetPhysicalDeviceExternalSemaphoreProperties;
+extern PFN_vkGetDescriptorSetLayoutSupport vkGetDescriptorSetLayoutSupport;
+
 // VK_KHR_surface
 extern PFN_vkDestroySurfaceKHR vkDestroySurfaceKHR;
 extern PFN_vkGetPhysicalDeviceSurfaceSupportKHR vkGetPhysicalDeviceSurfaceSupportKHR;
@@ -182,6 +211,10 @@ extern PFN_vkDestroySwapchainKHR vkDestroySwapchainKHR;
 extern PFN_vkGetSwapchainImagesKHR vkGetSwapchainImagesKHR;
 extern PFN_vkAcquireNextImageKHR vkAcquireNextImageKHR;
 extern PFN_vkQueuePresentKHR vkQueuePresentKHR;
+extern PFN_vkGetDeviceGroupPresentCapabilitiesKHR vkGetDeviceGroupPresentCapabilitiesKHR;
+extern PFN_vkGetDeviceGroupSurfacePresentModesKHR vkGetDeviceGroupSurfacePresentModesKHR;
+extern PFN_vkGetPhysicalDevicePresentRectanglesKHR vkGetPhysicalDevicePresentRectanglesKHR;
+extern PFN_vkAcquireNextImage2KHR vkAcquireNextImage2KHR;
 
 // VK_KHR_display
 extern PFN_vkGetPhysicalDeviceDisplayPropertiesKHR vkGetPhysicalDeviceDisplayPropertiesKHR;
@@ -195,22 +228,110 @@ extern PFN_vkCreateDisplayPlaneSurfaceKHR vkCreateDisplayPlaneSurfaceKHR;
 // VK_KHR_display_swapchain
 extern PFN_vkCreateSharedSwapchainsKHR vkCreateSharedSwapchainsKHR;
 
-#ifdef VK_USE_PLATFORM_XLIB_KHR
-// VK_KHR_xlib_surface
-extern PFN_vkCreateXlibSurfaceKHR vkCreateXlibSurfaceKHR;
-extern PFN_vkGetPhysicalDeviceXlibPresentationSupportKHR vkGetPhysicalDeviceXlibPresentationSupportKHR;
-#endif
+// VK_KHR_sampler_mirror_clamp_to_edge
 
-#ifdef VK_USE_PLATFORM_XCB_KHR
-// VK_KHR_xcb_surface
-extern PFN_vkCreateXcbSurfaceKHR vkCreateXcbSurfaceKHR;
-extern PFN_vkGetPhysicalDeviceXcbPresentationSupportKHR vkGetPhysicalDeviceXcbPresentationSupportKHR;
-#endif
+// VK_KHR_multiview
 
-#ifdef VK_USE_PLATFORM_WAYLAND_KHR
-// VK_KHR_wayland_surface
-extern PFN_vkCreateWaylandSurfaceKHR vkCreateWaylandSurfaceKHR;
-extern PFN_vkGetPhysicalDeviceWaylandPresentationSupportKHR vkGetPhysicalDeviceWaylandPresentationSupportKHR;
+// VK_KHR_get_physical_device_properties2
+extern PFN_vkGetPhysicalDeviceFeatures2KHR vkGetPhysicalDeviceFeatures2KHR;
+extern PFN_vkGetPhysicalDeviceProperties2KHR vkGetPhysicalDeviceProperties2KHR;
+extern PFN_vkGetPhysicalDeviceFormatProperties2KHR vkGetPhysicalDeviceFormatProperties2KHR;
+extern PFN_vkGetPhysicalDeviceImageFormatProperties2KHR vkGetPhysicalDeviceImageFormatProperties2KHR;
+extern PFN_vkGetPhysicalDeviceQueueFamilyProperties2KHR vkGetPhysicalDeviceQueueFamilyProperties2KHR;
+extern PFN_vkGetPhysicalDeviceMemoryProperties2KHR vkGetPhysicalDeviceMemoryProperties2KHR;
+extern PFN_vkGetPhysicalDeviceSparseImageFormatProperties2KHR vkGetPhysicalDeviceSparseImageFormatProperties2KHR;
+
+// VK_KHR_device_group
+extern PFN_vkGetDeviceGroupPeerMemoryFeaturesKHR vkGetDeviceGroupPeerMemoryFeaturesKHR;
+extern PFN_vkCmdSetDeviceMaskKHR vkCmdSetDeviceMaskKHR;
+extern PFN_vkCmdDispatchBaseKHR vkCmdDispatchBaseKHR;
+
+// VK_KHR_shader_draw_parameters
+
+// VK_KHR_maintenance1
+extern PFN_vkTrimCommandPoolKHR vkTrimCommandPoolKHR;
+
+// VK_KHR_device_group_creation
+extern PFN_vkEnumeratePhysicalDeviceGroupsKHR vkEnumeratePhysicalDeviceGroupsKHR;
+
+// VK_KHR_external_memory_capabilities
+extern PFN_vkGetPhysicalDeviceExternalBufferPropertiesKHR vkGetPhysicalDeviceExternalBufferPropertiesKHR;
+
+// VK_KHR_external_memory
+
+// VK_KHR_external_memory_fd
+extern PFN_vkGetMemoryFdKHR vkGetMemoryFdKHR;
+extern PFN_vkGetMemoryFdPropertiesKHR vkGetMemoryFdPropertiesKHR;
+
+// VK_KHR_external_semaphore_capabilities
+extern PFN_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR vkGetPhysicalDeviceExternalSemaphorePropertiesKHR;
+
+// VK_KHR_external_semaphore
+
+// VK_KHR_external_semaphore_fd
+extern PFN_vkImportSemaphoreFdKHR vkImportSemaphoreFdKHR;
+extern PFN_vkGetSemaphoreFdKHR vkGetSemaphoreFdKHR;
+
+// VK_KHR_push_descriptor
+extern PFN_vkCmdPushDescriptorSetKHR vkCmdPushDescriptorSetKHR;
+extern PFN_vkCmdPushDescriptorSetWithTemplateKHR vkCmdPushDescriptorSetWithTemplateKHR;
+
+// VK_KHR_16bit_storage
+
+// VK_KHR_incremental_present
+
+// VK_KHR_descriptor_update_template
+extern PFN_vkCreateDescriptorUpdateTemplateKHR vkCreateDescriptorUpdateTemplateKHR;
+extern PFN_vkDestroyDescriptorUpdateTemplateKHR vkDestroyDescriptorUpdateTemplateKHR;
+extern PFN_vkUpdateDescriptorSetWithTemplateKHR vkUpdateDescriptorSetWithTemplateKHR;
+
+// VK_KHR_shared_presentable_image
+extern PFN_vkGetSwapchainStatusKHR vkGetSwapchainStatusKHR;
+
+// VK_KHR_external_fence_capabilities
+extern PFN_vkGetPhysicalDeviceExternalFencePropertiesKHR vkGetPhysicalDeviceExternalFencePropertiesKHR;
+
+// VK_KHR_external_fence
+
+// VK_KHR_external_fence_fd
+extern PFN_vkImportFenceFdKHR vkImportFenceFdKHR;
+extern PFN_vkGetFenceFdKHR vkGetFenceFdKHR;
+
+// VK_KHR_maintenance2
+
+// VK_KHR_get_surface_capabilities2
+extern PFN_vkGetPhysicalDeviceSurfaceCapabilities2KHR vkGetPhysicalDeviceSurfaceCapabilities2KHR;
+extern PFN_vkGetPhysicalDeviceSurfaceFormats2KHR vkGetPhysicalDeviceSurfaceFormats2KHR;
+
+// VK_KHR_variable_pointers
+
+// VK_KHR_dedicated_allocation
+
+// VK_KHR_storage_buffer_storage_class
+
+// VK_KHR_relaxed_block_layout
+
+// VK_KHR_get_memory_requirements2
+extern PFN_vkGetImageMemoryRequirements2KHR vkGetImageMemoryRequirements2KHR;
+extern PFN_vkGetBufferMemoryRequirements2KHR vkGetBufferMemoryRequirements2KHR;
+extern PFN_vkGetImageSparseMemoryRequirements2KHR vkGetImageSparseMemoryRequirements2KHR;
+
+// VK_KHR_image_format_list
+
+// VK_KHR_sampler_ycbcr_conversion
+extern PFN_vkCreateSamplerYcbcrConversionKHR vkCreateSamplerYcbcrConversionKHR;
+extern PFN_vkDestroySamplerYcbcrConversionKHR vkDestroySamplerYcbcrConversionKHR;
+
+// VK_KHR_bind_memory2
+extern PFN_vkBindBufferMemory2KHR vkBindBufferMemory2KHR;
+extern PFN_vkBindImageMemory2KHR vkBindImageMemory2KHR;
+
+// VK_KHR_maintenance3
+extern PFN_vkGetDescriptorSetLayoutSupportKHR vkGetDescriptorSetLayoutSupportKHR;
+
+#ifdef VK_USE_PLATFORM_ANDROID_KHR
+// VK_KHR_android_surface
+extern PFN_vkCreateAndroidSurfaceKHR vkCreateAndroidSurfaceKHR;
 #endif
 
 #ifdef VK_USE_PLATFORM_MIR_KHR
@@ -219,9 +340,10 @@ extern PFN_vkCreateMirSurfaceKHR vkCreateMirSurfaceKHR;
 extern PFN_vkGetPhysicalDeviceMirPresentationSupportKHR vkGetPhysicalDeviceMirPresentationSupportKHR;
 #endif
 
-#ifdef VK_USE_PLATFORM_ANDROID_KHR
-// VK_KHR_android_surface
-extern PFN_vkCreateAndroidSurfaceKHR vkCreateAndroidSurfaceKHR;
+#ifdef VK_USE_PLATFORM_WAYLAND_KHR
+// VK_KHR_wayland_surface
+extern PFN_vkCreateWaylandSurfaceKHR vkCreateWaylandSurfaceKHR;
+extern PFN_vkGetPhysicalDeviceWaylandPresentationSupportKHR vkGetPhysicalDeviceWaylandPresentationSupportKHR;
 #endif
 
 #ifdef VK_USE_PLATFORM_WIN32_KHR
@@ -230,7 +352,39 @@ extern PFN_vkCreateWin32SurfaceKHR vkCreateWin32SurfaceKHR;
 extern PFN_vkGetPhysicalDeviceWin32PresentationSupportKHR vkGetPhysicalDeviceWin32PresentationSupportKHR;
 #endif
 
-// VK_KHR_sampler_mirror_clamp_to_edge
+#ifdef VK_USE_PLATFORM_WIN32_KHR
+// VK_KHR_external_memory_win32
+extern PFN_vkGetMemoryWin32HandleKHR vkGetMemoryWin32HandleKHR;
+extern PFN_vkGetMemoryWin32HandlePropertiesKHR vkGetMemoryWin32HandlePropertiesKHR;
+#endif
+
+#ifdef VK_USE_PLATFORM_WIN32_KHR
+// VK_KHR_win32_keyed_mutex
+#endif
+
+#ifdef VK_USE_PLATFORM_WIN32_KHR
+// VK_KHR_external_semaphore_win32
+extern PFN_vkImportSemaphoreWin32HandleKHR vkImportSemaphoreWin32HandleKHR;
+extern PFN_vkGetSemaphoreWin32HandleKHR vkGetSemaphoreWin32HandleKHR;
+#endif
+
+#ifdef VK_USE_PLATFORM_WIN32_KHR
+// VK_KHR_external_fence_win32
+extern PFN_vkImportFenceWin32HandleKHR vkImportFenceWin32HandleKHR;
+extern PFN_vkGetFenceWin32HandleKHR vkGetFenceWin32HandleKHR;
+#endif
+
+#ifdef VK_USE_PLATFORM_XCB_KHR
+// VK_KHR_xcb_surface
+extern PFN_vkCreateXcbSurfaceKHR vkCreateXcbSurfaceKHR;
+extern PFN_vkGetPhysicalDeviceXcbPresentationSupportKHR vkGetPhysicalDeviceXcbPresentationSupportKHR;
+#endif
+
+#ifdef VK_USE_PLATFORM_XLIB_KHR
+// VK_KHR_xlib_surface
+extern PFN_vkCreateXlibSurfaceKHR vkCreateXlibSurfaceKHR;
+extern PFN_vkGetPhysicalDeviceXlibPresentationSupportKHR vkGetPhysicalDeviceXlibPresentationSupportKHR;
+#endif
 
 #ifdef __cplusplus
 }
diff --git a/scripts/generate_vulkan_wrapper.py b/scripts/generate_vulkan_wrapper.py
new file mode 100755
index 00000000..0bbbab06
--- /dev/null
+++ b/scripts/generate_vulkan_wrapper.py
@@ -0,0 +1,1076 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2018 Google, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+
+"""Generate Vulkan wrapper to support Android without libvulkan
+"""
+
+import os
+import sys
+
+class Command(object):
+    PLATFORM = 0
+    LOADER = 1
+    INSTANCE = 2
+    DEVICE = 3
+
+    def __init__(self, name, dispatch):
+        self.name = name
+        self.dispatch = dispatch
+        self.ty = self._get_type()
+
+    @staticmethod
+    def valid_c_typedef(c):
+        return (c.startswith("typedef") and
+                c.endswith(");") and
+                "*PFN_vkVoidFunction" not in c)
+
+    @classmethod
+    def from_c_typedef(cls, c):
+        name_begin = c.find("*PFN_vk") + 5 # instead of 7 to restore vk
+        name_end = c.find(")(", name_begin)
+        name = c[name_begin:name_end]
+
+        dispatch_begin = name_end + 2
+        dispatch_end = c.find(" ", dispatch_begin)
+        dispatch = c[dispatch_begin:dispatch_end]
+        if not dispatch.startswith("Vk"):
+            dispatch = None
+
+        return cls(name, dispatch)
+
+    def _get_type(self):
+        if self.dispatch:
+            if self.dispatch in ["VkDevice", "VkQueue", "VkCommandBuffer"]:
+                return self.DEVICE
+            else:
+                return self.INSTANCE
+        else:
+            if self.name in ["GetInstanceProcAddr"]:
+                return self.PLATFORM
+            else:
+                return self.LOADER
+
+    def __repr__(self):
+        return "Command(name=%s, dispatch=%s)" % \
+                (repr(self.name), repr(self.dispatch))
+
+class Extension(object):
+    def __init__(self, name, version, guard=None, commands=[]):
+        self.name = name
+        self.version = version
+        self.guard = guard
+        self.commands = commands[:]
+
+    def add_command(self, cmd):
+        self.commands.append(cmd)
+
+    def __repr__(self):
+        lines = []
+        lines.append("Extension(name=%s, version=%s, guard=%s, commands=[" %
+                (repr(self.name), repr(self.version), repr(self.guard)))
+
+        for cmd in self.commands:
+            lines.append("    %s," % repr(cmd))
+
+        lines.append("])")
+
+        return "\n".join(lines)
+
+# generated by "generate_vulkan_wrapper.py parse vulkan.h"
+VK_core_0 = Extension(name='VK_core_0', version=0, guard=None, commands=[
+    Command(name='vkCreateInstance', dispatch=None),
+    Command(name='vkDestroyInstance', dispatch='VkInstance'),
+    Command(name='vkEnumeratePhysicalDevices', dispatch='VkInstance'),
+    Command(name='vkGetPhysicalDeviceFeatures', dispatch='VkPhysicalDevice'),
+    Command(name='vkGetPhysicalDeviceFormatProperties', dispatch='VkPhysicalDevice'),
+    Command(name='vkGetPhysicalDeviceImageFormatProperties', dispatch='VkPhysicalDevice'),
+    Command(name='vkGetPhysicalDeviceProperties', dispatch='VkPhysicalDevice'),
+    Command(name='vkGetPhysicalDeviceQueueFamilyProperties', dispatch='VkPhysicalDevice'),
+    Command(name='vkGetPhysicalDeviceMemoryProperties', dispatch='VkPhysicalDevice'),
+    Command(name='vkGetInstanceProcAddr', dispatch='VkInstance'),
+    Command(name='vkGetDeviceProcAddr', dispatch='VkDevice'),
+    Command(name='vkCreateDevice', dispatch='VkPhysicalDevice'),
+    Command(name='vkDestroyDevice', dispatch='VkDevice'),
+    Command(name='vkEnumerateInstanceExtensionProperties', dispatch=None),
+    Command(name='vkEnumerateDeviceExtensionProperties', dispatch='VkPhysicalDevice'),
+    Command(name='vkEnumerateInstanceLayerProperties', dispatch=None),
+    Command(name='vkEnumerateDeviceLayerProperties', dispatch='VkPhysicalDevice'),
+    Command(name='vkGetDeviceQueue', dispatch='VkDevice'),
+    Command(name='vkQueueSubmit', dispatch='VkQueue'),
+    Command(name='vkQueueWaitIdle', dispatch='VkQueue'),
+    Command(name='vkDeviceWaitIdle', dispatch='VkDevice'),
+    Command(name='vkAllocateMemory', dispatch='VkDevice'),
+    Command(name='vkFreeMemory', dispatch='VkDevice'),
+    Command(name='vkMapMemory', dispatch='VkDevice'),
+    Command(name='vkUnmapMemory', dispatch='VkDevice'),
+    Command(name='vkFlushMappedMemoryRanges', dispatch='VkDevice'),
+    Command(name='vkInvalidateMappedMemoryRanges', dispatch='VkDevice'),
+    Command(name='vkGetDeviceMemoryCommitment', dispatch='VkDevice'),
+    Command(name='vkBindBufferMemory', dispatch='VkDevice'),
+    Command(name='vkBindImageMemory', dispatch='VkDevice'),
+    Command(name='vkGetBufferMemoryRequirements', dispatch='VkDevice'),
+    Command(name='vkGetImageMemoryRequirements', dispatch='VkDevice'),
+    Command(name='vkGetImageSparseMemoryRequirements', dispatch='VkDevice'),
+    Command(name='vkGetPhysicalDeviceSparseImageFormatProperties', dispatch='VkPhysicalDevice'),
+    Command(name='vkQueueBindSparse', dispatch='VkQueue'),
+    Command(name='vkCreateFence', dispatch='VkDevice'),
+    Command(name='vkDestroyFence', dispatch='VkDevice'),
+    Command(name='vkResetFences', dispatch='VkDevice'),
+    Command(name='vkGetFenceStatus', dispatch='VkDevice'),
+    Command(name='vkWaitForFences', dispatch='VkDevice'),
+    Command(name='vkCreateSemaphore', dispatch='VkDevice'),
+    Command(name='vkDestroySemaphore', dispatch='VkDevice'),
+    Command(name='vkCreateEvent', dispatch='VkDevice'),
+    Command(name='vkDestroyEvent', dispatch='VkDevice'),
+    Command(name='vkGetEventStatus', dispatch='VkDevice'),
+    Command(name='vkSetEvent', dispatch='VkDevice'),
+    Command(name='vkResetEvent', dispatch='VkDevice'),
+    Command(name='vkCreateQueryPool', dispatch='VkDevice'),
+    Command(name='vkDestroyQueryPool', dispatch='VkDevice'),
+    Command(name='vkGetQueryPoolResults', dispatch='VkDevice'),
+    Command(name='vkCreateBuffer', dispatch='VkDevice'),
+    Command(name='vkDestroyBuffer', dispatch='VkDevice'),
+    Command(name='vkCreateBufferView', dispatch='VkDevice'),
+    Command(name='vkDestroyBufferView', dispatch='VkDevice'),
+    Command(name='vkCreateImage', dispatch='VkDevice'),
+    Command(name='vkDestroyImage', dispatch='VkDevice'),
+    Command(name='vkGetImageSubresourceLayout', dispatch='VkDevice'),
+    Command(name='vkCreateImageView', dispatch='VkDevice'),
+    Command(name='vkDestroyImageView', dispatch='VkDevice'),
+    Command(name='vkCreateShaderModule', dispatch='VkDevice'),
+    Command(name='vkDestroyShaderModule', dispatch='VkDevice'),
+    Command(name='vkCreatePipelineCache', dispatch='VkDevice'),
+    Command(name='vkDestroyPipelineCache', dispatch='VkDevice'),
+    Command(name='vkGetPipelineCacheData', dispatch='VkDevice'),
+    Command(name='vkMergePipelineCaches', dispatch='VkDevice'),
+    Command(name='vkCreateGraphicsPipelines', dispatch='VkDevice'),
+    Command(name='vkCreateComputePipelines', dispatch='VkDevice'),
+    Command(name='vkDestroyPipeline', dispatch='VkDevice'),
+    Command(name='vkCreatePipelineLayout', dispatch='VkDevice'),
+    Command(name='vkDestroyPipelineLayout', dispatch='VkDevice'),
+    Command(name='vkCreateSampler', dispatch='VkDevice'),
+    Command(name='vkDestroySampler', dispatch='VkDevice'),
+    Command(name='vkCreateDescriptorSetLayout', dispatch='VkDevice'),
+    Command(name='vkDestroyDescriptorSetLayout', dispatch='VkDevice'),
+    Command(name='vkCreateDescriptorPool', dispatch='VkDevice'),
+    Command(name='vkDestroyDescriptorPool', dispatch='VkDevice'),
+    Command(name='vkResetDescriptorPool', dispatch='VkDevice'),
+    Command(name='vkAllocateDescriptorSets', dispatch='VkDevice'),
+    Command(name='vkFreeDescriptorSets', dispatch='VkDevice'),
+    Command(name='vkUpdateDescriptorSets', dispatch='VkDevice'),
+    Command(name='vkCreateFramebuffer', dispatch='VkDevice'),
+    Command(name='vkDestroyFramebuffer', dispatch='VkDevice'),
+    Command(name='vkCreateRenderPass', dispatch='VkDevice'),
+    Command(name='vkDestroyRenderPass', dispatch='VkDevice'),
+    Command(name='vkGetRenderAreaGranularity', dispatch='VkDevice'),
+    Command(name='vkCreateCommandPool', dispatch='VkDevice'),
+    Command(name='vkDestroyCommandPool', dispatch='VkDevice'),
+    Command(name='vkResetCommandPool', dispatch='VkDevice'),
+    Command(name='vkAllocateCommandBuffers', dispatch='VkDevice'),
+    Command(name='vkFreeCommandBuffers', dispatch='VkDevice'),
+    Command(name='vkBeginCommandBuffer', dispatch='VkCommandBuffer'),
+    Command(name='vkEndCommandBuffer', dispatch='VkCommandBuffer'),
+    Command(name='vkResetCommandBuffer', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdBindPipeline', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdSetViewport', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdSetScissor', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdSetLineWidth', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdSetDepthBias', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdSetBlendConstants', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdSetDepthBounds', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdSetStencilCompareMask', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdSetStencilWriteMask', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdSetStencilReference', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdBindDescriptorSets', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdBindIndexBuffer', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdBindVertexBuffers', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdDraw', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdDrawIndexed', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdDrawIndirect', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdDrawIndexedIndirect', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdDispatch', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdDispatchIndirect', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdCopyBuffer', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdCopyImage', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdBlitImage', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdCopyBufferToImage', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdCopyImageToBuffer', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdUpdateBuffer', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdFillBuffer', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdClearColorImage', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdClearDepthStencilImage', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdClearAttachments', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdResolveImage', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdSetEvent', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdResetEvent', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdWaitEvents', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdPipelineBarrier', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdBeginQuery', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdEndQuery', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdResetQueryPool', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdWriteTimestamp', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdCopyQueryPoolResults', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdPushConstants', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdBeginRenderPass', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdNextSubpass', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdEndRenderPass', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdExecuteCommands', dispatch='VkCommandBuffer'),
+])
+
+VK_core_1 = Extension(name='VK_core_1', version=1, guard=None, commands=[
+    Command(name='vkEnumerateInstanceVersion', dispatch=None),
+    Command(name='vkBindBufferMemory2', dispatch='VkDevice'),
+    Command(name='vkBindImageMemory2', dispatch='VkDevice'),
+    Command(name='vkGetDeviceGroupPeerMemoryFeatures', dispatch='VkDevice'),
+    Command(name='vkCmdSetDeviceMask', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdDispatchBase', dispatch='VkCommandBuffer'),
+    Command(name='vkEnumeratePhysicalDeviceGroups', dispatch='VkInstance'),
+    Command(name='vkGetImageMemoryRequirements2', dispatch='VkDevice'),
+    Command(name='vkGetBufferMemoryRequirements2', dispatch='VkDevice'),
+    Command(name='vkGetImageSparseMemoryRequirements2', dispatch='VkDevice'),
+    Command(name='vkGetPhysicalDeviceFeatures2', dispatch='VkPhysicalDevice'),
+    Command(name='vkGetPhysicalDeviceProperties2', dispatch='VkPhysicalDevice'),
+    Command(name='vkGetPhysicalDeviceFormatProperties2', dispatch='VkPhysicalDevice'),
+    Command(name='vkGetPhysicalDeviceImageFormatProperties2', dispatch='VkPhysicalDevice'),
+    Command(name='vkGetPhysicalDeviceQueueFamilyProperties2', dispatch='VkPhysicalDevice'),
+    Command(name='vkGetPhysicalDeviceMemoryProperties2', dispatch='VkPhysicalDevice'),
+    Command(name='vkGetPhysicalDeviceSparseImageFormatProperties2', dispatch='VkPhysicalDevice'),
+    Command(name='vkTrimCommandPool', dispatch='VkDevice'),
+    Command(name='vkGetDeviceQueue2', dispatch='VkDevice'),
+    Command(name='vkCreateSamplerYcbcrConversion', dispatch='VkDevice'),
+    Command(name='vkDestroySamplerYcbcrConversion', dispatch='VkDevice'),
+    Command(name='vkCreateDescriptorUpdateTemplate', dispatch='VkDevice'),
+    Command(name='vkDestroyDescriptorUpdateTemplate', dispatch='VkDevice'),
+    Command(name='vkUpdateDescriptorSetWithTemplate', dispatch='VkDevice'),
+    Command(name='vkGetPhysicalDeviceExternalBufferProperties', dispatch='VkPhysicalDevice'),
+    Command(name='vkGetPhysicalDeviceExternalFenceProperties', dispatch='VkPhysicalDevice'),
+    Command(name='vkGetPhysicalDeviceExternalSemaphoreProperties', dispatch='VkPhysicalDevice'),
+    Command(name='vkGetDescriptorSetLayoutSupport', dispatch='VkDevice'),
+])
+
+VK_KHR_surface = Extension(name='VK_KHR_surface', version=25, guard=None, commands=[
+    Command(name='vkDestroySurfaceKHR', dispatch='VkInstance'),
+    Command(name='vkGetPhysicalDeviceSurfaceSupportKHR', dispatch='VkPhysicalDevice'),
+    Command(name='vkGetPhysicalDeviceSurfaceCapabilitiesKHR', dispatch='VkPhysicalDevice'),
+    Command(name='vkGetPhysicalDeviceSurfaceFormatsKHR', dispatch='VkPhysicalDevice'),
+    Command(name='vkGetPhysicalDeviceSurfacePresentModesKHR', dispatch='VkPhysicalDevice'),
+])
+
+VK_KHR_swapchain = Extension(name='VK_KHR_swapchain', version=70, guard=None, commands=[
+    Command(name='vkCreateSwapchainKHR', dispatch='VkDevice'),
+    Command(name='vkDestroySwapchainKHR', dispatch='VkDevice'),
+    Command(name='vkGetSwapchainImagesKHR', dispatch='VkDevice'),
+    Command(name='vkAcquireNextImageKHR', dispatch='VkDevice'),
+    Command(name='vkQueuePresentKHR', dispatch='VkQueue'),
+    Command(name='vkGetDeviceGroupPresentCapabilitiesKHR', dispatch='VkDevice'),
+    Command(name='vkGetDeviceGroupSurfacePresentModesKHR', dispatch='VkDevice'),
+    Command(name='vkGetPhysicalDevicePresentRectanglesKHR', dispatch='VkPhysicalDevice'),
+    Command(name='vkAcquireNextImage2KHR', dispatch='VkDevice'),
+])
+
+VK_KHR_display = Extension(name='VK_KHR_display', version=21, guard=None, commands=[
+    Command(name='vkGetPhysicalDeviceDisplayPropertiesKHR', dispatch='VkPhysicalDevice'),
+    Command(name='vkGetPhysicalDeviceDisplayPlanePropertiesKHR', dispatch='VkPhysicalDevice'),
+    Command(name='vkGetDisplayPlaneSupportedDisplaysKHR', dispatch='VkPhysicalDevice'),
+    Command(name='vkGetDisplayModePropertiesKHR', dispatch='VkPhysicalDevice'),
+    Command(name='vkCreateDisplayModeKHR', dispatch='VkPhysicalDevice'),
+    Command(name='vkGetDisplayPlaneCapabilitiesKHR', dispatch='VkPhysicalDevice'),
+    Command(name='vkCreateDisplayPlaneSurfaceKHR', dispatch='VkInstance'),
+])
+
+VK_KHR_display_swapchain = Extension(name='VK_KHR_display_swapchain', version=9, guard=None, commands=[
+    Command(name='vkCreateSharedSwapchainsKHR', dispatch='VkDevice'),
+])
+
+VK_KHR_sampler_mirror_clamp_to_edge = Extension(name='VK_KHR_sampler_mirror_clamp_to_edge', version=1, guard=None, commands=[
+])
+
+VK_KHR_multiview = Extension(name='VK_KHR_multiview', version=1, guard=None, commands=[
+])
+
+VK_KHR_get_physical_device_properties2 = Extension(name='VK_KHR_get_physical_device_properties2', version=1, guard=None, commands=[
+    Command(name='vkGetPhysicalDeviceFeatures2KHR', dispatch='VkPhysicalDevice'),
+    Command(name='vkGetPhysicalDeviceProperties2KHR', dispatch='VkPhysicalDevice'),
+    Command(name='vkGetPhysicalDeviceFormatProperties2KHR', dispatch='VkPhysicalDevice'),
+    Command(name='vkGetPhysicalDeviceImageFormatProperties2KHR', dispatch='VkPhysicalDevice'),
+    Command(name='vkGetPhysicalDeviceQueueFamilyProperties2KHR', dispatch='VkPhysicalDevice'),
+    Command(name='vkGetPhysicalDeviceMemoryProperties2KHR', dispatch='VkPhysicalDevice'),
+    Command(name='vkGetPhysicalDeviceSparseImageFormatProperties2KHR', dispatch='VkPhysicalDevice'),
+])
+
+VK_KHR_device_group = Extension(name='VK_KHR_device_group', version=3, guard=None, commands=[
+    Command(name='vkGetDeviceGroupPeerMemoryFeaturesKHR', dispatch='VkDevice'),
+    Command(name='vkCmdSetDeviceMaskKHR', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdDispatchBaseKHR', dispatch='VkCommandBuffer'),
+])
+
+VK_KHR_shader_draw_parameters = Extension(name='VK_KHR_shader_draw_parameters', version=1, guard=None, commands=[
+])
+
+VK_KHR_maintenance1 = Extension(name='VK_KHR_maintenance1', version=2, guard=None, commands=[
+    Command(name='vkTrimCommandPoolKHR', dispatch='VkDevice'),
+])
+
+VK_KHR_device_group_creation = Extension(name='VK_KHR_device_group_creation', version=1, guard=None, commands=[
+    Command(name='vkEnumeratePhysicalDeviceGroupsKHR', dispatch='VkInstance'),
+])
+
+VK_KHR_external_memory_capabilities = Extension(name='VK_KHR_external_memory_capabilities', version=1, guard=None, commands=[
+    Command(name='vkGetPhysicalDeviceExternalBufferPropertiesKHR', dispatch='VkPhysicalDevice'),
+])
+
+VK_KHR_external_memory = Extension(name='VK_KHR_external_memory', version=1, guard=None, commands=[
+])
+
+VK_KHR_external_memory_fd = Extension(name='VK_KHR_external_memory_fd', version=1, guard=None, commands=[
+    Command(name='vkGetMemoryFdKHR', dispatch='VkDevice'),
+    Command(name='vkGetMemoryFdPropertiesKHR', dispatch='VkDevice'),
+])
+
+VK_KHR_external_semaphore_capabilities = Extension(name='VK_KHR_external_semaphore_capabilities', version=1, guard=None, commands=[
+    Command(name='vkGetPhysicalDeviceExternalSemaphorePropertiesKHR', dispatch='VkPhysicalDevice'),
+])
+
+VK_KHR_external_semaphore = Extension(name='VK_KHR_external_semaphore', version=1, guard=None, commands=[
+])
+
+VK_KHR_external_semaphore_fd = Extension(name='VK_KHR_external_semaphore_fd', version=1, guard=None, commands=[
+    Command(name='vkImportSemaphoreFdKHR', dispatch='VkDevice'),
+    Command(name='vkGetSemaphoreFdKHR', dispatch='VkDevice'),
+])
+
+VK_KHR_push_descriptor = Extension(name='VK_KHR_push_descriptor', version=2, guard=None, commands=[
+    Command(name='vkCmdPushDescriptorSetKHR', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdPushDescriptorSetWithTemplateKHR', dispatch='VkCommandBuffer'),
+])
+
+VK_KHR_16bit_storage = Extension(name='VK_KHR_16bit_storage', version=1, guard=None, commands=[
+])
+
+VK_KHR_incremental_present = Extension(name='VK_KHR_incremental_present', version=1, guard=None, commands=[
+])
+
+VK_KHR_descriptor_update_template = Extension(name='VK_KHR_descriptor_update_template', version=1, guard=None, commands=[
+    Command(name='vkCreateDescriptorUpdateTemplateKHR', dispatch='VkDevice'),
+    Command(name='vkDestroyDescriptorUpdateTemplateKHR', dispatch='VkDevice'),
+    Command(name='vkUpdateDescriptorSetWithTemplateKHR', dispatch='VkDevice'),
+])
+
+VK_KHR_shared_presentable_image = Extension(name='VK_KHR_shared_presentable_image', version=1, guard=None, commands=[
+    Command(name='vkGetSwapchainStatusKHR', dispatch='VkDevice'),
+])
+
+VK_KHR_external_fence_capabilities = Extension(name='VK_KHR_external_fence_capabilities', version=1, guard=None, commands=[
+    Command(name='vkGetPhysicalDeviceExternalFencePropertiesKHR', dispatch='VkPhysicalDevice'),
+])
+
+VK_KHR_external_fence = Extension(name='VK_KHR_external_fence', version=1, guard=None, commands=[
+])
+
+VK_KHR_external_fence_fd = Extension(name='VK_KHR_external_fence_fd', version=1, guard=None, commands=[
+    Command(name='vkImportFenceFdKHR', dispatch='VkDevice'),
+    Command(name='vkGetFenceFdKHR', dispatch='VkDevice'),
+])
+
+VK_KHR_maintenance2 = Extension(name='VK_KHR_maintenance2', version=1, guard=None, commands=[
+])
+
+VK_KHR_get_surface_capabilities2 = Extension(name='VK_KHR_get_surface_capabilities2', version=1, guard=None, commands=[
+    Command(name='vkGetPhysicalDeviceSurfaceCapabilities2KHR', dispatch='VkPhysicalDevice'),
+    Command(name='vkGetPhysicalDeviceSurfaceFormats2KHR', dispatch='VkPhysicalDevice'),
+])
+
+VK_KHR_variable_pointers = Extension(name='VK_KHR_variable_pointers', version=1, guard=None, commands=[
+])
+
+VK_KHR_dedicated_allocation = Extension(name='VK_KHR_dedicated_allocation', version=3, guard=None, commands=[
+])
+
+VK_KHR_storage_buffer_storage_class = Extension(name='VK_KHR_storage_buffer_storage_class', version=1, guard=None, commands=[
+])
+
+VK_KHR_relaxed_block_layout = Extension(name='VK_KHR_relaxed_block_layout', version=1, guard=None, commands=[
+])
+
+VK_KHR_get_memory_requirements2 = Extension(name='VK_KHR_get_memory_requirements2', version=1, guard=None, commands=[
+    Command(name='vkGetImageMemoryRequirements2KHR', dispatch='VkDevice'),
+    Command(name='vkGetBufferMemoryRequirements2KHR', dispatch='VkDevice'),
+    Command(name='vkGetImageSparseMemoryRequirements2KHR', dispatch='VkDevice'),
+])
+
+VK_KHR_image_format_list = Extension(name='VK_KHR_image_format_list', version=1, guard=None, commands=[
+])
+
+VK_KHR_sampler_ycbcr_conversion = Extension(name='VK_KHR_sampler_ycbcr_conversion', version=1, guard=None, commands=[
+    Command(name='vkCreateSamplerYcbcrConversionKHR', dispatch='VkDevice'),
+    Command(name='vkDestroySamplerYcbcrConversionKHR', dispatch='VkDevice'),
+])
+
+VK_KHR_bind_memory2 = Extension(name='VK_KHR_bind_memory2', version=1, guard=None, commands=[
+    Command(name='vkBindBufferMemory2KHR', dispatch='VkDevice'),
+    Command(name='vkBindImageMemory2KHR', dispatch='VkDevice'),
+])
+
+VK_KHR_maintenance3 = Extension(name='VK_KHR_maintenance3', version=1, guard=None, commands=[
+    Command(name='vkGetDescriptorSetLayoutSupportKHR', dispatch='VkDevice'),
+])
+
+VK_EXT_debug_report = Extension(name='VK_EXT_debug_report', version=9, guard=None, commands=[
+    Command(name='vkCreateDebugReportCallbackEXT', dispatch='VkInstance'),
+    Command(name='vkDestroyDebugReportCallbackEXT', dispatch='VkInstance'),
+    Command(name='vkDebugReportMessageEXT', dispatch='VkInstance'),
+])
+
+VK_NV_glsl_shader = Extension(name='VK_NV_glsl_shader', version=1, guard=None, commands=[
+])
+
+VK_EXT_depth_range_unrestricted = Extension(name='VK_EXT_depth_range_unrestricted', version=1, guard=None, commands=[
+])
+
+VK_IMG_filter_cubic = Extension(name='VK_IMG_filter_cubic', version=1, guard=None, commands=[
+])
+
+VK_AMD_rasterization_order = Extension(name='VK_AMD_rasterization_order', version=1, guard=None, commands=[
+])
+
+VK_AMD_shader_trinary_minmax = Extension(name='VK_AMD_shader_trinary_minmax', version=1, guard=None, commands=[
+])
+
+VK_AMD_shader_explicit_vertex_parameter = Extension(name='VK_AMD_shader_explicit_vertex_parameter', version=1, guard=None, commands=[
+])
+
+VK_EXT_debug_marker = Extension(name='VK_EXT_debug_marker', version=4, guard=None, commands=[
+    Command(name='vkDebugMarkerSetObjectTagEXT', dispatch='VkDevice'),
+    Command(name='vkDebugMarkerSetObjectNameEXT', dispatch='VkDevice'),
+    Command(name='vkCmdDebugMarkerBeginEXT', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdDebugMarkerEndEXT', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdDebugMarkerInsertEXT', dispatch='VkCommandBuffer'),
+])
+
+VK_AMD_gcn_shader = Extension(name='VK_AMD_gcn_shader', version=1, guard=None, commands=[
+])
+
+VK_NV_dedicated_allocation = Extension(name='VK_NV_dedicated_allocation', version=1, guard=None, commands=[
+])
+
+VK_AMD_draw_indirect_count = Extension(name='VK_AMD_draw_indirect_count', version=1, guard=None, commands=[
+    Command(name='vkCmdDrawIndirectCountAMD', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdDrawIndexedIndirectCountAMD', dispatch='VkCommandBuffer'),
+])
+
+VK_AMD_negative_viewport_height = Extension(name='VK_AMD_negative_viewport_height', version=1, guard=None, commands=[
+])
+
+VK_AMD_gpu_shader_half_float = Extension(name='VK_AMD_gpu_shader_half_float', version=1, guard=None, commands=[
+])
+
+VK_AMD_shader_ballot = Extension(name='VK_AMD_shader_ballot', version=1, guard=None, commands=[
+])
+
+VK_AMD_texture_gather_bias_lod = Extension(name='VK_AMD_texture_gather_bias_lod', version=1, guard=None, commands=[
+])
+
+VK_AMD_shader_info = Extension(name='VK_AMD_shader_info', version=1, guard=None, commands=[
+    Command(name='vkGetShaderInfoAMD', dispatch='VkDevice'),
+])
+
+VK_AMD_shader_image_load_store_lod = Extension(name='VK_AMD_shader_image_load_store_lod', version=1, guard=None, commands=[
+])
+
+VK_IMG_format_pvrtc = Extension(name='VK_IMG_format_pvrtc', version=1, guard=None, commands=[
+])
+
+VK_NV_external_memory_capabilities = Extension(name='VK_NV_external_memory_capabilities', version=1, guard=None, commands=[
+    Command(name='vkGetPhysicalDeviceExternalImageFormatPropertiesNV', dispatch='VkPhysicalDevice'),
+])
+
+VK_NV_external_memory = Extension(name='VK_NV_external_memory', version=1, guard=None, commands=[
+])
+
+VK_EXT_validation_flags = Extension(name='VK_EXT_validation_flags', version=1, guard=None, commands=[
+])
+
+VK_EXT_shader_subgroup_ballot = Extension(name='VK_EXT_shader_subgroup_ballot', version=1, guard=None, commands=[
+])
+
+VK_EXT_shader_subgroup_vote = Extension(name='VK_EXT_shader_subgroup_vote', version=1, guard=None, commands=[
+])
+
+VK_NVX_device_generated_commands = Extension(name='VK_NVX_device_generated_commands', version=3, guard=None, commands=[
+    Command(name='vkCmdProcessCommandsNVX', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdReserveSpaceForCommandsNVX', dispatch='VkCommandBuffer'),
+    Command(name='vkCreateIndirectCommandsLayoutNVX', dispatch='VkDevice'),
+    Command(name='vkDestroyIndirectCommandsLayoutNVX', dispatch='VkDevice'),
+    Command(name='vkCreateObjectTableNVX', dispatch='VkDevice'),
+    Command(name='vkDestroyObjectTableNVX', dispatch='VkDevice'),
+    Command(name='vkRegisterObjectsNVX', dispatch='VkDevice'),
+    Command(name='vkUnregisterObjectsNVX', dispatch='VkDevice'),
+    Command(name='vkGetPhysicalDeviceGeneratedCommandsPropertiesNVX', dispatch='VkPhysicalDevice'),
+])
+
+VK_NV_clip_space_w_scaling = Extension(name='VK_NV_clip_space_w_scaling', version=1, guard=None, commands=[
+    Command(name='vkCmdSetViewportWScalingNV', dispatch='VkCommandBuffer'),
+])
+
+VK_EXT_direct_mode_display = Extension(name='VK_EXT_direct_mode_display', version=1, guard=None, commands=[
+    Command(name='vkReleaseDisplayEXT', dispatch='VkPhysicalDevice'),
+])
+
+VK_EXT_display_surface_counter = Extension(name='VK_EXT_display_surface_counter', version=1, guard=None, commands=[
+    Command(name='vkGetPhysicalDeviceSurfaceCapabilities2EXT', dispatch='VkPhysicalDevice'),
+])
+
+VK_EXT_display_control = Extension(name='VK_EXT_display_control', version=1, guard=None, commands=[
+    Command(name='vkDisplayPowerControlEXT', dispatch='VkDevice'),
+    Command(name='vkRegisterDeviceEventEXT', dispatch='VkDevice'),
+    Command(name='vkRegisterDisplayEventEXT', dispatch='VkDevice'),
+    Command(name='vkGetSwapchainCounterEXT', dispatch='VkDevice'),
+])
+
+VK_GOOGLE_display_timing = Extension(name='VK_GOOGLE_display_timing', version=1, guard=None, commands=[
+    Command(name='vkGetRefreshCycleDurationGOOGLE', dispatch='VkDevice'),
+    Command(name='vkGetPastPresentationTimingGOOGLE', dispatch='VkDevice'),
+])
+
+VK_NV_sample_mask_override_coverage = Extension(name='VK_NV_sample_mask_override_coverage', version=1, guard=None, commands=[
+])
+
+VK_NV_geometry_shader_passthrough = Extension(name='VK_NV_geometry_shader_passthrough', version=1, guard=None, commands=[
+])
+
+VK_NV_viewport_array2 = Extension(name='VK_NV_viewport_array2', version=1, guard=None, commands=[
+])
+
+VK_NVX_multiview_per_view_attributes = Extension(name='VK_NVX_multiview_per_view_attributes', version=1, guard=None, commands=[
+])
+
+VK_NV_viewport_swizzle = Extension(name='VK_NV_viewport_swizzle', version=1, guard=None, commands=[
+])
+
+VK_EXT_discard_rectangles = Extension(name='VK_EXT_discard_rectangles', version=1, guard=None, commands=[
+    Command(name='vkCmdSetDiscardRectangleEXT', dispatch='VkCommandBuffer'),
+])
+
+VK_EXT_conservative_rasterization = Extension(name='VK_EXT_conservative_rasterization', version=1, guard=None, commands=[
+])
+
+VK_EXT_swapchain_colorspace = Extension(name='VK_EXT_swapchain_colorspace', version=3, guard=None, commands=[
+])
+
+VK_EXT_hdr_metadata = Extension(name='VK_EXT_hdr_metadata', version=1, guard=None, commands=[
+    Command(name='vkSetHdrMetadataEXT', dispatch='VkDevice'),
+])
+
+VK_EXT_external_memory_dma_buf = Extension(name='VK_EXT_external_memory_dma_buf', version=1, guard=None, commands=[
+])
+
+VK_EXT_queue_family_foreign = Extension(name='VK_EXT_queue_family_foreign', version=1, guard=None, commands=[
+])
+
+VK_EXT_debug_utils = Extension(name='VK_EXT_debug_utils', version=1, guard=None, commands=[
+    Command(name='vkSetDebugUtilsObjectNameEXT', dispatch='VkDevice'),
+    Command(name='vkSetDebugUtilsObjectTagEXT', dispatch='VkDevice'),
+    Command(name='vkQueueBeginDebugUtilsLabelEXT', dispatch='VkQueue'),
+    Command(name='vkQueueEndDebugUtilsLabelEXT', dispatch='VkQueue'),
+    Command(name='vkQueueInsertDebugUtilsLabelEXT', dispatch='VkQueue'),
+    Command(name='vkCmdBeginDebugUtilsLabelEXT', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdEndDebugUtilsLabelEXT', dispatch='VkCommandBuffer'),
+    Command(name='vkCmdInsertDebugUtilsLabelEXT', dispatch='VkCommandBuffer'),
+    Command(name='vkCreateDebugUtilsMessengerEXT', dispatch='VkInstance'),
+    Command(name='vkDestroyDebugUtilsMessengerEXT', dispatch='VkInstance'),
+    Command(name='vkSubmitDebugUtilsMessageEXT', dispatch='VkInstance'),
+])
+
+VK_EXT_sampler_filter_minmax = Extension(name='VK_EXT_sampler_filter_minmax', version=1, guard=None, commands=[
+])
+
+VK_AMD_gpu_shader_int16 = Extension(name='VK_AMD_gpu_shader_int16', version=1, guard=None, commands=[
+])
+
+VK_AMD_mixed_attachment_samples = Extension(name='VK_AMD_mixed_attachment_samples', version=1, guard=None, commands=[
+])
+
+VK_AMD_shader_fragment_mask = Extension(name='VK_AMD_shader_fragment_mask', version=1, guard=None, commands=[
+])
+
+VK_EXT_shader_stencil_export = Extension(name='VK_EXT_shader_stencil_export', version=1, guard=None, commands=[
+])
+
+VK_EXT_sample_locations = Extension(name='VK_EXT_sample_locations', version=1, guard=None, commands=[
+    Command(name='vkCmdSetSampleLocationsEXT', dispatch='VkCommandBuffer'),
+    Command(name='vkGetPhysicalDeviceMultisamplePropertiesEXT', dispatch='VkPhysicalDevice'),
+])
+
+VK_EXT_blend_operation_advanced = Extension(name='VK_EXT_blend_operation_advanced', version=2, guard=None, commands=[
+])
+
+VK_NV_fragment_coverage_to_color = Extension(name='VK_NV_fragment_coverage_to_color', version=1, guard=None, commands=[
+])
+
+VK_NV_framebuffer_mixed_samples = Extension(name='VK_NV_framebuffer_mixed_samples', version=1, guard=None, commands=[
+])
+
+VK_NV_fill_rectangle = Extension(name='VK_NV_fill_rectangle', version=1, guard=None, commands=[
+])
+
+VK_EXT_post_depth_coverage = Extension(name='VK_EXT_post_depth_coverage', version=1, guard=None, commands=[
+])
+
+VK_EXT_validation_cache = Extension(name='VK_EXT_validation_cache', version=1, guard=None, commands=[
+    Command(name='vkCreateValidationCacheEXT', dispatch='VkDevice'),
+    Command(name='vkDestroyValidationCacheEXT', dispatch='VkDevice'),
+    Command(name='vkMergeValidationCachesEXT', dispatch='VkDevice'),
+    Command(name='vkGetValidationCacheDataEXT', dispatch='VkDevice'),
+])
+
+VK_EXT_descriptor_indexing = Extension(name='VK_EXT_descriptor_indexing', version=2, guard=None, commands=[
+])
+
+VK_EXT_shader_viewport_index_layer = Extension(name='VK_EXT_shader_viewport_index_layer', version=1, guard=None, commands=[
+])
+
+VK_EXT_global_priority = Extension(name='VK_EXT_global_priority', version=2, guard=None, commands=[
+])
+
+VK_EXT_external_memory_host = Extension(name='VK_EXT_external_memory_host', version=1, guard=None, commands=[
+    Command(name='vkGetMemoryHostPointerPropertiesEXT', dispatch='VkDevice'),
+])
+
+VK_AMD_buffer_marker = Extension(name='VK_AMD_buffer_marker', version=1, guard=None, commands=[
+    Command(name='vkCmdWriteBufferMarkerAMD', dispatch='VkCommandBuffer'),
+])
+
+VK_AMD_shader_core_properties = Extension(name='VK_AMD_shader_core_properties', version=1, guard=None, commands=[
+])
+
+VK_EXT_vertex_attribute_divisor = Extension(name='VK_EXT_vertex_attribute_divisor', version=1, guard=None, commands=[
+])
+
+VK_NV_shader_subgroup_partitioned = Extension(name='VK_NV_shader_subgroup_partitioned', version=1, guard=None, commands=[
+])
+
+VK_KHR_android_surface = Extension(name='VK_KHR_android_surface', version=6, guard='VK_USE_PLATFORM_ANDROID_KHR', commands=[
+    Command(name='vkCreateAndroidSurfaceKHR', dispatch='VkInstance'),
+])
+
+VK_ANDROID_external_memory_android_hardware_buffer = Extension(name='VK_ANDROID_external_memory_android_hardware_buffer', version=3, guard='VK_USE_PLATFORM_ANDROID_KHR', commands=[
+    Command(name='vkGetAndroidHardwareBufferPropertiesANDROID', dispatch='VkDevice'),
+    Command(name='vkGetMemoryAndroidHardwareBufferANDROID', dispatch='VkDevice'),
+])
+
+VK_MVK_ios_surface = Extension(name='VK_MVK_ios_surface', version=2, guard='VK_USE_PLATFORM_IOS_MVK', commands=[
+    Command(name='vkCreateIOSSurfaceMVK', dispatch='VkInstance'),
+])
+
+VK_MVK_macos_surface = Extension(name='VK_MVK_macos_surface', version=2, guard='VK_USE_PLATFORM_MACOS_MVK', commands=[
+    Command(name='vkCreateMacOSSurfaceMVK', dispatch='VkInstance'),
+])
+
+VK_KHR_mir_surface = Extension(name='VK_KHR_mir_surface', version=4, guard='VK_USE_PLATFORM_MIR_KHR', commands=[
+    Command(name='vkCreateMirSurfaceKHR', dispatch='VkInstance'),
+    Command(name='vkGetPhysicalDeviceMirPresentationSupportKHR', dispatch='VkPhysicalDevice'),
+])
+
+VK_NN_vi_surface = Extension(name='VK_NN_vi_surface', version=1, guard='VK_USE_PLATFORM_VI_NN', commands=[
+    Command(name='vkCreateViSurfaceNN', dispatch='VkInstance'),
+])
+
+VK_KHR_wayland_surface = Extension(name='VK_KHR_wayland_surface', version=6, guard='VK_USE_PLATFORM_WAYLAND_KHR', commands=[
+    Command(name='vkCreateWaylandSurfaceKHR', dispatch='VkInstance'),
+    Command(name='vkGetPhysicalDeviceWaylandPresentationSupportKHR', dispatch='VkPhysicalDevice'),
+])
+
+VK_KHR_win32_surface = Extension(name='VK_KHR_win32_surface', version=6, guard='VK_USE_PLATFORM_WIN32_KHR', commands=[
+    Command(name='vkCreateWin32SurfaceKHR', dispatch='VkInstance'),
+    Command(name='vkGetPhysicalDeviceWin32PresentationSupportKHR', dispatch='VkPhysicalDevice'),
+])
+
+VK_KHR_external_memory_win32 = Extension(name='VK_KHR_external_memory_win32', version=1, guard='VK_USE_PLATFORM_WIN32_KHR', commands=[
+    Command(name='vkGetMemoryWin32HandleKHR', dispatch='VkDevice'),
+    Command(name='vkGetMemoryWin32HandlePropertiesKHR', dispatch='VkDevice'),
+])
+
+VK_KHR_win32_keyed_mutex = Extension(name='VK_KHR_win32_keyed_mutex', version=1, guard='VK_USE_PLATFORM_WIN32_KHR', commands=[
+])
+
+VK_KHR_external_semaphore_win32 = Extension(name='VK_KHR_external_semaphore_win32', version=1, guard='VK_USE_PLATFORM_WIN32_KHR', commands=[
+    Command(name='vkImportSemaphoreWin32HandleKHR', dispatch='VkDevice'),
+    Command(name='vkGetSemaphoreWin32HandleKHR', dispatch='VkDevice'),
+])
+
+VK_KHR_external_fence_win32 = Extension(name='VK_KHR_external_fence_win32', version=1, guard='VK_USE_PLATFORM_WIN32_KHR', commands=[
+    Command(name='vkImportFenceWin32HandleKHR', dispatch='VkDevice'),
+    Command(name='vkGetFenceWin32HandleKHR', dispatch='VkDevice'),
+])
+
+VK_NV_external_memory_win32 = Extension(name='VK_NV_external_memory_win32', version=1, guard='VK_USE_PLATFORM_WIN32_KHR', commands=[
+    Command(name='vkGetMemoryWin32HandleNV', dispatch='VkDevice'),
+])
+
+VK_NV_win32_keyed_mutex = Extension(name='VK_NV_win32_keyed_mutex', version=1, guard='VK_USE_PLATFORM_WIN32_KHR', commands=[
+])
+
+VK_KHR_xcb_surface = Extension(name='VK_KHR_xcb_surface', version=6, guard='VK_USE_PLATFORM_XCB_KHR', commands=[
+    Command(name='vkCreateXcbSurfaceKHR', dispatch='VkInstance'),
+    Command(name='vkGetPhysicalDeviceXcbPresentationSupportKHR', dispatch='VkPhysicalDevice'),
+])
+
+VK_KHR_xlib_surface = Extension(name='VK_KHR_xlib_surface', version=6, guard='VK_USE_PLATFORM_XLIB_KHR', commands=[
+    Command(name='vkCreateXlibSurfaceKHR', dispatch='VkInstance'),
+    Command(name='vkGetPhysicalDeviceXlibPresentationSupportKHR', dispatch='VkPhysicalDevice'),
+])
+
+VK_EXT_acquire_xlib_display = Extension(name='VK_EXT_acquire_xlib_display', version=1, guard='VK_USE_PLATFORM_XLIB_XRANDR_EXT', commands=[
+    Command(name='vkAcquireXlibDisplayEXT', dispatch='VkPhysicalDevice'),
+    Command(name='vkGetRandROutputDisplayEXT', dispatch='VkPhysicalDevice'),
+])
+
+extensions = [
+    VK_core_0,
+    VK_core_1,
+    VK_KHR_surface,
+    VK_KHR_swapchain,
+    VK_KHR_display,
+    VK_KHR_display_swapchain,
+    VK_KHR_sampler_mirror_clamp_to_edge,
+    VK_KHR_multiview,
+    VK_KHR_get_physical_device_properties2,
+    VK_KHR_device_group,
+    VK_KHR_shader_draw_parameters,
+    VK_KHR_maintenance1,
+    VK_KHR_device_group_creation,
+    VK_KHR_external_memory_capabilities,
+    VK_KHR_external_memory,
+    VK_KHR_external_memory_fd,
+    VK_KHR_external_semaphore_capabilities,
+    VK_KHR_external_semaphore,
+    VK_KHR_external_semaphore_fd,
+    VK_KHR_push_descriptor,
+    VK_KHR_16bit_storage,
+    VK_KHR_incremental_present,
+    VK_KHR_descriptor_update_template,
+    VK_KHR_shared_presentable_image,
+    VK_KHR_external_fence_capabilities,
+    VK_KHR_external_fence,
+    VK_KHR_external_fence_fd,
+    VK_KHR_maintenance2,
+    VK_KHR_get_surface_capabilities2,
+    VK_KHR_variable_pointers,
+    VK_KHR_dedicated_allocation,
+    VK_KHR_storage_buffer_storage_class,
+    VK_KHR_relaxed_block_layout,
+    VK_KHR_get_memory_requirements2,
+    VK_KHR_image_format_list,
+    VK_KHR_sampler_ycbcr_conversion,
+    VK_KHR_bind_memory2,
+    VK_KHR_maintenance3,
+    VK_EXT_debug_report,
+    VK_NV_glsl_shader,
+    VK_EXT_depth_range_unrestricted,
+    VK_IMG_filter_cubic,
+    VK_AMD_rasterization_order,
+    VK_AMD_shader_trinary_minmax,
+    VK_AMD_shader_explicit_vertex_parameter,
+    VK_EXT_debug_marker,
+    VK_AMD_gcn_shader,
+    VK_NV_dedicated_allocation,
+    VK_AMD_draw_indirect_count,
+    VK_AMD_negative_viewport_height,
+    VK_AMD_gpu_shader_half_float,
+    VK_AMD_shader_ballot,
+    VK_AMD_texture_gather_bias_lod,
+    VK_AMD_shader_info,
+    VK_AMD_shader_image_load_store_lod,
+    VK_IMG_format_pvrtc,
+    VK_NV_external_memory_capabilities,
+    VK_NV_external_memory,
+    VK_EXT_validation_flags,
+    VK_EXT_shader_subgroup_ballot,
+    VK_EXT_shader_subgroup_vote,
+    VK_NVX_device_generated_commands,
+    VK_NV_clip_space_w_scaling,
+    VK_EXT_direct_mode_display,
+    VK_EXT_display_surface_counter,
+    VK_EXT_display_control,
+    VK_GOOGLE_display_timing,
+    VK_NV_sample_mask_override_coverage,
+    VK_NV_geometry_shader_passthrough,
+    VK_NV_viewport_array2,
+    VK_NVX_multiview_per_view_attributes,
+    VK_NV_viewport_swizzle,
+    VK_EXT_discard_rectangles,
+    VK_EXT_conservative_rasterization,
+    VK_EXT_swapchain_colorspace,
+    VK_EXT_hdr_metadata,
+    VK_EXT_external_memory_dma_buf,
+    VK_EXT_queue_family_foreign,
+    VK_EXT_debug_utils,
+    VK_EXT_sampler_filter_minmax,
+    VK_AMD_gpu_shader_int16,
+    VK_AMD_mixed_attachment_samples,
+    VK_AMD_shader_fragment_mask,
+    VK_EXT_shader_stencil_export,
+    VK_EXT_sample_locations,
+    VK_EXT_blend_operation_advanced,
+    VK_NV_fragment_coverage_to_color,
+    VK_NV_framebuffer_mixed_samples,
+    VK_NV_fill_rectangle,
+    VK_EXT_post_depth_coverage,
+    VK_EXT_validation_cache,
+    VK_EXT_descriptor_indexing,
+    VK_EXT_shader_viewport_index_layer,
+    VK_EXT_global_priority,
+    VK_EXT_external_memory_host,
+    VK_AMD_buffer_marker,
+    VK_AMD_shader_core_properties,
+    VK_EXT_vertex_attribute_divisor,
+    VK_NV_shader_subgroup_partitioned,
+    VK_KHR_android_surface,
+    VK_ANDROID_external_memory_android_hardware_buffer,
+    VK_MVK_ios_surface,
+    VK_MVK_macos_surface,
+    VK_KHR_mir_surface,
+    VK_NN_vi_surface,
+    VK_KHR_wayland_surface,
+    VK_KHR_win32_surface,
+    VK_KHR_external_memory_win32,
+    VK_KHR_win32_keyed_mutex,
+    VK_KHR_external_semaphore_win32,
+    VK_KHR_external_fence_win32,
+    VK_NV_external_memory_win32,
+    VK_NV_win32_keyed_mutex,
+    VK_KHR_xcb_surface,
+    VK_KHR_xlib_surface,
+    VK_EXT_acquire_xlib_display,
+]
+# end of generated code
+
+def generate_wrapper_header(guard):
+    copyright = []
+    copyright.append("/*                                                                         ")
+    copyright.append(" * Copyright 2018 The Android Open Source Project                          ")
+    copyright.append(" *                                                                         ")
+    copyright.append(" * Licensed under the Apache License, Version 2.0 (the \"License\");       ")
+    copyright.append(" * you may not use this file except in compliance with the License.        ")
+    copyright.append(" * You may obtain a copy of the License at                                 ")
+    copyright.append(" *                                                                         ")
+    copyright.append(" *      http://www.apache.org/licenses/LICENSE-2.0                         ")
+    copyright.append(" *                                                                         ")
+    copyright.append(" * Unless required by applicable law or agreed to in writing, software     ")
+    copyright.append(" * distributed under the License is distributed on an \"AS IS\" BASIS,     ")
+    copyright.append(" * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.")
+    copyright.append(" * See the License for the specific language governing permissions and     ")
+    copyright.append(" * limitations under the License.                                          ")
+    copyright.append(" */                                                                        ")
+    lines = [line.rstrip() for line in copyright]
+
+    lines.append("// This file is generated.")
+    lines.append("#ifndef %s" % guard)
+    lines.append("#define %s" % guard)
+    lines.append("")
+    lines.append("#ifdef __cplusplus")
+    lines.append("extern \"C\" {")
+    lines.append("#endif")
+    lines.append("")
+    lines.append("#define VK_NO_PROTOTYPES 1")
+    lines.append("#include <vulkan/vulkan.h>")
+    lines.append("")
+    lines.append("/* Initialize the Vulkan function pointer variables declared in this header.")
+    lines.append(" * Returns 0 if vulkan is not available, non-zero if it is available.")
+    lines.append(" */")
+    lines.append("int InitVulkan(void);")
+    lines.append("")
+
+    for ext in extensions:
+        # Only wrap core and WSI functions
+        wrapped_exts = {'VK_core', 'VK_KHR'}
+        if not any(ext.name.startswith(s) for s in wrapped_exts):
+            continue
+
+        if ext.guard:
+            lines.append("#ifdef %s" % ext.guard)
+
+        lines.append("// %s" % ext.name)
+        for cmd in ext.commands:
+            lines.append("extern PFN_%s %s;" % (cmd.name, cmd.name))
+
+        if ext.guard:
+            lines.append("#endif")
+        lines.append("")
+
+    lines.append("")
+    lines.append("")
+    lines.append("#ifdef __cplusplus")
+    lines.append("}")
+    lines.append("#endif")
+    lines.append("")
+    lines.append("#endif  // %s" % guard)
+
+    return "\n".join(lines)
+
+def generate_wrapper_source(header):
+    copyright = []
+    copyright.append("/*                                                                         ")
+    copyright.append(" * Copyright 2018 The Android Open Source Project                          ")
+    copyright.append(" *                                                                         ")
+    copyright.append(" * Licensed under the Apache License, Version 2.0 (the \"License\");       ")
+    copyright.append(" * you may not use this file except in compliance with the License.        ")
+    copyright.append(" * You may obtain a copy of the License at                                 ")
+    copyright.append(" *                                                                         ")
+    copyright.append(" *      http://www.apache.org/licenses/LICENSE-2.0                         ")
+    copyright.append(" *                                                                         ")
+    copyright.append(" * Unless required by applicable law or agreed to in writing, software     ")
+    copyright.append(" * distributed under the License is distributed on an \"AS IS\" BASIS,     ")
+    copyright.append(" * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.")
+    copyright.append(" * See the License for the specific language governing permissions and     ")
+    copyright.append(" * limitations under the License.                                          ")
+    copyright.append(" */                                                                        ")
+    lines = [line.rstrip() for line in copyright]
+
+    lines.append("// This file is generated.")
+    lines.append("#ifdef __cplusplus")
+    lines.append("extern \"C\" {")
+    lines.append("#endif")
+    lines.append("")
+    lines.append("#include \"%s\"" % header)
+    lines.append("#include <dlfcn.h>")
+    lines.append("")
+
+    lines.append("int InitVulkan(void) {")
+    lines.append("    void* libvulkan = dlopen(\"libvulkan.so\", RTLD_NOW | RTLD_LOCAL);")
+    lines.append("    if (!libvulkan)")
+    lines.append("        return 0;")
+    lines.append("")
+    lines.append("    // Vulkan supported, set function addresses")
+    for ext in extensions:
+        # Only wrap core and WSI functions
+        wrapped_exts = {'VK_core', 'VK_KHR'}
+        if not any(ext.name.startswith(s) for s in wrapped_exts):
+            continue
+
+        if ext.guard:
+            lines.append("")
+            lines.append("#ifdef %s" % ext.guard)
+
+        for cmd in ext.commands:
+            lines.append("    %s = reinterpret_cast<PFN_%s>(dlsym(libvulkan, \"%s\"));" % (cmd.name, cmd.name, cmd.name))
+
+        if ext.guard:
+            lines.append("#endif")
+
+    lines.append("    return 1;")
+    lines.append("}")
+    lines.append("")
+
+    lines.append("// No Vulkan support, do not set function addresses")
+    for ext in extensions:
+        if ext.guard:
+            lines.append("")
+            lines.append("#ifdef %s" % ext.guard)
+
+        for cmd in ext.commands:
+            lines.append("PFN_%s %s;" % (cmd.name, cmd.name))
+
+        if ext.guard:
+            lines.append("#endif")
+
+    lines.append("")
+    lines.append("#ifdef __cplusplus")
+    lines.append("}")
+    lines.append("#endif")
+
+    return "\n".join(lines)
+
+def parse_subheader(filename, ext_guard):
+    sub_extensions = []
+
+    with open(filename, "r") as f:
+        current_ext = None
+        spec_version = None
+
+        for line in f:
+            line = line.strip();
+
+            if line.startswith("#define VK_API_VERSION"):
+                minor_end = line.rfind(",")
+                minor_begin = line.rfind(",", 0, minor_end) + 1
+                spec_version = int(line[minor_begin:minor_end])
+                # add core
+                current_ext = Extension("VK_core_%s" % spec_version, spec_version)
+                sub_extensions.append(current_ext)
+            elif Command.valid_c_typedef(line):
+                current_ext.add_command(Command.from_c_typedef(line))
+            elif line.startswith("#define") and "SPEC_VERSION " in line:
+                version_begin = line.rfind(" ") + 1
+                spec_version = int(line[version_begin:])
+            elif line.startswith("#define") and "EXTENSION_NAME " in line:
+                name_end = line.rfind("\"")
+                name_begin = line.rfind("\"", 0, name_end) + 1
+                name = line[name_begin:name_end]
+                # add extension
+                current_ext = Extension(name, spec_version, ext_guard)
+                sub_extensions.append(current_ext)
+
+    return sub_extensions;
+
+def parse_vulkan_h(filename):
+    extensions = []
+
+    with open(filename, "r") as f:
+        ext_guard = None
+
+        for line in f:
+            line = line.strip();
+
+            if line.startswith("#include \"vulkan_"):
+                # Extract the filename and parse it.  Must be local to script file (no path).
+                extensions.extend(parse_subheader(line[10:].replace('"', ''), ext_guard))
+            elif line.startswith("#ifdef VK_USE_PLATFORM"):
+                guard_begin = line.find(" ") + 1
+                ext_guard = line[guard_begin:]
+            elif ext_guard and line.startswith("#endif") and ext_guard in line:
+                ext_guard = None
+
+    for ext in extensions:
+        print("%s = %s" % (ext.name, repr(ext)))
+        print("")
+
+    print("extensions = [")
+    for ext in extensions:
+        print("    %s," % ext.name)
+    print("]")
+
+if __name__ == "__main__":
+    if sys.argv[1] == "parse":
+        parse_vulkan_h(sys.argv[2])
+    else:
+        filename = sys.argv[1]
+        base = os.path.basename(filename)
+        contents = []
+
+        if base.endswith(".h"):
+            contents = generate_wrapper_header(base.replace(".", "_").upper())
+        elif base.endswith(".cpp"):
+            contents = generate_wrapper_source(base.replace(".cpp", ".h"))
+
+        with open(filename, "w") as f:
+            print(contents, file=f)