Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Thu, 8 Nov 2018 14:51:57 +0000 (15:51 +0100)
committerAlexander Galazin <alexander.galazin@arm.com>
Thu, 8 Nov 2018 14:51:57 +0000 (15:51 +0100)
commitbfd458fe8611eec468a04fc26545a502f40b3504
treea00f7119a3414dc6d43d9705f92d87d364a66041
parenta568f4c2872de3ca1c98d703ac9a377c65a9989d
parent0151b1f4b124f968aee0a13444350493094cadab
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: I958316132bee10f25f5e5a969ab84292bc5f3d61
android/cts/master/vk-master.txt
external/vulkancts/modules/vulkan/renderpass/vktRenderPassTests.cpp
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmGraphicsShaderTestUtil.cpp
external/vulkancts/mustpass/1.1.3/vk-default-no-waivers.txt
external/vulkancts/mustpass/1.1.3/vk-default.txt