Merge vk-gl-cts/vulkan-cts-next-dev into vk-gl-cts/master
authorAlexander Galazin <alexander.galazin@arm.com>
Fri, 6 Jul 2018 14:40:37 +0000 (16:40 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Fri, 6 Jul 2018 18:35:02 +0000 (20:35 +0200)
commit3936ba804c1f146cd8914cb64bd6e9c10e2f84ce
treecb21da64ca620e2f3a23d9aa97546600566b345f
parent4882a27c48e2d137edf92ccdf853debb97221a7d
parent8a79bbbe62aa422d870848bcac0de4c075fb07d1
Merge vk-gl-cts/vulkan-cts-next-dev into vk-gl-cts/master

Change-Id: I4c564522620ff7f2bf6270b8b409c84c67804216
AndroidGen.mk
android/cts/master/vk-master.txt
external/fetch_sources.py
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
external/vulkancts/modules/vulkan/renderpass/vktRenderPassTests.cpp
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmComputeShaderTestUtil.hpp
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmGraphicsShaderTestUtil.cpp
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
external/vulkancts/mustpass/1.1.2/vk-default-no-waivers.txt
external/vulkancts/mustpass/1.1.2/vk-default.txt