Merge vk-gl-cts/vulkan-cts-1.1.5 into vk-gl-cts/vulkan-cts-1.2.0
authorAlexander Galazin <alexander.galazin@arm.com>
Fri, 3 Jul 2020 11:11:32 +0000 (13:11 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Fri, 3 Jul 2020 11:11:32 +0000 (13:11 +0200)
commitf575763b2bf27370e98a2d6990d5693dd14206b8
treef8f1f8142f2d72094fb10fd82eca48585b01e4dc
parentbb58de7157c0a2d0cd0101d69aae315b8741872b
parentb6a4314940d5f0b354ac6d62cade489887f90ef6
Merge vk-gl-cts/vulkan-cts-1.1.5 into vk-gl-cts/vulkan-cts-1.2.0

Change-Id: Iab64c9ee8090eadf98c8383996d53ff8c9f488f1
external/vulkancts/modules/vulkan/memory/vktMemoryAllocationTests.cpp
external/vulkancts/modules/vulkan/memory/vktMemoryMappingTests.cpp