Merge vk-gl-cts/vulkan-cts-1.1.2 into vk-gl-cts/master
authorAlexander Galazin <alexander.galazin@arm.com>
Fri, 28 Sep 2018 10:04:48 +0000 (12:04 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Fri, 28 Sep 2018 10:37:51 +0000 (12:37 +0200)
commit63d6318f87ad27d708848f7c13067c7745725b9a
treef0e7de8d7fd161da9f3a832d89306eed62baa555
parent65ac96b17b9ec096854671cf9250bdf7186fb108
parentee025b241d1d7beca503747959373786d316d6f7
Merge vk-gl-cts/vulkan-cts-1.1.2 into vk-gl-cts/master

Change-Id: I05442ba8601df834249203b12ee56de3066bbf80
16 files changed:
AndroidGen.mk
android/cts/master/vk-master.txt
external/vulkancts/framework/vulkan/vkBasicTypes.inl
external/vulkancts/framework/vulkan/vkGetStructureTypeImpl.inl
external/vulkancts/framework/vulkan/vkStrUtil.inl
external/vulkancts/framework/vulkan/vkStrUtilImpl.inl
external/vulkancts/framework/vulkan/vkStructTypes.inl
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
external/vulkancts/modules/vulkan/vktTestCase.cpp
external/vulkancts/modules/vulkan/vktTestCase.hpp
external/vulkancts/mustpass/1.1.2/src/master.txt
external/vulkancts/mustpass/1.1.2/vk-default-no-waivers.txt
external/vulkancts/mustpass/1.1.2/vk-default.txt
external/vulkancts/mustpass/1.1.3/vk-default-no-waivers.txt
external/vulkancts/mustpass/1.1.3/vk-default.txt
external/vulkancts/scripts/src/vulkan.h.in