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

author Matthew Netsch <quic_mnetsch@quicinc.com>

Fri, 24 Sep 2021 15:04:24 +0000 (11:04 -0400)

committer Matthew Netsch <quic_mnetsch@quicinc.com>

Fri, 24 Sep 2021 15:04:24 +0000 (11:04 -0400)
author Matthew Netsch <quic_mnetsch@quicinc.com>
Fri, 24 Sep 2021 15:04:24 +0000 (11:04 -0400)
committer Matthew Netsch <quic_mnetsch@quicinc.com>
Fri, 24 Sep 2021 15:04:24 +0000 (11:04 -0400)
diff --cc external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
Simple merge
author	Matthew Netsch <quic_mnetsch@quicinc.com>
	Fri, 24 Sep 2021 15:04:24 +0000 (11:04 -0400)
committer	Matthew Netsch <quic_mnetsch@quicinc.com>
	Fri, 24 Sep 2021 15:04:24 +0000 (11:04 -0400)
		1	2
external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history