Merge vk-gl-cts/master into vk-gl-cts/vk_khr_ray_tracing
authorAlexander Galazin <alexander.galazin@arm.com>
Mon, 20 Apr 2020 18:27:11 +0000 (20:27 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Mon, 20 Apr 2020 18:27:11 +0000 (20:27 +0200)
commit9214adc79cbc148fec8172f0a84aa242a811ae8b
tree153d65aec36ebaf9b1b65341a11e9c4a4ba4b4f5
parent75d4712e25aadb2355897b65edd5d4c5772ea97a
parent22389a0e44f458492f594ca0553a5a67cf6c7ada
Merge vk-gl-cts/master into vk-gl-cts/vk_khr_ray_tracing

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