commit 8c47dc9136aa26ee749bbe952db04f6b2fc79399
author Chris Forbes <chrisforbes@google.com> Thu Jan 12 11:13:58 2017 +1300
committer Chris Forbes <chrisforbes@google.com> Sat Jan 14 12:46:46 2017 +1300
tree f8b9f02d7954e015554df894941a2007979a2e8a
parent 1030084d453335c379abc6f567b89124a3ddc7be

vulkan: Use GetSwapchainGrallocUsage2ANDROID where available

Test: build
Change-Id: I7df711e0760593749db050c1df843e39e4275003

vulkan/libvulkan/swapchain.cpp

diff --git a/vulkan/libvulkan/swapchain.cpp b/vulkan/libvulkan/swapchain.cpp
index b49a06c..e01cb22 100644
--- a/vulkan/libvulkan/swapchain.cpp
+++ b/vulkan/libvulkan/swapchain.cpp
@@ -586,9 +586,17 @@
         return VK_ERROR_INITIALIZATION_FAILED;
     }
 
+    VkSwapchainImageUsageFlagsANDROID swapchain_image_usage = 0;
     int gralloc_usage = 0;
-    // TODO(jessehall): Remove conditional once all drivers have been updated
-    if (dispatch.GetSwapchainGrallocUsageANDROID) {
+    if (dispatch.GetSwapchainGrallocUsage2ANDROID) {
+        result = dispatch.GetSwapchainGrallocUsage2ANDROID(
+            device, create_info->imageFormat, create_info->imageUsage,
+            swapchain_image_usage, &gralloc_usage);
+        if (result != VK_SUCCESS) {
+            ALOGE("vkGetSwapchainGrallocUsage2ANDROID failed: %d", result);
+            return VK_ERROR_INITIALIZATION_FAILED;
+        }
+    } else if (dispatch.GetSwapchainGrallocUsageANDROID) {
         result = dispatch.GetSwapchainGrallocUsageANDROID(
             device, create_info->imageFormat, create_info->imageUsage,
             &gralloc_usage);