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

Change-Id: Ide2d2e48acbd9485050376f1d3a7b9f85733533e

diff --cc external/vulkancts/modules/vulkan/memory/vktMemoryAllocationTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperationMultiQueueTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperationSingleQueueTests.cpp
index 3292729,249c4ca..5d24060
--- 1/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperationSingleQueueTests.cpp
--- 2/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperationSingleQueueTests.cpp
+++ b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperationSingleQueueTests.cpp
@@@ -646,9 -645,9 +646,10 @@@ public
                {
                        TCU_THROW(NotSupportedError, "VK_KHR_portability_subset: Events are not supported by this implementation");
                }
 +#endif // CTS_USES_VULKANSC
  
-               if (!context.getTimelineSemaphoreFeatures().timelineSemaphore)
+               if (m_syncPrimitive == SYNC_PRIMITIVE_TIMELINE_SEMAPHORE &&
+                       !context.getTimelineSemaphoreFeatures().timelineSemaphore)
                        TCU_THROW(NotSupportedError, "Timeline semaphore not supported");
  
                if (m_resourceDesc.type == RESOURCE_TYPE_IMAGE)

diff --cc framework/platform/CMakeLists.txt
Simple merge