Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Fri, 20 Oct 2017 09:13:01 +0000 (11:13 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Fri, 20 Oct 2017 09:13:01 +0000 (11:13 +0200)
commit65db09eab71ae86df385426f2208efe048bf5daf
tree9dea786a4048c9cfefa954bb3437bda6b638278b
parentd8d061307fd0e8e830df3fe7876c9ed74f1fe0bc
parent77d19cfad0daf5ffecede09ca98d6a6a06d2e7fc
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

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