Merge gerrit/vulkan-cts-1.0.0 into gerrit/vulkan-cts-1.0.1
authorPyry Haulos <phaulos@google.com>
Thu, 11 Aug 2016 18:43:38 +0000 (11:43 -0700)
committerPyry Haulos <phaulos@google.com>
Thu, 11 Aug 2016 18:43:38 +0000 (11:43 -0700)
commite423e59d33b2aa1cdda780bf0f335c5bd398c374
tree6b3cf19d8c1b430fc3a22146b46f7baac9e78d58
parentdece611e72bf52674c6b5ba52a1e558edb559c02
parent1106b0194f7571aebfdf76766760d91be772d8e7
Merge gerrit/vulkan-cts-1.0.0 into gerrit/vulkan-cts-1.0.1

Change-Id: I64e15e4126afc4dde5dc95e6d766f95b6f04e30e
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp