Merge vk-gl-cts/vulkan-cts-1.0.1 into vk-gl-cts/vulkan-cts-1.0.2
authorPyry Haulos <phaulos@google.com>
Fri, 31 Mar 2017 16:38:21 +0000 (09:38 -0700)
committerPyry Haulos <phaulos@google.com>
Fri, 31 Mar 2017 16:38:21 +0000 (09:38 -0700)
1  2 
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp