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

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

Fri, 21 Jul 2017 16:55:48 +0000 (18:55 +0200)

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

Fri, 21 Jul 2017 16:55:48 +0000 (18:55 +0200)
author Alexander Galazin <alexander.galazin@arm.com>
Fri, 21 Jul 2017 16:55:48 +0000 (18:55 +0200)
committer Alexander Galazin <alexander.galazin@arm.com>
Fri, 21 Jul 2017 16:55:48 +0000 (18:55 +0200)
diff --cc external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.cpp
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Fri, 21 Jul 2017 16:55:48 +0000 (18:55 +0200)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Fri, 21 Jul 2017 16:55:48 +0000 (18:55 +0200)
		1	2
external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/shaderrender/vktShaderRender.cpp	patch \|	diff1 \|	diff2 \|	blob \| history