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

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

Thu, 18 Oct 2018 10:11:32 +0000 (12:11 +0200)

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

Thu, 18 Oct 2018 10:11:32 +0000 (12:11 +0200)
author Alexander Galazin <alexander.galazin@arm.com>
Thu, 18 Oct 2018 10:11:32 +0000 (12:11 +0200)
committer Alexander Galazin <alexander.galazin@arm.com>
Thu, 18 Oct 2018 10:11:32 +0000 (12:11 +0200)
diff --cc external/fetch_sources.py

index 6ef32e6,078a5ff..078a5ff

mode 100644,100755..100644
--- 1/external/fetch_sources.py
--- 2/external/fetch_sources.py
+++ b/external/fetch_sources.py
diff --cc external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsm16bitStorageTests.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmGraphicsShaderTestUtil.cpp
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Thu, 18 Oct 2018 10:11:32 +0000 (12:11 +0200)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Thu, 18 Oct 2018 10:11:32 +0000 (12:11 +0200)
		1	2
external/fetch_sources.py	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsm16bitStorageTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmGraphicsShaderTestUtil.cpp	patch \|	diff1 \|	diff2 \|	blob \| history