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

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

Wed, 19 Sep 2018 08:11:01 +0000 (10:11 +0200)

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

Wed, 19 Sep 2018 08:11:01 +0000 (10:11 +0200)
author Alexander Galazin <alexander.galazin@arm.com>
Wed, 19 Sep 2018 08:11:01 +0000 (10:11 +0200)
committer Alexander Galazin <alexander.galazin@arm.com>
Wed, 19 Sep 2018 08:11:01 +0000 (10:11 +0200)
diff --cc external/vulkancts/modules/vulkan/image/vktImageCompressionTranscodingSupport.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemWsiSwapchainTests.cpp
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Wed, 19 Sep 2018 08:11:01 +0000 (10:11 +0200)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Wed, 19 Sep 2018 08:11:01 +0000 (10:11 +0200)
		1	2
external/vulkancts/modules/vulkan/image/vktImageCompressionTranscodingSupport.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemWsiSwapchainTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history