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

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

Thu, 21 Feb 2019 10:57:50 +0000 (11:57 +0100)

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

Thu, 21 Feb 2019 10:57:50 +0000 (11:57 +0100)
author Alexander Galazin <alexander.galazin@arm.com>
Thu, 21 Feb 2019 10:57:50 +0000 (11:57 +0100)
committer Alexander Galazin <alexander.galazin@arm.com>
Thu, 21 Feb 2019 10:57:50 +0000 (11:57 +0100)
diff --cc android/cts/master/vk-master.txt
Simple merge
diff --cc external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemWsiSwapchainTests.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/wsi/vktWsiSurfaceTests.cpp
Simple merge
diff --cc external/vulkancts/mustpass/1.1.4/vk-default-no-waivers.txt
Simple merge
diff --cc external/vulkancts/mustpass/1.1.4/vk-default.txt
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Thu, 21 Feb 2019 10:57:50 +0000 (11:57 +0100)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Thu, 21 Feb 2019 10:57:50 +0000 (11:57 +0100)
		1	2
android/cts/master/vk-master.txt	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemWsiSwapchainTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/wsi/vktWsiSurfaceTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/mustpass/1.1.4/vk-default-no-waivers.txt	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/mustpass/1.1.4/vk-default.txt	patch \|	diff1 \|	diff2 \|	blob \| history