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

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

Wed, 14 Aug 2019 15:09:33 +0000 (17:09 +0200)

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

Wed, 14 Aug 2019 15:09:33 +0000 (17:09 +0200)
author Alexander Galazin <alexander.galazin@arm.com>
Wed, 14 Aug 2019 15:09:33 +0000 (17:09 +0200)
committer Alexander Galazin <alexander.galazin@arm.com>
Wed, 14 Aug 2019 15:09:33 +0000 (17:09 +0200)
diff --cc external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/renderpass/vktRenderPassDepthStencilResolveTests.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotOtherTests.cpp
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Wed, 14 Aug 2019 15:09:33 +0000 (17:09 +0200)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Wed, 14 Aug 2019 15:09:33 +0000 (17:09 +0200)
		1	2
external/vulkancts/modules/vulkan/api/vktApiExternalMemoryTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/renderpass/vktRenderPassDepthStencilResolveTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/subgroups/vktSubgroupsBallotOtherTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history