| commit | 29759e0fca7966a1cc73875c5b0c55594c2396d9 | [log] [tgz] |
|---|---|---|
| author | Jeff Bolz <jbolz@nvidia.com> | Wed Feb 09 22:17:21 2022 -0600 |
| committer | Matthew Netsch <quic_mnetsch@quicinc.com> | Thu Feb 10 16:55:57 2022 +0000 |
| tree | aab2356e6b26a3dc152ffad20fe7cf10ff4f681c | |
| parent | c6eabb4c0723feb431939c027fd9de4a6c617b9d [diff] |
Only request timeline semaphore extension if it's not in core Component: VulkanSC Affects tests: dEQP-VKSC.*timeline* Change-Id: Ic05ea877a654a965796b80ecf5875ea32d602729
diff --git a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationBasicSemaphoreTests.cpp b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationBasicSemaphoreTests.cpp index 12bc1d4..ce2529b 100644 --- a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationBasicSemaphoreTests.cpp +++ b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationBasicSemaphoreTests.cpp
@@ -405,7 +405,8 @@ std::vector<const char*> deviceExtensions; if (isTimelineSemaphore) { - deviceExtensions.push_back("VK_KHR_timeline_semaphore"); + if (!isCoreDeviceExtension(context.getUsedApiVersion(), "VK_KHR_timeline_semaphore")) + deviceExtensions.push_back("VK_KHR_timeline_semaphore"); addToChainVulkanStructure(&nextPtr, timelineSemaphoreFeatures); } if (config.type == SynchronizationType::SYNCHRONIZATION2)
diff --git a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationSmokeTests.cpp b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationSmokeTests.cpp index 52c014f..43ed315 100644 --- a/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationSmokeTests.cpp +++ b/external/vulkancts/modules/vulkan/synchronization/vktSynchronizationSmokeTests.cpp
@@ -148,7 +148,8 @@ vector<const char*> deviceExtensions; if (config.semaphoreType == VK_SEMAPHORE_TYPE_TIMELINE) { - deviceExtensions.push_back("VK_KHR_timeline_semaphore"); + if (!isCoreDeviceExtension(context.getUsedApiVersion(), "VK_KHR_timeline_semaphore")) + deviceExtensions.push_back("VK_KHR_timeline_semaphore"); addToChainVulkanStructure(&nextPtr, timelineSemaphoreFeatures); } if (config.synchronizationType == SynchronizationType::SYNCHRONIZATION2)