Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Sun, 16 Jul 2017 14:02:03 +0000 (16:02 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Sun, 16 Jul 2017 14:02:03 +0000 (16:02 +0200)
commit3acbdc141b7122dcf23cb7f3b9452112ba99c14a
tree9644e816600e97852b2bb19cf5b8db1632b09ada
parent9894852dbef5b210ea688bfc4496d93eab366488
parent23b1f97782700371408f85e62087a5be4ddc1335
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

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