Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Mon, 28 Oct 2019 12:22:14 +0000 (13:22 +0100)
committerAlexander Galazin <alexander.galazin@arm.com>
Mon, 28 Oct 2019 12:22:14 +0000 (13:22 +0100)
commit99b5f20b553d7c040e1a675f83ddb73f299e410b
treecfcc6af2c47ea6e73ae77d20588ba814c491cffd
parent2ac6db157a37ab1f836865b80698a8a4302b6e17
parente308673ee95572f698f9f1fed624102e47b5b0da
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

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