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>

Tue, 23 Apr 2019 18:10:25 +0000 (20:10 +0200)

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

Tue, 23 Apr 2019 18:10:25 +0000 (20:10 +0200)
author Alexander Galazin <alexander.galazin@arm.com>
Tue, 23 Apr 2019 18:10:25 +0000 (20:10 +0200)
committer Alexander Galazin <alexander.galazin@arm.com>
Tue, 23 Apr 2019 18:10:25 +0000 (20:10 +0200)
diff --cc external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBase.cpp
Simple merge
diff --cc external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
Simple merge
author	Alexander Galazin <alexander.galazin@arm.com>
	Tue, 23 Apr 2019 18:10:25 +0000 (20:10 +0200)
committer	Alexander Galazin <alexander.galazin@arm.com>
	Tue, 23 Apr 2019 18:10:25 +0000 (20:10 +0200)
		1	2
external/vulkancts/modules/vulkan/sparse_resources/vktSparseResourcesBase.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history