Re-enable fence, event, barrier, and binary semaphore tests when timeline semaphores...

Components: Vulkan

VK-GL-CTS issue: 3847

Affects:
dEQP-VKSC.synchronization.op.*
dEQP-VKSC.synchronization2.op.*
dEQP-VK.synchronization.op.*
dEQP-VK.synchronization2.op.*

Change-Id: I95a0073b291f9288dcd2efae4a3302b3c98558a3

diff --git a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperationMultiQueueTests.cpp b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperationMultiQueueTests.cpp
index 54c199c92901edfadf6ceb75202a44402c07354e..84f25fb3a43df76055922a3af68c371f0bf6d9a1 100644 (file)
--- a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperationMultiQueueTests.cpp
+++ b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperationMultiQueueTests.cpp
@@ -835,7 +835,8 @@ public:
                if (m_sharingMode == VK_SHARING_MODE_CONCURRENT && queueFamilyProperties.size() < 2)
                        TCU_THROW(NotSupportedError, "Concurrent requires more than 1 queue family");
 
-               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 --git a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperationSingleQueueTests.cpp b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperationSingleQueueTests.cpp
index e50431e287a48fc4694090169327b907614ac25f..249c4ca8cd25015259b6dc126d4581b7c7e048da 100644 (file)
--- a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperationSingleQueueTests.cpp
+++ b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperationSingleQueueTests.cpp
@@ -646,7 +646,8 @@ public:
                        TCU_THROW(NotSupportedError, "VK_KHR_portability_subset: Events are not supported by this implementation");
                }
 
-               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)