Merge vk-gl-cts/vulkan-cts-1.1.6 into vk-gl-cts/master

author Alexander Galazin <alexander.galazin@arm.com>

Mon, 18 Nov 2019 13:44:32 +0000 (14:44 +0100)

committer Alexander Galazin <alexander.galazin@arm.com>

Mon, 18 Nov 2019 13:44:32 +0000 (14:44 +0100)
author Alexander Galazin <alexander.galazin@arm.com>
Mon, 18 Nov 2019 13:44:32 +0000 (14:44 +0100)
committer Alexander Galazin <alexander.galazin@arm.com>
Mon, 18 Nov 2019 13:44:32 +0000 (14:44 +0100)
diff --cc AndroidGen.mk
Simple merge
diff --cc android/cts/master/vk-master.txt
Simple merge
diff --cc external/vulkancts/framework/vulkan/vkBasicTypes.inl
Simple merge
diff --cc external/vulkancts/framework/vulkan/vkStrUtilImpl.inl
Simple merge
diff --cc external/vulkancts/framework/vulkan/vkStructTypes.inl
Simple merge
diff --cc external/vulkancts/modules/vulkan/pipeline/vktPipelineRenderToImageTests.cpp
Simple merge
diff --cc external/vulkancts/mustpass/master/vk-default-no-waivers.txt
Simple merge
diff --cc external/vulkancts/mustpass/master/vk-default.txt
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Mon, 18 Nov 2019 13:44:32 +0000 (14:44 +0100)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Mon, 18 Nov 2019 13:44:32 +0000 (14:44 +0100)
		1	2
AndroidGen.mk	patch \|	diff1 \|	diff2 \|	blob \| history
android/cts/master/vk-master.txt	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/framework/vulkan/vkBasicTypes.inl	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/framework/vulkan/vkStrUtilImpl.inl	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/framework/vulkan/vkStructTypes.inl	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/pipeline/vktPipelineRenderToImageTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/mustpass/master/vk-default-no-waivers.txt	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/mustpass/master/vk-default.txt	patch \|	diff1 \|	diff2 \|	blob \| history