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

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

Fri, 11 Aug 2017 17:34:19 +0000 (19:34 +0200)

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

Fri, 11 Aug 2017 17:34:19 +0000 (19:34 +0200)
author Alexander Galazin <alexander.galazin@arm.com>
Fri, 11 Aug 2017 17:34:19 +0000 (19:34 +0200)
committer Alexander Galazin <alexander.galazin@arm.com>
Fri, 11 Aug 2017 17:34:19 +0000 (19:34 +0200)
diff --cc external/vulkancts/modules/vulkan/api/vktApiBufferViewCreateTests.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/api/vktApiImageClearingTests.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Fri, 11 Aug 2017 17:34:19 +0000 (19:34 +0200)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Fri, 11 Aug 2017 17:34:19 +0000 (19:34 +0200)
		1	2
external/vulkancts/modules/vulkan/api/vktApiBufferViewCreateTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/api/vktApiImageClearingTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history