Merge vulkancts/vulkan-cts-1.0-dev into vulkancts/vulkan-cts-next-dev
authorPyry Haulos <phaulos@google.com>
Tue, 24 Jan 2017 00:13:11 +0000 (16:13 -0800)
committerPyry Haulos <phaulos@google.com>
Tue, 24 Jan 2017 00:13:11 +0000 (16:13 -0800)
commitc23200e2f6b894e139fdd9e93fbb7fdf084f092a
treebe40366cf73f350b6f7482d6e77e5d8ac71de883
parentcfab755397ad75a5deac3386cec3b8e87d6800b3
parentca8cfd0d24bc210c1cfeb3ded0c2c0d2492aa66b
Merge vulkancts/vulkan-cts-1.0-dev into vulkancts/vulkan-cts-next-dev

Change-Id: Ia827f021762fd1b9444fe8fac6a11b59780349cd
15 files changed:
android/cts/master/vk-master.txt
external/vulkancts/framework/vulkan/vkConcreteDeviceInterface.inl
external/vulkancts/framework/vulkan/vkConcreteInstanceInterface.inl
external/vulkancts/framework/vulkan/vkDeviceDriverImpl.inl
external/vulkancts/framework/vulkan/vkDeviceFunctionPointers.inl
external/vulkancts/framework/vulkan/vkInitDeviceFunctionPointers.inl
external/vulkancts/framework/vulkan/vkInitInstanceFunctionPointers.inl
external/vulkancts/framework/vulkan/vkInstanceDriverImpl.inl
external/vulkancts/framework/vulkan/vkInstanceFunctionPointers.inl
external/vulkancts/framework/vulkan/vkNullDriverImpl.inl
external/vulkancts/framework/vulkan/vkVirtualDeviceInterface.inl
external/vulkancts/framework/vulkan/vkVirtualInstanceInterface.inl
external/vulkancts/modules/vulkan/api/vktApiCopiesAndBlittingTests.cpp
external/vulkancts/mustpass/1.0.2/vk-default.txt
external/vulkancts/scripts/gen_framework.py