Merge vk-gl-cts/vulkan-cts-1.2.6 into vk-gl-cts/vulkan-cts-1.2.7

author Matthew Netsch <quic_mnetsch@quicinc.com>

Fri, 22 Oct 2021 18:23:39 +0000 (14:23 -0400)

committer Matthew Netsch <quic_mnetsch@quicinc.com>

Fri, 22 Oct 2021 18:23:39 +0000 (14:23 -0400)
author Matthew Netsch <quic_mnetsch@quicinc.com>
Fri, 22 Oct 2021 18:23:39 +0000 (14:23 -0400)
committer Matthew Netsch <quic_mnetsch@quicinc.com>
Fri, 22 Oct 2021 18:23:39 +0000 (14:23 -0400)
diff --cc CMakeLists.txt
Simple merge
diff --cc external/vulkancts/framework/vulkan/vkBasicTypes.inl
Simple merge
diff --cc external/vulkancts/modules/vulkan/amber/vktAmberTestCase.cpp
Simple merge
diff --cc external/vulkancts/scripts/gen_framework.py
Simple merge
author	Matthew Netsch <quic_mnetsch@quicinc.com>
	Fri, 22 Oct 2021 18:23:39 +0000 (14:23 -0400)
committer	Matthew Netsch <quic_mnetsch@quicinc.com>
	Fri, 22 Oct 2021 18:23:39 +0000 (14:23 -0400)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/framework/vulkan/vkBasicTypes.inl	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/amber/vktAmberTestCase.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/scripts/gen_framework.py	patch \|	diff1 \|	diff2 \|	blob \| history