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

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

Sun, 22 Sep 2019 09:16:02 +0000 (11:16 +0200)

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

Sun, 22 Sep 2019 09:16:02 +0000 (11:16 +0200)
author Alexander Galazin <alexander.galazin@arm.com>
Sun, 22 Sep 2019 09:16:02 +0000 (11:16 +0200)
committer Alexander Galazin <alexander.galazin@arm.com>
Sun, 22 Sep 2019 09:16:02 +0000 (11:16 +0200)
diff --cc external/vulkancts/modules/vulkan/fragment_shader_interlock/vktFragmentShaderInterlockBasic.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/pipeline/vktPipelineTimestampTests.cpp
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Sun, 22 Sep 2019 09:16:02 +0000 (11:16 +0200)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Sun, 22 Sep 2019 09:16:02 +0000 (11:16 +0200)
		1	2
external/vulkancts/modules/vulkan/fragment_shader_interlock/vktFragmentShaderInterlockBasic.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/pipeline/vktPipelineTimestampTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history