Merge vk-gl-cts/vulkansc-cts-1.0.1 into vk-gl-cts/main

author Matthew Netsch <quic_mnetsch@quicinc.com>

Thu, 25 Aug 2022 21:02:37 +0000 (21:02 +0000)

committer Matthew Netsch <quic_mnetsch@quicinc.com>

Thu, 25 Aug 2022 21:02:37 +0000 (21:02 +0000)
author Matthew Netsch <quic_mnetsch@quicinc.com>
Thu, 25 Aug 2022 21:02:37 +0000 (21:02 +0000)
committer Matthew Netsch <quic_mnetsch@quicinc.com>
Thu, 25 Aug 2022 21:02:37 +0000 (21:02 +0000)
diff --cc AndroidGen.mk
Simple merge
diff --cc external/vulkancts/framework/vulkan/CMakeLists.txt
Simple merge
diff --cc external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
Simple merge
author	Matthew Netsch <quic_mnetsch@quicinc.com>
	Thu, 25 Aug 2022 21:02:37 +0000 (21:02 +0000)
committer	Matthew Netsch <quic_mnetsch@quicinc.com>
	Thu, 25 Aug 2022 21:02:37 +0000 (21:02 +0000)
		1	2
AndroidGen.mk	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/framework/vulkan/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp	patch \|	diff1 \|	diff2 \|	blob \| history