commit 42a149d853a6af9b6a04ef00ba644319a4c13ead
author android-build-team Robot <android-build-team-robot@google.com> Tue May 14 19:54:22 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue May 14 19:54:22 2019 +0000
tree 335e6a02646469572ab47866475e27830bf2aed5
parent 94fdc48f74c32f68ebf36453208449b31455f704
parent 84e46603cc222a82155af710ae26101eda407aca

Merge cherrypicks of [7508933, 7508817, 7509318, 7508934, 7509262, 7509263, 7509264, 7508935, 7508630, 7508631, 7508632, 7508633, 7508634, 7509319, 7508937, 7508841, 7509320, 7508842] into pi-qpr3-release

Change-Id: Ib05f62fe39f8f4888cc681ead161f854e07bf859

vulkan/libvulkan/driver.cpp

diff --git a/vulkan/libvulkan/driver.cpp b/vulkan/libvulkan/driver.cpp
index 56bc35e..19d0146 100644
--- a/vulkan/libvulkan/driver.cpp
+++ b/vulkan/libvulkan/driver.cpp
@@ -945,7 +945,9 @@
 
             memcpy(prop.extensionName, VK_KHR_SWAPCHAIN_EXTENSION_NAME,
                    sizeof(VK_KHR_SWAPCHAIN_EXTENSION_NAME));
-            prop.specVersion = VK_KHR_SWAPCHAIN_SPEC_VERSION;
+            // b/130182551 VK_KHR_SWAPCHAIN_SPEC_VERSION > 68 has structs the
+            // loader doesn't handle properly. So drop the spec version to 68.
+            prop.specVersion = 68;
         }
     }