Merge vk-gl-cts/vulkan-cts-1.2.6 into vk-gl-cts/master
authorAlexander Galazin <alexander.galazin@arm.com>
Wed, 16 Jun 2021 09:38:56 +0000 (11:38 +0200)
committerAlexander Galazin <alexander.galazin@arm.com>
Wed, 16 Jun 2021 09:38:56 +0000 (11:38 +0200)
commit7329723d8103f4e1bfb24ea17d0455803e1774b7
tree8207605e5bc2f2523434004fe785972a4a9c65af
parent8a78c01b72a8b9235aab8089ba8c5f988547c90f
parent0082ba2c9c04fe70320f4e4e9b1635e02df05b57
Merge vk-gl-cts/vulkan-cts-1.2.6 into vk-gl-cts/master

Change-Id: I5c61c18e70c4065effbf14c1e74b6f5b4b45c358
external/vulkancts/framework/vulkan/vkRayTracingUtil.cpp
external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
external/vulkancts/modules/vulkan/ray_tracing/vktRayTracingMiscTests.cpp