Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Wed, 3 Oct 2018 07:19:37 +0000 (09:19 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Wed, 3 Oct 2018 07:19:37 +0000 (09:19 +0200)
commit6d20d970f91cbafb409eec0c1ef3bc9b01043472
tree199d5cc879693873c77013705f68fdfbd3dff3b0
parentb6e79ebd45567c31ac3f98daee042f4eaa7339aa
parent8444fc7a258240532d9ce910f54ee3e01395ebfe
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: I5eea945d0e0016bc92d34c9610a8865b1d97ed86
android/cts/master/vk-master.txt
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
external/vulkancts/mustpass/1.1.3/vk-default-no-waivers.txt
external/vulkancts/mustpass/1.1.3/vk-default.txt