commit 489eec01517628f1380e29c94f82a8e50189edc6
author Ian Elliott <ianelliott@google.com> Thu May 05 14:12:44 2016 -0600
committer Ian Elliott <ianelliott@google.com> Thu May 05 14:16:06 2016 -0600
tree 69ad29019bb4ccf6c5c722af5be894a33adfde94
parent 77f46caf27f8bd5d08d17a8dfc08d71ac8cc6209

tests: Fully turn on the EnableWsiBeforeUse test.

tests/layer_validation_tests.cpp

diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index cbcc071..f4d336a 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -736,7 +736,9 @@
     VkResult err;
     bool pass;
 
-    VkSurfaceKHR surface = VK_NULL_HANDLE;
+// FIXME: After we turn on this code for non-Linux platforms, uncomment the
+// following declaration (which is temporarily being moved below):
+//    VkSurfaceKHR surface = VK_NULL_HANDLE;
     VkSwapchainKHR swapchain = VK_NULL_HANDLE;
     VkSwapchainCreateInfoKHR swapchain_create_info = {};
     uint32_t swapchain_image_count = 0;
@@ -819,9 +821,13 @@
                                                      &wayland_display);
     m_errorMonitor->VerifyFound();
 #endif // VK_USE_PLATFORM_WAYLAND_KHR
+#endif // NEED_TO_TEST_THIS_ON_PLATFORM
 
 
 #if defined(VK_USE_PLATFORM_WIN32_KHR)
+// FIXME: REMOVE THIS HERE, AND UNCOMMENT ABOVE, WHEN THIS TEST HAS BEEN PORTED
+// TO NON-LINUX PLATFORMS:
+VkSurfaceKHR surface = VK_NULL_HANDLE;
     // Use the functions from the VK_KHR_win32_surface extension without
     // enabling that extension:
 
@@ -839,18 +845,20 @@
     m_errorMonitor->VerifyFound();
 
     // Tell whether win32 supports presentation:
-    struct wl_display win32_display = {};
     m_errorMonitor->SetDesiredFailureMsg(
         VK_DEBUG_REPORT_ERROR_BIT_EXT,
         "extension was not enabled for this");
-    vkGetPhysicalDeviceWin32PresentationSupportKHR(gpu(), 0,
-                                                     &win32_display);
+    vkGetPhysicalDeviceWin32PresentationSupportKHR(gpu(), 0);
     m_errorMonitor->VerifyFound();
-#endif // VK_USE_PLATFORM_WAYLAND_KHR
-#endif // NEED_TO_TEST_THIS_ON_PLATFORM
+// Set this (for now, until all platforms are supported and tested):
+#define NEED_TO_TEST_THIS_ON_PLATFORM
+#endif // VK_USE_PLATFORM_WIN32_KHR
 
 
 #if defined(VK_USE_PLATFORM_XCB_KHR)
+// FIXME: REMOVE THIS HERE, AND UNCOMMENT ABOVE, WHEN THIS TEST HAS BEEN PORTED
+// TO NON-LINUX PLATFORMS:
+VkSurfaceKHR surface = VK_NULL_HANDLE;
     // Use the functions from the VK_KHR_xcb_surface extension without enabling
     // that extension:
 
@@ -875,6 +883,8 @@
     vkGetPhysicalDeviceXcbPresentationSupportKHR(gpu(), 0, xcb_connection,
         visual_id);
     m_errorMonitor->VerifyFound();
+// Set this (for now, until all platforms are supported and tested):
+#define NEED_TO_TEST_THIS_ON_PLATFORM
 #endif // VK_USE_PLATFORM_XCB_KHR
 
 
@@ -902,12 +912,15 @@
         "extension was not enabled for this");
     vkGetPhysicalDeviceXlibPresentationSupportKHR(gpu(), 0, dpy, visual);
     m_errorMonitor->VerifyFound();
+// Set this (for now, until all platforms are supported and tested):
+#define NEED_TO_TEST_THIS_ON_PLATFORM
 #endif // VK_USE_PLATFORM_XLIB_KHR
 
 
     // Use the functions from the VK_KHR_surface extension without enabling
     // that extension:
 
+#ifdef NEED_TO_TEST_THIS_ON_PLATFORM
     // Destroy a surface:
     m_errorMonitor->SetDesiredFailureMsg(
         VK_DEBUG_REPORT_ERROR_BIT_EXT,
@@ -959,6 +972,7 @@
     pass = (err != VK_SUCCESS);
     ASSERT_TRUE(pass);
     m_errorMonitor->VerifyFound();
+#endif // NEED_TO_TEST_THIS_ON_PLATFORM
 
 
     // Use the functions from the VK_KHR_swapchain extension without enabling