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>

Tue, 7 Aug 2018 10:02:46 +0000 (12:02 +0200)

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

Tue, 7 Aug 2018 10:25:41 +0000 (12:25 +0200)
author Alexander Galazin <alexander.galazin@arm.com>
Tue, 7 Aug 2018 10:02:46 +0000 (12:02 +0200)
committer Alexander Galazin <alexander.galazin@arm.com>
Tue, 7 Aug 2018 10:25:41 +0000 (12:25 +0200)
diff --cc external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/binding_model/vktBindingShaderAccessTests.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/device_group/vktDeviceGroupRendering.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderBuiltinVarTests.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/synchronization/vktSynchronizationSmokeTests.cpp
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Tue, 7 Aug 2018 10:02:46 +0000 (12:02 +0200)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Tue, 7 Aug 2018 10:25:41 +0000 (12:25 +0200)
		1	2
external/vulkancts/modules/vulkan/api/vktApiObjectManagementTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/binding_model/vktBindingShaderAccessTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/device_group/vktDeviceGroupRendering.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderBuiltinVarTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/synchronization/vktSynchronizationSmokeTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history