Merge vk-gl-cts/vulkan-cts-1.1.4 into vk-gl-cts/master
authorAlexander Galazin <alexander.galazin@arm.com>
Mon, 20 May 2019 12:04:25 +0000 (14:04 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Mon, 20 May 2019 12:14:36 +0000 (14:14 +0200)
commit35bc9941ef71a6b38f7f391f1382a655d3cb66a6
tree6b1851b4f13b25163dde249450a4a955011109a0
parente5b2d1b1a6988f90f713a57881b8e8064c593937
parent15b7ba5a184d39595212f9afa89c54e91c43e4ad
Merge vk-gl-cts/vulkan-cts-1.1.4 into vk-gl-cts/master

Change-Id: I703896cbce7472a65a7cc8d87d955b6b10ea3691
android/cts/master/vk-master.txt
android/cts/nyc/src/vk-master.txt
android/cts/nyc/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