commit fc00a1d4275c9f6502d56e3e54f399e27e9a314b
author Kalle Raita <kraita@google.com> Wed Feb 22 13:05:45 2017 -0800
committer Kalle Raita <kraita@google.com> Wed Feb 22 21:09:56 2017 +0000
tree dedd73c57804fa3c4d1a20a480f1ba6864bdf784
parent aec27c3014eac1f7770a8fd54ec49a90c0d42006

Extend hack to new driver version

Change I5a8bb16f0f9563e32314cff2a2a7a45760cfc356 introduced a hack
to work around driver/loader version mismatch. This change adds a new
driver version to use the same path.

Test: dEQP-VK.wsi.android.swapchain.*
Change-Id: I6db889a181710239ad9b286919cfc834271c9721

vulkan/libvulkan/swapchain.cpp

diff --git a/vulkan/libvulkan/swapchain.cpp b/vulkan/libvulkan/swapchain.cpp
index b1e3d61..31c38b7 100644
--- a/vulkan/libvulkan/swapchain.cpp
+++ b/vulkan/libvulkan/swapchain.cpp
@@ -798,7 +798,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 *