Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Tue, 18 Dec 2018 15:23:23 +0000 (16:23 +0100)
committerAlexander Galazin <alexander.galazin@arm.com>
Tue, 18 Dec 2018 15:23:23 +0000 (16:23 +0100)
commit08a34cc1c731a779b24a78d666b77804e72c4c07
treeb5466962ab24ce3d92df1b6e1cc9b930f7006e40
parent479782dd2f47631fd9882c7b1ca51620c6df76c8
parentd3cd988ee98106b379f62ef33e7c5ac451f1e44a
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: I2931dfff2ea3c8df38fdf56b8df9f6e146d1a920
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