Commit 42a149d8 authored May 14, 2019 by android-build-team Robot

Merge cherrypicks of [7508933, 7508817, 7509318, 7508934, 7509262, 7509263,...

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

parents 94fdc48f 84e46603

vulkan/libvulkan/driver.cpp

+3 −1

Original line number	Diff line number	Diff line
		@@ -945,7 +945,9 @@ VkResult EnumerateDeviceExtensionProperties(

		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;
		}
		}