commit ebe91de21e093651ebf2c4c88a22b404a2aaa645
author Jesse Hall <jessehall@google.com> Mon Sep 19 18:05:10 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Sep 19 18:05:10 2016 +0000
tree da6ebd02ed3c279909bacfe83ec90875b907d6b7
parent 9e718be5fbf6bd89cd734be635fc67c8e631e2f6
parent 7f3fdaa05968106ae32f38161d77feae53d8393c

Merge "libvulkan: Fix count returned for incomplete wsi queries" am: 75bb94fe7e am: f4171ecd58
am: 7f3fdaa059

Change-Id: I731446903759e0acefa6cd453d6d25e2c2011fd3

vulkan/libvulkan/swapchain.cpp

diff --git a/vulkan/libvulkan/swapchain.cpp b/vulkan/libvulkan/swapchain.cpp
index adc7d5c..63c597c 100644
--- a/vulkan/libvulkan/swapchain.cpp
+++ b/vulkan/libvulkan/swapchain.cpp
@@ -361,9 +361,11 @@
     if (formats) {
         if (*count < kNumFormats)
             result = VK_INCOMPLETE;
-        std::copy(kFormats, kFormats + std::min(*count, kNumFormats), formats);
+        *count = std::min(*count, kNumFormats);
+        std::copy(kFormats, kFormats + *count, formats);
+    } else {
+        *count = kNumFormats;
     }
-    *count = kNumFormats;
     return result;
 }
 
@@ -381,9 +383,11 @@
     if (modes) {
         if (*count < kNumModes)
             result = VK_INCOMPLETE;
-        std::copy(kModes, kModes + std::min(*count, kNumModes), modes);
+        *count = std::min(*count, kNumModes);
+        std::copy(kModes, kModes + *count, modes);
+    } else {
+        *count = kNumModes;
     }
-    *count = kNumModes;
     return result;
 }
 
@@ -751,8 +755,10 @@
         }
         for (uint32_t i = 0; i < n; i++)
             images[i] = swapchain.images[i].image;
+        *count = n;
+    } else {
+        *count = swapchain.num_images;
     }
-    *count = swapchain.num_images;
     return result;
 }