Merge vk-gl-cts/vulkan-cts-1.0.2 into vk-gl-cts/master
authorPyry Haulos <phaulos@google.com>
Fri, 31 Mar 2017 16:51:15 +0000 (09:51 -0700)
committerPyry Haulos <phaulos@google.com>
Fri, 31 Mar 2017 16:51:15 +0000 (09:51 -0700)
commitc0030c303933b01f431098f8f9747a9ab2e49d23
tree39ca17b1349f4d71799d63839628c1e694039b0a
parent0ec525c9bb7e925734e64bc7ddd50fe07337449d
parent38e234b24b602d525739185b861a169bb708a09b
Merge vk-gl-cts/vulkan-cts-1.0.2 into vk-gl-cts/master

Change-Id: Ia8c230b78ba4df255962fb447e989d190f636e67
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
external/vulkancts/modules/vulkan/pipeline/vktPipelineImageSamplingInstance.cpp
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
external/vulkancts/modules/vulkan/ssbo/vktSSBOLayoutCase.cpp