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>

Thu, 30 Aug 2018 07:18:34 +0000 (09:18 +0200)

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

Thu, 30 Aug 2018 07:18:34 +0000 (09:18 +0200)
author Alexander Galazin <alexander.galazin@arm.com>
Thu, 30 Aug 2018 07:18:34 +0000 (09:18 +0200)
committer Alexander Galazin <alexander.galazin@arm.com>
Thu, 30 Aug 2018 07:18:34 +0000 (09:18 +0200)
diff --cc external/vulkancts/framework/vulkan/vkBasicTypes.inl
Simple merge
diff --cc external/vulkancts/modules/vulkan/memory/vktMemoryAllocationTests.cpp
Simple merge
diff --cc external/vulkancts/scripts/src/vulkan.h.in

index 2b083bb,15eefdc..2948ba0

mode 100755,100644..100755
--- 1/external/vulkancts/scripts/src/vulkan.h.in
--- 2/external/vulkancts/scripts/src/vulkan.h.in
+++ b/external/vulkancts/scripts/src/vulkan.h.in
author	Alexander Galazin <alexander.galazin@arm.com>
	Thu, 30 Aug 2018 07:18:34 +0000 (09:18 +0200)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Thu, 30 Aug 2018 07:18:34 +0000 (09:18 +0200)
		1	2
external/vulkancts/framework/vulkan/vkBasicTypes.inl	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/memory/vktMemoryAllocationTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/scripts/src/vulkan.h.in	patch \|	diff1 \|	diff2 \|	blob \| history