Merge vk-gl-cts/vulkan-cts-1.1.0 into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Thu, 12 Oct 2017 12:36:27 +0000 (14:36 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Thu, 12 Oct 2017 12:36:27 +0000 (14:36 +0200)
commit6bb8623da7f595ddb3b82d68df1a6a2fa471203b
tree63aee8839eeacf68c3e4fc0c9b197b34052666c9
parentb1b0890c1b653cfcee5546fb9dad505382905708
parentf657fff6019fb239326adb7f9275219650b321bd
Merge vk-gl-cts/vulkan-cts-1.1.0 into vk-gl-cts/vulkan-cts-next-dev

Change-Id: I4fe1159997a93972dc02245ec3134e8aa159461e
android/cts/master/vk-master.txt
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
external/vulkancts/mustpass/1.0.1/src/master.txt
external/vulkancts/mustpass/1.0.1/vk-default.txt
external/vulkancts/mustpass/1.0.2/src/master.txt
external/vulkancts/mustpass/1.0.2/vk-default.txt
external/vulkancts/mustpass/1.1.0/vk-default.txt