Merge vk-gl-cts/master into vk-gl-cts/vk_khr_ray_tracing
authorAlexander Galazin <alexander.galazin@arm.com>
Mon, 1 Jun 2020 19:44:38 +0000 (21:44 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Mon, 1 Jun 2020 19:44:38 +0000 (21:44 +0200)
commitdd24910590956f30da1ae82a789e57f92f72cba0
tree54bf3d06ba72365dd2b2dbd09737081a0bf8277a
parent1f5dba684e9ff34804b92522b4d8926dd28290fc
parent98db5760834ad1cd332f8e048bbfc984e749c042
Merge vk-gl-cts/master into vk-gl-cts/vk_khr_ray_tracing

Change-Id: Ica3d55e39a49e7a37e9acd65335e37e932b42796
AndroidGen.mk
android/cts/master/vk-master-2020-03-01.txt
android/cts/master/vk-master.txt
external/vulkancts/modules/vulkan/CMakeLists.txt
external/vulkancts/modules/vulkan/vktTestPackage.cpp
external/vulkancts/mustpass/master/vk-default.txt