Merge vk-gl-cts/master into vk-gl-cts/vk_khr_ray_tracing
authorAlexander Galazin <alexander.galazin@arm.com>
Mon, 4 May 2020 15:23:56 +0000 (17:23 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Mon, 4 May 2020 15:23:56 +0000 (17:23 +0200)
commitf85ceecfa72d0cc4be49a5ec7773041defb096a0
tree49de32c395e10184cc39cf40fb856bed845e78fe
parentff82b7d87ab72f31e160b12b8ac4a49604a5aba2
parent60972ed7fa8fb66b64e21186e7fb13dc082bdac8
Merge vk-gl-cts/master into vk-gl-cts/vk_khr_ray_tracing

Change-Id: I75398b156f93967daf2ca3c5edb5a475b3364c73
android/cts/master/vk-master-2020-03-01.txt
android/cts/master/vk-master.txt
external/vulkancts/mustpass/master/vk-default.txt