Merge vk-gl-cts/vulkan-cts-1.2.6 into vk-glk-cts/master
authorAlexander Galazin <alexander.galazin@arm.com>
Fri, 23 Apr 2021 06:52:43 +0000 (09:52 +0300)
committerAlexander Galazin <alexander.galazin@arm.com>
Fri, 23 Apr 2021 07:16:39 +0000 (10:16 +0300)
commitdf3332db8c2cfb2505435d4bf07763c26027680a
tree46c61af8ab78f349bee9f86564e6c3660b71d79e
parentc5c9736abf3773cd8e7edb899f6e522b1d099e1d
parent231b110e0e941fa56e4a60bc89489f5799690a68
Merge vk-gl-cts/vulkan-cts-1.2.6 into vk-glk-cts/master

Change-Id: I17cce066b4beef007c29f2ec3c1ac59d7e1cdf17
android/cts/master/vk-master-2019-03-01/glsl.txt
android/cts/master/vk-master-2020-03-01/glsl.txt
android/cts/master/vk-master-2021-03-01/pipeline.txt
android/cts/master/vk-master-2021-03-01/ray-tracing-pipeline.txt
android/cts/master/vk-master/pipeline.txt
android/cts/master/vk-master/ray-tracing-pipeline.txt
external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingMiscTests.cpp
external/vulkancts/modules/vulkan/vktTestCase.cpp
external/vulkancts/mustpass/master/vk-default/pipeline.txt
external/vulkancts/mustpass/master/vk-default/ray-tracing-pipeline.txt