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

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

Mon, 18 Nov 2019 12:39:36 +0000 (13:39 +0100)

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

Mon, 18 Nov 2019 12:39:36 +0000 (13:39 +0100)
author Alexander Galazin <alexander.galazin@arm.com>
Mon, 18 Nov 2019 12:39:36 +0000 (13:39 +0100)
committer Alexander Galazin <alexander.galazin@arm.com>
Mon, 18 Nov 2019 12:39:36 +0000 (13:39 +0100)
diff --cc external/vulkancts/modules/vulkan/descriptor_indexing/vktDescriptorSetsIndexingTests.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/pipeline/vktPipelineRenderToImageTests.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/transform_feedback/vktTransformFeedbackFuzzLayoutCase.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/transform_feedback/vktTransformFeedbackSimpleTests.cpp
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Mon, 18 Nov 2019 12:39:36 +0000 (13:39 +0100)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Mon, 18 Nov 2019 12:39:36 +0000 (13:39 +0100)
		1	2
external/vulkancts/modules/vulkan/descriptor_indexing/vktDescriptorSetsIndexingTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/pipeline/vktPipelineRenderToImageTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/transform_feedback/vktTransformFeedbackFuzzLayoutCase.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/transform_feedback/vktTransformFeedbackSimpleTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history