Merge vk-gl-cts/vulkan-cts-1.0.2 into vk-gl-cts/master
authorPyry Haulos <phaulos@google.com>
Mon, 13 Mar 2017 19:17:25 +0000 (12:17 -0700)
committerPyry Haulos <phaulos@google.com>
Mon, 13 Mar 2017 19:17:25 +0000 (12:17 -0700)
commitb96514a7601fa968671fa4b63d711dd88c81ecc8
treed87d44cb35be37a1786d48b15f48ae42d7840730
parent2f2af613bf266f8f6052976111c59241df154049
parent60d30ca8f073d85019f88ed82bebdf247086b898
Merge vk-gl-cts/vulkan-cts-1.0.2 into vk-gl-cts/master

Change-Id: Ibb96d8f1511a5e152b0460208f64c6610ba55e57
external/vulkancts/modules/vulkan/geometry/vktGeometryBasicClass.cpp
external/vulkancts/modules/vulkan/geometry/vktGeometryBasicGeometryShaderTests.cpp
external/vulkancts/modules/vulkan/image/vktImageLoadStoreTests.cpp
external/vulkancts/modules/vulkan/pipeline/vktPipelineTimestampTests.cpp