Merge vk-gl-cts/master into vk-gl-cts/vk_khr_ray_tracing
authorAlexander Galazin <alexander.galazin@arm.com>
Thu, 18 Jun 2020 10:35:54 +0000 (12:35 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Thu, 18 Jun 2020 10:35:54 +0000 (12:35 +0200)
commit7b6eae40ebf282b244f2abe594c629a6123c7634
treedef3f51d591e1fcb2ae984141f1db34139563fa7
parentdd24910590956f30da1ae82a789e57f92f72cba0
parent23498d296498a94d619a6f4ac6c58510ebeacd9a
Merge vk-gl-cts/master into vk-gl-cts/vk_khr_ray_tracing

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