Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev
authorAlexander Galazin <alexander.galazin@arm.com>
Fri, 15 Nov 2019 19:58:43 +0000 (20:58 +0100)
committerAlexander Galazin <alexander.galazin@arm.com>
Fri, 15 Nov 2019 19:58:43 +0000 (20:58 +0100)
commitcfbb25e863fcd9ffa5fefabe25795e012b350985
tree37f8b1950198466940c552364fc625bc863f454e
parent1b3102a9121b222ff1a33c79d7ab62ad156a7424
parent5e336e89a0c126bf424b43edaeeb12f6945d922b
Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: I19ccfea0f9e5a9b60623538a94df36266f11673c
android/cts/master/vk-master.txt
external/vulkancts/modules/vulkan/synchronization/vktSynchronizationCrossInstanceSharingTests.cpp
external/vulkancts/mustpass/master/vk-default-no-waivers.txt
external/vulkancts/mustpass/master/vk-default.txt