From f31e9658dde4df64f8917e98613ea2e3f620ceb8 Mon Sep 17 00:00:00 2001
From: Ian Elliott <ian@LunarG.com>
Date: Wed, 20 May 2015 14:54:42 -0600
Subject: wsi: Deal with drivers that don't allow query of swap-chain VkFormat.

---
 demos/tri.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/demos/tri.c b/demos/tri.c
index 18f420ce..b18434ca 100644
--- a/demos/tri.c
+++ b/demos/tri.c
@@ -1469,7 +1469,14 @@ static void demo_init_vk(struct demo *demo)
     VkDisplayWSI display;
     err = vkGetPhysicalDeviceInfo(demo->gpu, VK_PHYSICAL_DEVICE_INFO_TYPE_DISPLAY_PROPERTIES_WSI,
                                   &data_size, NULL);
-    assert(!err);
+    if (err != VK_SUCCESS) {
+        printf("The Vulkan installable client driver (ICD) does not support "
+               "querying\nfor the swap-chain image format.  Therefore, am "
+               "hardcoding this\nformat to  VK_FORMAT_B8G8R8A8_UNORM.\n");
+        fflush(stdout);
+        demo->format = VK_FORMAT_B8G8R8A8_UNORM;
+        return;
+    }
     demo->display_props = (VkDisplayPropertiesWSI *) malloc(data_size);
     err = vkGetPhysicalDeviceInfo(demo->gpu, VK_PHYSICAL_DEVICE_INFO_TYPE_DISPLAY_PROPERTIES_WSI,
                                   &data_size, demo->display_props);
-- 
cgit v1.2.3