Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Fri, 15 Sep 2017 14:10:37 +0000 (16:10 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Fri, 15 Sep 2017 14:10:37 +0000 (16:10 +0200)
commit858f9096bb24d73afdb1839652673ecfc5423a92
tree1fdd0c7b771021abcda8843ef9a7042942fb4f07
parent9cbd59a275ea092c6e1ffed249d974054224c081
parent0da07e2a131ba7ab9d8ef345571217a63062c718
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: I6dc9711a5bb8fe51b961e3c7983f09482f98113c
android/cts/master/vk-master.txt
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
external/vulkancts/mustpass/1.0.3/vk-default.txt