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

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

Fri, 15 Sep 2017 14:10:37 +0000 (16:10 +0200)

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

Fri, 15 Sep 2017 14:10:37 +0000 (16:10 +0200)
author Alexander Galazin <alexander.galazin@arm.com>
Fri, 15 Sep 2017 14:10:37 +0000 (16:10 +0200)
committer Alexander Galazin <alexander.galazin@arm.com>
Fri, 15 Sep 2017 14:10:37 +0000 (16:10 +0200)
diff --cc android/cts/master/vk-master.txt

index 16b10f7,2cc1a1c..dfdedb1

mode 100755,100644..100755
--- 1/android/cts/master/vk-master.txt
--- 2/android/cts/master/vk-master.txt
+++ b/android/cts/master/vk-master.txt
diff --cc external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
Simple merge
diff --cc external/vulkancts/mustpass/1.0.3/vk-default.txt

index 2a80485,45f7bf4..6c3ba48

mode 100755,100644..100755
--- 1/external/vulkancts/mustpass/1.0.3/vk-default.txt
--- 2/external/vulkancts/mustpass/1.0.3/vk-default.txt
+++ b/external/vulkancts/mustpass/1.0.3/vk-default.txt
author	Alexander Galazin <alexander.galazin@arm.com>
	Fri, 15 Sep 2017 14:10:37 +0000 (16:10 +0200)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Fri, 15 Sep 2017 14:10:37 +0000 (16:10 +0200)
		1	2
android/cts/master/vk-master.txt	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/mustpass/1.0.3/vk-default.txt	patch \|	diff1 \|	diff2 \|	blob \| history