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

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

Fri, 8 May 2020 17:53:59 +0000 (19:53 +0200)

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

Fri, 8 May 2020 17:53:59 +0000 (19:53 +0200)
author Alexander Galazin <alexander.galazin@arm.com>
Fri, 8 May 2020 17:53:59 +0000 (19:53 +0200)
committer Alexander Galazin <alexander.galazin@arm.com>
Fri, 8 May 2020 17:53:59 +0000 (19:53 +0200)
diff --cc external/vulkancts/modules/vulkan/descriptor_indexing/vktDescriptorSetsIndexingTests.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/descriptor_indexing/vktDescriptorSetsIndexingTests.hpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/descriptor_indexing/vktDescriptorSetsIndexingTestsUtils.cpp
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Fri, 8 May 2020 17:53:59 +0000 (19:53 +0200)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Fri, 8 May 2020 17:53:59 +0000 (19:53 +0200)
		1	2
external/vulkancts/modules/vulkan/descriptor_indexing/vktDescriptorSetsIndexingTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/descriptor_indexing/vktDescriptorSetsIndexingTests.hpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/descriptor_indexing/vktDescriptorSetsIndexingTestsUtils.cpp	patch \|	diff1 \|	diff2 \|	blob \| history