Merge remote-tracking branch 'khronos/vulkan-cts-1.1.0' into pie-cts-dev
authorChris Forbes <chrisforbes@google.com>
Thu, 8 Nov 2018 16:21:59 +0000 (08:21 -0800)
committerChris Forbes <chrisforbes@google.com>
Thu, 8 Nov 2018 16:23:03 +0000 (08:23 -0800)
commit2c584d1656a1089c9ae24853c41e280ec650b220
tree3c53a2d318ea998f14c573cec3315f9621016de7
parentbe0cc29007fec5b48c1ef3744e8dcd38779a75f1
parent276b8a9ec1304d7fbeb230c1e406bad5f2bc9ede
Merge remote-tracking branch 'khronos/vulkan-cts-1.1.0' into pie-cts-dev

Regular merge, including upstream fix for b/118452882

Bug: b/118452882
Change-Id: I966a995914bfa905814ce653857c27335e825624
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp