misc: Add DestroySurfaceKHR to the codegen WSI surface extension

Conflicts:
	vulkan.py

2 files changed, 18 insertions, 4 deletions

diff --git a/icd/nulldrv/nulldrv.c b/icd/nulldrv/nulldrv.c
index 8c6875e9..b231050e 100644
--- a/icd/nulldrv/nulldrv.c
+++ b/icd/nulldrv/nulldrv.c
@@ -694,6 +694,14 @@ static const VkFormat nulldrv_presentable_formats[] = {
     VK_FORMAT_B8G8R8A8_UNORM,
 };
 
+ICD_EXPORT VKAPI_ATTR void VKAPI_CALL vkDestroySurfaceKHR(
+    VkInstance                                   instance,
+    VkSurfaceKHR                                 surface,
+    const VkAllocationCallbacks*                pAllocator)
+{
+   NULLDRV_LOG_FUNC;
+}
+
 ICD_EXPORT VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceSurfaceSupportKHR(
     VkPhysicalDevice                        physicalDevice,
     uint32_t                                queueFamilyIndex,
diff --git a/vulkan.py b/vulkan.py
index 4ac1d9ac..12ba3140 100755
--- a/vulkan.py
+++ b/vulkan.py
@@ -1010,11 +1010,16 @@ core = Extension(
     ],
 )
 
-ext_khr_swapchain = Extension(
+ext_khr_surface = Extension(
     name="VK_KHR_surface",
     headers=["vulkan/vulkan.h"],
-    objects=[],
+    objects=["vkSurfaceKHR"],
     protos=[
+        Proto("void", "DestroySurfaceKHR",
+            [Param("VkInstance", "instance"),
+             Param("VkSurfaceKHR", "surface"),
+             Param("const VkAllocationCallbacks*", "pAllocator")]),
+
         Proto("VkResult", "GetPhysicalDeviceSurfaceSupportKHR",
             [Param("VkPhysicalDevice", "physicalDevice"),
              Param("uint32_t", "queueFamilyIndex"),
@@ -1121,8 +1126,8 @@ lunarg_debug_marker = Extension(
              Param("const char*", "pName")]),
     ],
 )
-extensions = [core, ext_khr_swapchain, ext_khr_device_swapchain]
-extensions_all = [core, ext_khr_swapchain, ext_khr_device_swapchain, lunarg_debug_report, lunarg_debug_marker]
+extensions = [core, ext_khr_surface, ext_khr_device_swapchain]
+extensions_all = [core, ext_khr_surface, ext_khr_device_swapchain, lunarg_debug_report, lunarg_debug_marker]
 object_dispatch_list = [
     "VkInstance",
     "VkPhysicalDevice",
@@ -1153,6 +1158,7 @@ object_non_dispatch_list = [
     "VkRenderPass",
     "VkFramebuffer",
     "VkSwapchainKHR",
+    "VkSurfaceKHR",
     "VkDbgMsgCallback",
 ]