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

author Matthew Netsch <quic_mnetsch@quicinc.com>

Thu, 7 Apr 2022 17:48:16 +0000 (17:48 +0000)

committer Matthew Netsch <quic_mnetsch@quicinc.com>

Thu, 7 Apr 2022 17:48:16 +0000 (17:48 +0000)
author Matthew Netsch <quic_mnetsch@quicinc.com>
Thu, 7 Apr 2022 17:48:16 +0000 (17:48 +0000)
committer Matthew Netsch <quic_mnetsch@quicinc.com>
Thu, 7 Apr 2022 17:48:16 +0000 (17:48 +0000)
diff --cc external/vulkancts/framework/vulkan/vkRayTracingUtil.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/modifiers/vktModifiersTests.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/subgroups/vktSubgroupsSizeControlTests.cpp
Simple merge
author	Matthew Netsch <quic_mnetsch@quicinc.com>
	Thu, 7 Apr 2022 17:48:16 +0000 (17:48 +0000)
committer	Matthew Netsch <quic_mnetsch@quicinc.com>
	Thu, 7 Apr 2022 17:48:16 +0000 (17:48 +0000)
		1	2
external/vulkancts/framework/vulkan/vkRayTracingUtil.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/modifiers/vktModifiersTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/subgroups/vktSubgroupsSizeControlTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history