Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Mon, 25 Jun 2018 10:26:47 +0000 (12:26 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Mon, 25 Jun 2018 11:58:57 +0000 (13:58 +0200)
commit3ccf45c29b5b16822f8d5790ca3181c72dc6f7dd
tree4f73ead59d5f1860c5f7aacaa44211c46627db9d
parent56e8d4e2318dcd0bceddca4d182649f3a03be7ab
parent2ad3da270c035c302cb70ae3cd5becb94eb0fdaa
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: Ie1823e96e976fae1f9dff8851ca5321ff18161c8
AndroidGen.mk
android/cts/master/vk-master.txt
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
external/vulkancts/modules/vulkan/renderpass/vktRenderPassTests.cpp
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsm16bitStorageTests.cpp
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmComputeShaderTestUtil.hpp
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