commit a8914ac5f90f7b8384dc4e13de771b027906e694
author Ian Elliott <ianelliott@google.com> Fri Dec 11 14:05:35 2015 -0700
committer Jon Ashburn <jon@lunarg.com> Tue Dec 29 14:41:54 2015 -0700
tree 670ec1f1932cba382369b15375f8fa44ab376941
parent 6e7e60003eba8bc5f2a406291601ba0de28a63eb

tests: Version 217 WSI changes.

tests/vktestframework.cpp

diff --git a/tests/vktestframework.cpp b/tests/vktestframework.cpp
index 5e1fbfa..69361cf 100644
--- a/tests/vktestframework.cpp
+++ b/tests/vktestframework.cpp
@@ -556,11 +556,23 @@
     VkFormat returnFormat;
 
 #ifdef _WIN32
-    res = vkCreateWin32SurfaceKHR(m_instance, m_connection, m_window,
-                                  NULL, &surface);
+    VkWin32SurfaceCreateInfoKHR createInfo;
+    createInfo.sType = VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR;
+    createInfo.pNext = NULL;
+    createInfo.flags = 0;
+    createInfo.connection = m_connection;
+    createInfo.window = m_window;
+
+    res = vkCreateWin32SurfaceKHR(m_instance, &createInfo, NULL, &surface);
 #else  // _WIN32
-    res = vkCreateXcbSurfaceKHR(m_instance, m_connection, m_window,
-                                NULL, &surface);
+    VkXcbSurfaceCreateInfoKHR createInfo;
+    createInfo.sType = VK_STRUCTURE_TYPE_XCB_SURFACE_CREATE_INFO_KHR;
+    createInfo.pNext = NULL;
+    createInfo.flags = 0;
+    createInfo.connection = m_connection;
+    createInfo.window = m_window;
+
+    res = vkCreateXcbSurfaceKHR(m_instance, &createInfo, NULL, &surface);
 #endif // _WIN32
     assert(res == VK_SUCCESS);
 
@@ -862,11 +874,23 @@
 
     // Create the WSI surface:
 #ifdef _WIN32
-    err = vkCreateWin32SurfaceKHR(m_instance, m_connection,
-                                  m_window, NULL, &m_surface);
+    VkWin32SurfaceCreateInfoKHR createInfo;
+    createInfo.sType = VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR;
+    createInfo.pNext = NULL;
+    createInfo.flags = 0;
+    createInfo.connection = m_connection;
+    createInfo.window = m_window;
+
+    err = vkCreateWin32SurfaceKHR(m_instance, &createInfo, NULL, &m_surface);
 #else  // _WIN32
-    err = vkCreateXcbSurfaceKHR(m_instance, m_connection,
-                                m_window, NULL, &m_surface);
+    VkXcbSurfaceCreateInfoKHR createInfo;
+    createInfo.sType = VK_STRUCTURE_TYPE_XCB_SURFACE_CREATE_INFO_KHR;
+    createInfo.pNext = NULL;
+    createInfo.flags = 0;
+    createInfo.connection = m_connection;
+    createInfo.window = m_window;
+
+    err = vkCreateXcbSurfaceKHR(m_instance, &createInfo, NULL, &m_surface);
 #endif // _WIN32
     assert(!err);
 
@@ -978,8 +1002,8 @@
     }
 
     VkSurfaceTransformFlagsKHR preTransform;
-    if (surfCapabilities.supportedTransforms & VK_SURFACE_TRANSFORM_NONE_BIT_KHR) {
-        preTransform = VK_SURFACE_TRANSFORM_NONE_BIT_KHR;
+    if (surfCapabilities.supportedTransforms & VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR) {
+        preTransform = VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR;
     } else {
         preTransform = surfCapabilities.currentTransform;
     }