Merge gerrit/vulkan-cts-1.0.0 into gerrit/vulkan-cts-1.0.1
authorPyry Haulos <phaulos@google.com>
Thu, 29 Sep 2016 19:25:06 +0000 (12:25 -0700)
committerPyry Haulos <phaulos@google.com>
Thu, 29 Sep 2016 19:25:06 +0000 (12:25 -0700)
commit6547b0bda34fc553a26ba72248314920ce5f2bb2
treeb085d2331ce1d03c3c810b77f50958f55cb197de
parentb5238bb314523d457108439023b11012ca136dc5
parent651be53b2a7e987618a98c2a13fcf7350204b244
Merge gerrit/vulkan-cts-1.0.0 into gerrit/vulkan-cts-1.0.1

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