From 76db80ef37012a387bd5c944daeb95148bdf7cad Mon Sep 17 00:00:00 2001
From: Ian Elliott <ian@lunarg.com>
Date: Thu, 29 Oct 2015 16:35:06 -0600
Subject: vulkan.py: Changes in previous WSI functions.

---
 vulkan.py | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

(limited to 'vulkan.py')

diff --git a/vulkan.py b/vulkan.py
index ed070c51..d9907743 100755
--- a/vulkan.py
+++ b/vulkan.py
@@ -1011,46 +1011,46 @@ core = Extension(
 )
 
 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")]),
-    ],
-)
 
-ext_khr_device_swapchain = Extension(
-    name="VK_EXT_KHR_device_swapchain",
-    headers=["vk_ext_khr_device_swapchain.h"],
-    objects=["VkSwapchainKHR"],
-    protos=[
-        Proto("VkResult", "GetSurfacePropertiesKHR",
-            [Param("VkDevice", "device"),
-	     Param("const VkSurfaceDescriptionKHR*", "pSurfaceDescription"),
-             Param("VkSurfacePropertiesKHR*", "pSurfaceProperties")]),
+        Proto("VkResult", "GetPhysicalDeviceSurfaceCapabilitiesKHR",
+            [Param("VkPhysicalDevice", "physicalDevice"),
+	     Param("VkSurfaceKHR", "surface"),
+             Param("VkSurfaceCapabilitiesKHR*", "pSurfaceCapabilities")]),
 
-        Proto("VkResult", "GetSurfaceFormatsKHR",
-            [Param("VkDevice", "device"),
-	     Param("const VkSurfaceDescriptionKHR*", "pSurfaceDescription"),
-	     Param("uint32_t*", "pCount"),
+        Proto("VkResult", "GetPhysicalDeviceSurfaceFormatsKHR",
+            [Param("VkPhysicalDevice", "physicalDevice"),
+	     Param("VkSurfaceKHR", "surface"),
+	     Param("uint32_t*", "pSurfaceFormatCount"),
              Param("VkSurfaceFormatKHR*", "pSurfaceFormats")]),
 
-        Proto("VkResult", "GetSurfacePresentModesKHR",
-            [Param("VkDevice", "device"),
-	     Param("const VkSurfaceDescriptionKHR*", "pSurfaceDescription"),
-	     Param("uint32_t*", "pCount"),
+        Proto("VkResult", "GetPhysicalDeviceSurfacePresentModesKHR",
+            [Param("VkPhysicalDevice", "physicalDevice"),
+	     Param("VkSurfaceKHR", "surface"),
+	     Param("uint32_t*", "pPresentModeCount"),
              Param("VkPresentModeKHR*", "pPresentModes")]),
+    ],
+)
 
+ext_khr_device_swapchain = Extension(
+    name="VK_KHR_swapchain",
+    headers=["vulkan/vulkan.h"],
+    objects=["VkSwapchainKHR"],
+    protos=[
         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")]),
 
-- 
cgit v1.2.3