Merge remote-tracking branch 'khronos/vulkan-cts-1.1.0' into HEAD
authorChris Forbes <chrisforbes@google.com>
Fri, 6 Jul 2018 20:20:29 +0000 (13:20 -0700)
committerChris Forbes <chrisforbes@google.com>
Fri, 6 Jul 2018 20:29:18 +0000 (20:29 +0000)
commit947ee3c60c63971b92585df3313f37cb811987ce
treee2c9e10d1fa07ba08463d37b52b8b15e6e4c873d
parent0fd6d1afa4d00ffd3da1d2d1898f32d4e879209d
parent5798776fdfc27d546cd202e2cd6578ca357d3126
Merge remote-tracking branch 'khronos/vulkan-cts-1.1.0' into HEAD

Change-Id: I2afae3b649256d7107c76e6039affc116eae2004
Bug: b/111211233
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
external/vulkancts/modules/vulkan/protected_memory/vktProtectedMemWsiSwapchainTests.cpp