Merge vk-gl-cts/vulkan-cts-1.2.4 into vk-gl-cts/vulkan-cts-1.2.5

Change-Id: I888aaa5fc93ef69f75c6f3a31ab2a02202028cbd

diff --cc external/vulkancts/framework/vulkan/vkRayTracingUtil.cpp
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkRayTracingUtil.hpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/synchronization/vktSynchronizationUtil.cpp
index bd3cf2b,ac2c7ae..e3f25c7
--- 1/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationUtil.cpp
--- 2/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationUtil.cpp
+++ b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationUtil.cpp
@@@ -24,9 -24,8 +24,10 @@@
  #include "vktSynchronizationUtil.hpp"
  #include "vkTypeUtil.hpp"
  #include "vkCmdUtil.hpp"
 +#include "vkBarrierUtil.hpp"
  #include "deStringUtil.hpp"
 +#include <set>
+ #include <limits>
  
  namespace vkt
  {

diff --cc external/vulkancts/modules/vulkan/ycbcr/vktYCbCrUtil.cpp
Simple merge

diff --cc scripts/check_build_sanity.py
Simple merge