commit f32847054dbf6b29472f340110fabbca280910e5
author Ian Elliott <ian@lunarg.com> Thu Oct 29 16:35:06 2015 -0600
committer Jon Ashburn <jon@lunarg.com> Tue Dec 01 10:18:23 2015 -0700
tree e61d5d21239ea6b41b2e64e7d02b728f113be22b
parent af5c5950beb79edc24b8b2a104c4ae2ae166e085

vulkan.py: Changes in previous WSI functions.

vulkan.py

diff --git a/vulkan.py b/vulkan.py
index ed070c5..d990774 100755
--- a/vulkan.py
+++ b/vulkan.py
@@ -1011,46 +1011,46 @@
 )
 
 ext_khr_swapchain = Extension(
-    name="VK_EXT_KHR_swapchain",
-    headers=["vulkan/vk_ext_khr_swapchain.h"],
+    name="VK_KHR_surface",
+    headers=["vulkan/vulkan.h"],
     objects=[],
     protos=[
         Proto("VkResult", "GetPhysicalDeviceSurfaceSupportKHR",
             [Param("VkPhysicalDevice", "physicalDevice"),
              Param("uint32_t", "queueFamilyIndex"),
-             Param("const VkSurfaceDescriptionKHR*", "pSurfaceDescription"),
+             Param("VkSurfaceKHR", "surface"),
              Param("VkBool32*", "pSupported")]),
+
+        Proto("VkResult", "GetPhysicalDeviceSurfaceCapabilitiesKHR",
+            [Param("VkPhysicalDevice", "physicalDevice"),
+	     Param("VkSurfaceKHR", "surface"),
+             Param("VkSurfaceCapabilitiesKHR*", "pSurfaceCapabilities")]),
+
+        Proto("VkResult", "GetPhysicalDeviceSurfaceFormatsKHR",
+            [Param("VkPhysicalDevice", "physicalDevice"),
+	     Param("VkSurfaceKHR", "surface"),
+	     Param("uint32_t*", "pSurfaceFormatCount"),
+             Param("VkSurfaceFormatKHR*", "pSurfaceFormats")]),
+
+        Proto("VkResult", "GetPhysicalDeviceSurfacePresentModesKHR",
+            [Param("VkPhysicalDevice", "physicalDevice"),
+	     Param("VkSurfaceKHR", "surface"),
+	     Param("uint32_t*", "pPresentModeCount"),
+             Param("VkPresentModeKHR*", "pPresentModes")]),
     ],
 )
 
 ext_khr_device_swapchain = Extension(
-    name="VK_EXT_KHR_device_swapchain",
-    headers=["vk_ext_khr_device_swapchain.h"],
+    name="VK_KHR_swapchain",
+    headers=["vulkan/vulkan.h"],
     objects=["VkSwapchainKHR"],
     protos=[
-        Proto("VkResult", "GetSurfacePropertiesKHR",
-            [Param("VkDevice", "device"),
-	     Param("const VkSurfaceDescriptionKHR*", "pSurfaceDescription"),
-             Param("VkSurfacePropertiesKHR*", "pSurfaceProperties")]),
-
-        Proto("VkResult", "GetSurfaceFormatsKHR",
-            [Param("VkDevice", "device"),
-	     Param("const VkSurfaceDescriptionKHR*", "pSurfaceDescription"),
-	     Param("uint32_t*", "pCount"),
-             Param("VkSurfaceFormatKHR*", "pSurfaceFormats")]),
-
-        Proto("VkResult", "GetSurfacePresentModesKHR",
-            [Param("VkDevice", "device"),
-	     Param("const VkSurfaceDescriptionKHR*", "pSurfaceDescription"),
-	     Param("uint32_t*", "pCount"),
-             Param("VkPresentModeKHR*", "pPresentModes")]),
-
         Proto("VkResult", "CreateSwapchainKHR",
             [Param("VkDevice", "device"),
              Param("const VkSwapchainCreateInfoKHR*", "pCreateInfo"),
              Param("VkSwapchainKHR*", "pSwapchain")]),
 
-        Proto("VkResult", "DestroySwapchainKHR",
+        Proto("void", "DestroySwapchainKHR",
             [Param("VkDevice", "device"),
              Param("VkSwapchainKHR", "swapchain")]),