Re-enable fence, event, barrier, and binary semaphore tests when timeline semaphores aren't supported
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 54c199c..84f25fb 100644
--- a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperationMultiQueueTests.cpp
+++ b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperationMultiQueueTests.cpp
@@ -835,7 +835,8 @@
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 e50431e..249c4ca 100644
--- a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperationSingleQueueTests.cpp
+++ b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationOperationSingleQueueTests.cpp
@@ -646,7 +646,8 @@
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)
