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

author Alexander Galazin <alexander.galazin@arm.com>

Thu, 1 Apr 2021 16:57:27 +0000 (19:57 +0300)

committer Alexander Galazin <alexander.galazin@arm.com>

Thu, 1 Apr 2021 16:57:27 +0000 (19:57 +0300)
author Alexander Galazin <alexander.galazin@arm.com>
Thu, 1 Apr 2021 16:57:27 +0000 (19:57 +0300)
committer Alexander Galazin <alexander.galazin@arm.com>
Thu, 1 Apr 2021 16:57:27 +0000 (19:57 +0300)
diff --cc external/vulkancts/modules/vulkan/fragment_shading_rate/vktFragmentShadingRateBasic.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingBuildIndirectTests.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/wsi/vktWsiDisplayControlTests.cpp
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Thu, 1 Apr 2021 16:57:27 +0000 (19:57 +0300)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Thu, 1 Apr 2021 16:57:27 +0000 (19:57 +0300)
		1	2
external/vulkancts/modules/vulkan/fragment_shading_rate/vktFragmentShadingRateBasic.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingBuildIndirectTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/wsi/vktWsiDisplayControlTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history