Merge gerrit/vulkan-cts-1.0-dev into gerrit/vulkan-cts-next-dev
authorPyry Haulos <phaulos@google.com>
Wed, 30 Nov 2016 23:00:43 +0000 (15:00 -0800)
committerPyry Haulos <phaulos@google.com>
Wed, 30 Nov 2016 23:01:22 +0000 (15:01 -0800)
commit6e45d74d72f7453ac2cbe2d9b291989ea182ad0c
treeaa788c00e9b5aa3c51f5ba32bead9bc7fd00bca0
parentbc19844143da8ddd62352de2ff12df62aa6f03a5
parent6c5512cd33ac75f480bd9eff89db10e2fa3dd9f7
Merge gerrit/vulkan-cts-1.0-dev into gerrit/vulkan-cts-next-dev

Change-Id: I9607882c39f02327371c8dfa9f898a00883bdfd3
external/vulkancts/framework/vulkan/vkBasicTypes.inl
external/vulkancts/framework/vulkan/vkFunctionPointerTypes.inl
external/vulkancts/framework/vulkan/vkNullDriverImpl.inl
external/vulkancts/framework/vulkan/vkStrUtil.inl
external/vulkancts/framework/vulkan/vkStrUtilImpl.inl
external/vulkancts/framework/vulkan/vkStructTypes.inl
external/vulkancts/scripts/gen_framework.py