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

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

Thu, 5 Dec 2019 09:37:17 +0000 (10:37 +0100)

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

Thu, 5 Dec 2019 09:37:17 +0000 (10:37 +0100)
author Alexander Galazin <alexander.galazin@arm.com>
Thu, 5 Dec 2019 09:37:17 +0000 (10:37 +0100)
committer Alexander Galazin <alexander.galazin@arm.com>
Thu, 5 Dec 2019 09:37:17 +0000 (10:37 +0100)
diff --cc external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/descriptor_indexing/vktDescriptorSetsIndexingTests.cpp
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Thu, 5 Dec 2019 09:37:17 +0000 (10:37 +0100)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Thu, 5 Dec 2019 09:37:17 +0000 (10:37 +0100)
		1	2
external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/descriptor_indexing/vktDescriptorSetsIndexingTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history