Merge vk-gl-cts/vulkan-cts-1.2.2 into vk-gl-cts/master

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

Sun, 19 Apr 2020 13:00:16 +0000 (15:00 +0200)

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

Sun, 19 Apr 2020 13:00:16 +0000 (15:00 +0200)
author Alexander Galazin <alexander.galazin@arm.com>
Sun, 19 Apr 2020 13:00:16 +0000 (15:00 +0200)
committer Alexander Galazin <alexander.galazin@arm.com>
Sun, 19 Apr 2020 13:00:16 +0000 (15:00 +0200)
diff --cc external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
Simple merge
diff --cc framework/common/tcuTexture.cpp
Simple merge
diff --cc framework/common/tcuTexture.hpp
Simple merge
diff --cc framework/common/tcuTextureUtil.cpp
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Sun, 19 Apr 2020 13:00:16 +0000 (15:00 +0200)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Sun, 19 Apr 2020 13:00:16 +0000 (15:00 +0200)
		1	2
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
framework/common/tcuTexture.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
framework/common/tcuTexture.hpp	patch \|	diff1 \|	diff2 \|	blob \| history
framework/common/tcuTextureUtil.cpp	patch \|	diff1 \|	diff2 \|	blob \| history