commit f8693386dee4d338ed5a88b54b9d587e63b379ea
author Chia-I Wu <olv@lunarg.com> Thu Apr 16 22:02:10 2015 +0800
committer Ian Elliott <ian@LunarG.com> Fri Apr 17 13:51:02 2015 -0600
tree 9aacdf5e88ff8b64ff1c322f9604f20d12a35ffa
parent 92ee79a248c8041a2019edbb0e71e18112a6dec4

switch to VK_WSI_LunarG

Switch from VK_WSI_X11 to VK_WSI_LunarG

v2:

 - split out glave changes
 - redo mem_tracker changes
 - rebase

Conflicts:

	demos/cube.c
	demos/tri.c

v3 (from Ian):

 - Put "#if 0" around non-upstream members of VkDisplayPropertiesWSI.

vulkan.py

diff --git a/vulkan.py b/vulkan.py
index 72cb9cd..044a98c 100755
--- a/vulkan.py
+++ b/vulkan.py
@@ -923,40 +923,48 @@
     ],
 )
 
-wsi_x11 = Extension(
-    name="VK_WSI_X11",
-    headers=["vkWsiX11Ext.h"],
-    objects=[],
+wsi_lunarg = Extension(
+    name="VK_WSI_LunarG",
+    headers=["vk_wsi_lunarg.h"],
+    objects=[
+        "VkDisplayWSI",
+        "VkSwapChainWSI",
+    ],
     protos=[
-        Proto("VkResult", "WsiX11AssociateConnection",
-            [Param("VkPhysicalDevice", "gpu"),
-             Param("const VK_WSI_X11_CONNECTION_INFO*", "pConnectionInfo")]),
+        Proto("VkResult", "GetDisplayInfoWSI",
+            [Param("VkDisplayWSI", "display"),
+             Param("VkDisplayInfoTypeWSI", "infoType"),
+             Param("size_t*", "pDataSize"),
+             Param("void*", "pData")]),
 
-        Proto("VkResult", "WsiX11GetMSC",
+        Proto("VkResult", "CreateSwapChainWSI",
             [Param("VkDevice", "device"),
-             Param("xcb_window_t", "window"),
-             Param("xcb_randr_crtc_t", "crtc"),
-             Param("uint64_t*", "pMsc")]),
+             Param("const VkSwapChainCreateInfoWSI*", "pCreateInfo"),
+             Param("VkSwapChainWSI*", "pSwapChain")]),
 
-        Proto("VkResult", "WsiX11CreatePresentableImage",
-            [Param("VkDevice", "device"),
-             Param("const VK_WSI_X11_PRESENTABLE_IMAGE_CREATE_INFO*", "pCreateInfo"),
-             Param("VkImage*", "pImage"),
-             Param("VkDeviceMemory*", "pMem")]),
+        Proto("VkResult", "DestroySwapChainWSI",
+            [Param("VkSwapChainWSI", "swapChain")]),
 
-        Proto("VkResult", "WsiX11QueuePresent",
+        Proto("VkResult", "GetSwapChainInfoWSI",
+            [Param("VkSwapChainWSI", "swapChain"),
+             Param("VkSwapChainInfoTypeWSI", "infoType"),
+             Param("size_t*", "pDataSize"),
+             Param("void*", "pData")]),
+
+        Proto("VkResult", "QueuePresentWSI",
             [Param("VkQueue", "queue"),
-             Param("const VK_WSI_X11_PRESENT_INFO*", "pPresentInfo"),
-             Param("VkFence", "fence")]),
+             Param("const VkPresentInfoWSI*", "pPresentInfo")]),
     ],
 )
 
-extensions = [core, wsi_x11]
+extensions = [core, wsi_lunarg]
 
 object_root_list = [
     "VkInstance",
     "VkPhysicalDevice",
-    "VkBaseObject"
+    "VkBaseObject",
+    "VkDisplayWSI",
+    "VkSwapChainWSI",
 ]
 
 object_base_list = [