commit 061fc6a2355d2958e60f57b3b36136746c53e29a
author Steve Pfetsch <spfetsch@google.com> Tue Feb 28 10:35:54 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 28 10:35:55 2017 +0000
tree 8a5bbab2c2929b604c54fe04b993703f8886c121
parent ca6c4370fde29f2a251d8091f6f5deb4b3425341
parent fc00a1d4275c9f6502d56e3e54f399e27e9a314b

Merge "Extend hack to new driver version"

vulkan/libvulkan/swapchain.cpp

diff --git a/vulkan/libvulkan/swapchain.cpp b/vulkan/libvulkan/swapchain.cpp
index 31f8796..e105922 100644
--- a/vulkan/libvulkan/swapchain.cpp
+++ b/vulkan/libvulkan/swapchain.cpp
@@ -804,7 +804,8 @@
     int gralloc_usage = 0;
     if (dispatch.GetSwapchainGrallocUsage2ANDROID) {
         uint64_t consumer_usage, producer_usage;
-        if (GetData(device).driver_version == 256587285) {
+        uint32_t driver_version = GetData(device).driver_version;
+        if (driver_version == 256587285 || driver_version == 96011958) {
             // HACK workaround for loader/driver mismatch during transition to
             // vkGetSwapchainGrallocUsage2ANDROID.
             typedef VkResult(VKAPI_PTR *