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

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

Wed, 14 Aug 2019 12:04:45 +0000 (14:04 +0200)

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

Wed, 14 Aug 2019 12:04:45 +0000 (14:04 +0200)
author Alexander Galazin <alexander.galazin@arm.com>
Wed, 14 Aug 2019 12:04:45 +0000 (14:04 +0200)
committer Alexander Galazin <alexander.galazin@arm.com>
Wed, 14 Aug 2019 12:04:45 +0000 (14:04 +0200)
diff --cc external/vulkancts/modules/vulkan/draw/vktBasicDrawTests.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderBuiltinVarTests.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmIndexingTests.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmVariablePointersTests.cpp
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Wed, 14 Aug 2019 12:04:45 +0000 (14:04 +0200)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Wed, 14 Aug 2019 12:04:45 +0000 (14:04 +0200)
		1	2
external/vulkancts/modules/vulkan/draw/vktBasicDrawTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderBuiltinVarTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmIndexingTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmVariablePointersTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history