@@ -1150,11 +1150,21 @@ class CVulkanPhysicalDevice final : public IPhysicalDevice
11501150 m_properties.limits .shaderStencilExport = isExtensionSupported (VK_EXT_SHADER_STENCIL_EXPORT_EXTENSION_NAME);
11511151 m_properties.limits .decorateString = isExtensionSupported (VK_GOOGLE_DECORATE_STRING_EXTENSION_NAME);
11521152
1153- #ifdef _NBL_WINDOWS_API_
1154- m_properties.limits .externalFence = isExtensionSupported (VK_KHR_EXTERNAL_FENCE_FD_EXTENSION_NAME) || isExtensionSupported (VK_KHR_EXTERNAL_FENCE_WIN32_EXTENSION_NAME);
1155- m_properties.limits .externalMemory = isExtensionSupported (VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME) || isExtensionSupported (VK_KHR_EXTERNAL_MEMORY_WIN32_EXTENSION_NAME);
1156- m_properties.limits .externalSemaphore = isExtensionSupported (VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME) || isExtensionSupported (VK_KHR_EXTERNAL_SEMAPHORE_WIN32_EXTENSION_NAME);
1157- #endif
1153+ m_properties.limits .externalFence = isExtensionSupported (VK_KHR_EXTERNAL_FENCE_FD_EXTENSION_NAME)
1154+ #ifdef _NBL_WINDOWS_API_
1155+ || isExtensionSupported (VK_KHR_EXTERNAL_FENCE_WIN32_EXTENSION_NAME)
1156+ #endif
1157+ ;
1158+ m_properties.limits .externalMemory = isExtensionSupported (VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME)
1159+ #ifdef _NBL_WINDOWS_API_
1160+ || isExtensionSupported (VK_KHR_EXTERNAL_MEMORY_WIN32_EXTENSION_NAME)
1161+ #endif
1162+ ;
1163+ m_properties.limits .externalSemaphore = isExtensionSupported (VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME)
1164+ #ifdef _NBL_WINDOWS_API_
1165+ || isExtensionSupported (VK_KHR_EXTERNAL_SEMAPHORE_WIN32_EXTENSION_NAME)
1166+ #endif
1167+ ;
11581168
11591169 m_properties.limits .shaderNonSemanticInfo = isExtensionSupported (VK_KHR_SHADER_NON_SEMANTIC_INFO_EXTENSION_NAME);
11601170 m_properties.limits .fragmentShaderBarycentric = isExtensionSupported (VK_KHR_FRAGMENT_SHADER_BARYCENTRIC_EXTENSION_NAME);
@@ -1661,10 +1671,17 @@ class CVulkanPhysicalDevice final : public IPhysicalDevice
16611671 insertExtensionIfAvailable (VK_EXT_SHADER_STENCIL_EXPORT_EXTENSION_NAME); // No Extension Requirements
16621672 insertExtensionIfAvailable (VK_GOOGLE_DECORATE_STRING_EXTENSION_NAME); // No Extension Requirements
16631673
1674+ insertExtensionIfAvailable (VK_KHR_EXTERNAL_FENCE_FD_EXTENSION_NAME);
1675+ #ifdef _NBL_WINDOWS_API_
1676+ insertExtensionIfAvailable (VK_KHR_EXTERNAL_FENCE_WIN32_EXTENSION_NAME); // All Requirements Exist in Vulkan 1.1 (including instance extensions)
1677+ #endif
1678+ insertExtensionIfAvailable (VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME);
1679+ #ifdef _NBL_WINDOWS_API_
1680+ insertExtensionIfAvailable (VK_KHR_EXTERNAL_MEMORY_WIN32_EXTENSION_NAME); // All Requirements Exist in Vulkan 1.1 (including instance extensions)
1681+ #endif
1682+ insertExtensionIfAvailable (VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME);
16641683#ifdef _NBL_WINDOWS_API_
1665- insertExtensionIfAvailable (VK_KHR_EXTERNAL_FENCE_FD_EXTENSION_NAME); insertExtensionIfAvailable (VK_KHR_EXTERNAL_FENCE_WIN32_EXTENSION_NAME); // All Requirements Exist in Vulkan 1.1 (including instance extensions)
1666- insertExtensionIfAvailable (VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME); insertExtensionIfAvailable (VK_KHR_EXTERNAL_MEMORY_WIN32_EXTENSION_NAME); // All Requirements Exist in Vulkan 1.1 (including instance extensions)
1667- insertExtensionIfAvailable (VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME); insertExtensionIfAvailable (VK_KHR_EXTERNAL_SEMAPHORE_WIN32_EXTENSION_NAME); // All Requirements Exist in Vulkan 1.1 (including instance extensions)
1684+ insertExtensionIfAvailable (VK_KHR_EXTERNAL_SEMAPHORE_WIN32_EXTENSION_NAME); // All Requirements Exist in Vulkan 1.1 (including instance extensions)
16681685#endif
16691686
16701687 insertExtensionIfAvailable (VK_KHR_SHADER_NON_SEMANTIC_INFO_EXTENSION_NAME); // No Extension Requirements
0 commit comments