Merge vk-gl-cts/vulkan-cts-1.1.3 into vk-gl-cts/vulkan-cts-1.1.4

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

Sun, 28 Apr 2019 12:33:14 +0000 (14:33 +0200)

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

Sun, 28 Apr 2019 12:33:14 +0000 (14:33 +0200)
author Alexander Galazin <alexander.galazin@arm.com>
Sun, 28 Apr 2019 12:33:14 +0000 (14:33 +0200)
committer Alexander Galazin <alexander.galazin@arm.com>
Sun, 28 Apr 2019 12:33:14 +0000 (14:33 +0200)
diff --cc external/vulkancts/modules/vulkan/pipeline/vktPipelineImageSamplingInstance.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/subgroups/vktSubgroupsTestsUtils.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/ycbcr/vktYCbCrUtil.cpp
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Sun, 28 Apr 2019 12:33:14 +0000 (14:33 +0200)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Sun, 28 Apr 2019 12:33:14 +0000 (14:33 +0200)
		1	2
external/vulkancts/modules/vulkan/pipeline/vktPipelineImageSamplingInstance.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/subgroups/vktSubgroupsTestsUtils.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/ycbcr/vktYCbCrUtil.cpp	patch \|	diff1 \|	diff2 \|	blob \| history