Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

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

Tue, 16 Oct 2018 09:21:13 +0000 (11:21 +0200)

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

Tue, 16 Oct 2018 09:21:13 +0000 (11:21 +0200)
author Alexander Galazin <alexander.galazin@arm.com>
Tue, 16 Oct 2018 09:21:13 +0000 (11:21 +0200)
committer Alexander Galazin <alexander.galazin@arm.com>
Tue, 16 Oct 2018 09:21:13 +0000 (11:21 +0200)
diff --cc external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsm16bitStorageTests.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmLoopDepInfTests.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmLoopDepLenTests.cpp
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Tue, 16 Oct 2018 09:21:13 +0000 (11:21 +0200)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Tue, 16 Oct 2018 09:21:13 +0000 (11:21 +0200)
		1	2
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsm16bitStorageTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmLoopDepInfTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmLoopDepLenTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history