Merge vk-gl-cts/vulkan-cts-1.3.2 into vk-gl-cts/vulkan-cts-1.3.3

Change-Id: I36762c268b845c6acb978ea9bfdafac065ecaa59

diff --cc external/vulkancts/modules/vulkan/binding_model/vktBindingDescriptorSetRandomTests.cpp
index 6e466ca,9face24..ee63c98
--- 1/external/vulkancts/modules/vulkan/binding_model/vktBindingDescriptorSetRandomTests.cpp
--- 2/external/vulkancts/modules/vulkan/binding_model/vktBindingDescriptorSetRandomTests.cpp
+++ b/external/vulkancts/modules/vulkan/binding_model/vktBindingDescriptorSetRandomTests.cpp
@@@ -2314,8 -2228,14 +2314,15 @@@ tcu::TestStatus DescriptorSetRandomTest
        de::MovePtr<BufferWithMemory>   hitShaderBindingTable;
        de::MovePtr<BufferWithMemory>   callableShaderBindingTable;
        de::MovePtr<RayTracingPipeline> rayTracingPipeline;
 +#endif
  
+       // Disable interval watchdog timer for long shader compilations that can
+       // happen when the number of descriptor sets gets to 32 and above.
+       if (m_data.numDescriptorSets >= 32)
+       {
+               m_context.getTestContext().touchWatchdogAndDisableIntervalTimeLimit();
+       }
+ 
        if (m_data.stage == STAGE_COMPUTE)
        {
                const Unique<VkShaderModule>    shader(createShaderModule(vk, device, m_context.getBinaryCollection().get("test"), 0));

diff --cc external/vulkancts/modules/vulkan/image/vktImageLoadStoreTests.cpp
Simple merge

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