From 3ebce34f0b75d0e7e5ead494cfe3b7e8b51a1824 Mon Sep 17 00:00:00 2001
From: Ian Elliott <ian@LunarG.com>
Date: Mon, 27 Jul 2015 13:53:11 -0600
Subject: tri/cube: Correct WSI swapChainPresentMode fallback is FIFO.

A copy and paste error from the spec made it seem that all ICDs will support
VK_PRESENT_MODE_IMMEDIATE_WSI (a.k.a. "immediate").  That's not true.  They all
need to support VK_PRESENT_MODE_FIFO_WSI.  Changed the comment and code so that
the preference of these demos is:

1) VK_PRESENT_MODE_MAILBOX_WSI
2) VK_PRESENT_MODE_IMMEDIATE_WSI
3) VK_PRESENT_MODE_FIFO_WSI
---
 demos/cube.c | 11 ++++++++---
 demos/tri.c  | 11 ++++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/demos/cube.c b/demos/cube.c
index d8038cfb..0c760c2b 100644
--- a/demos/cube.c
+++ b/demos/cube.c
@@ -670,15 +670,20 @@ static void demo_prepare_buffers(struct demo *demo)
     }
 
     // If mailbox mode is available, use it, as is the lowest-latency non-
-    // tearing mode.  If not, fall back to IMMEDIATE which should always be
-    // available.    
-    VkPresentModeWSI swapChainPresentMode = VK_PRESENT_MODE_IMMEDIATE_WSI;
+    // tearing mode.  If not, try IMMEDIATE which will usually be available,
+    // and is fastest (though it tears).  If not, fall back to FIFO which is
+    // always available.
+    VkPresentModeWSI swapChainPresentMode = VK_PRESENT_MODE_FIFO_WSI;
     size_t presentModeCount = presentModesSize / sizeof(VkSurfacePresentModePropertiesWSI);
     for (size_t i = 0; i < presentModeCount; i++) {
         if (presentModes[i].presentMode == VK_PRESENT_MODE_MAILBOX_WSI) {
             swapChainPresentMode = VK_PRESENT_MODE_MAILBOX_WSI;
             break;
         }
+        if ((swapChainPresentMode != VK_PRESENT_MODE_MAILBOX_WSI) &&
+            (presentModes[i].presentMode == VK_PRESENT_MODE_IMMEDIATE_WSI)) {
+            swapChainPresentMode = VK_PRESENT_MODE_IMMEDIATE_WSI;
+        }
     }
 
 #define WORK_AROUND_CODE
diff --git a/demos/tri.c b/demos/tri.c
index 20720b89..7580c997 100644
--- a/demos/tri.c
+++ b/demos/tri.c
@@ -489,15 +489,20 @@ static void demo_prepare_buffers(struct demo *demo)
     }
 
     // If mailbox mode is available, use it, as is the lowest-latency non-
-    // tearing mode.  If not, fall back to IMMEDIATE which should always be
-    // available.    
-    VkPresentModeWSI swapChainPresentMode = VK_PRESENT_MODE_IMMEDIATE_WSI;
+    // tearing mode.  If not, try IMMEDIATE which will usually be available,
+    // and is fastest (though it tears).  If not, fall back to FIFO which is
+    // always available.
+    VkPresentModeWSI swapChainPresentMode = VK_PRESENT_MODE_FIFO_WSI;
     size_t presentModeCount = presentModesSize / sizeof(VkSurfacePresentModePropertiesWSI);
     for (size_t i = 0; i < presentModeCount; i++) {
         if (presentModes[i].presentMode == VK_PRESENT_MODE_MAILBOX_WSI) {
             swapChainPresentMode = VK_PRESENT_MODE_MAILBOX_WSI;
             break;
         }
+        if ((swapChainPresentMode != VK_PRESENT_MODE_MAILBOX_WSI) &&
+            (presentModes[i].presentMode == VK_PRESENT_MODE_IMMEDIATE_WSI)) {
+            swapChainPresentMode = VK_PRESENT_MODE_IMMEDIATE_WSI;
+        }
     }
 
     // Determine the number of VkImage's to use in the swap chain (we desire to
-- 
cgit v1.2.3