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>

Thu, 20 Jan 2022 21:10:44 +0000 (21:10 +0000)

committer Matthew Netsch <quic_mnetsch@quicinc.com>

Thu, 20 Jan 2022 21:10:44 +0000 (21:10 +0000)
author Matthew Netsch <quic_mnetsch@quicinc.com>
Thu, 20 Jan 2022 21:10:44 +0000 (21:10 +0000)
committer Matthew Netsch <quic_mnetsch@quicinc.com>
Thu, 20 Jan 2022 21:10:44 +0000 (21:10 +0000)
diff --cc external/vulkancts/modules/vulkan/image/vktImageAtomicOperationTests.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperation.cpp
Simple merge
author	Matthew Netsch <quic_mnetsch@quicinc.com>
	Thu, 20 Jan 2022 21:10:44 +0000 (21:10 +0000)
committer	Matthew Netsch <quic_mnetsch@quicinc.com>
	Thu, 20 Jan 2022 21:10:44 +0000 (21:10 +0000)
		1	2
external/vulkancts/modules/vulkan/image/vktImageAtomicOperationTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperation.cpp	patch \|	diff1 \|	diff2 \|	blob \| history