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

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

Thu, 10 Jan 2019 11:57:10 +0000 (12:57 +0100)

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

Thu, 10 Jan 2019 11:57:10 +0000 (12:57 +0100)
author Alexander Galazin <alexander.galazin@arm.com>
Thu, 10 Jan 2019 11:57:10 +0000 (12:57 +0100)
committer Alexander Galazin <alexander.galazin@arm.com>
Thu, 10 Jan 2019 11:57:10 +0000 (12:57 +0100)
diff --cc external/vulkancts/modules/vulkan/shaderexecutor/vktShaderExecutor.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Thu, 10 Jan 2019 11:57:10 +0000 (12:57 +0100)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Thu, 10 Jan 2019 11:57:10 +0000 (12:57 +0100)
		1	2
external/vulkancts/modules/vulkan/shaderexecutor/vktShaderExecutor.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history