Merge Google and Khronos branches
authorPyry Haulos <phaulos@google.com>
Thu, 10 Sep 2015 17:06:01 +0000 (10:06 -0700)
committerPyry Haulos <phaulos@google.com>
Thu, 10 Sep 2015 17:06:01 +0000 (10:06 -0700)
commit1c74f9b8877b4dd8db711cb8362a5f43048b9bd7
tree1d21c9b5630d2020d4cb4aa0b8ff7d6ab0e4c55b
parent7a1c178a1c557ccbf9293bc5ed1a34a3e530f48c
parent0f4a8de0815a27f11d2c2075011c6e2f89d14a72
Merge Google and Khronos branches

Change-Id: I293012b71a0f994ce7301b8171d3bf031d0bdbf2
external/vulkancts/framework/vulkan/vkImageUtil.cpp
external/vulkancts/framework/vulkan/vkImageUtil.hpp
external/vulkancts/modules/vulkan/pipeline/vktPipelineDepthTests.cpp
external/vulkancts/modules/vulkan/vktTestPackage.cpp
framework/common/tcuTextureUtil.cpp