Merge vk-gl-cts/vulkan-cts-1.1.1 into vk-gl-cts/vulkan-cts-1.1.2
authorAlexander Galazin <alexander.galazin@arm.com>
Thu, 25 Oct 2018 12:20:14 +0000 (14:20 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Thu, 25 Oct 2018 12:20:14 +0000 (14:20 +0200)
commitfbf336b4ad1872e99f49e81bd9a5562d43fa13c4
tree33cf525963c2cd48317369cc73b4e09f7ba6543e
parent9429e621c48848d224e35f30a1ae45a4a079922c
parentf3f6f7ac8f6222c955da3c7a977c9afbc67d5970
Merge vk-gl-cts/vulkan-cts-1.1.1 into vk-gl-cts/vulkan-cts-1.1.2

Change-Id: Ie74a921aba656d271738734379ad7bf5ff596fa4
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
external/vulkancts/modules/vulkan/memory/vktMemoryAllocationTests.cpp