From 215c4f8f6fcbb6622b8dfdb87f906a46f21f37ce Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Thu, 1 Jun 2023 18:08:28 +0200 Subject: [PATCH] [dxvk] Enable VK_KHR_present_id and VK_KHR_present_wait if supported --- src/dxvk/dxvk_adapter.cpp | 47 +++++++++++++++++++++++++++++++++++++ src/dxvk/dxvk_device_info.h | 2 ++ src/dxvk/dxvk_extensions.h | 2 ++ src/vulkan/vulkan_loader.h | 4 ++++ 4 files changed, 55 insertions(+) diff --git a/src/dxvk/dxvk_adapter.cpp b/src/dxvk/dxvk_adapter.cpp index b8613b3f..d2367fdd 100644 --- a/src/dxvk/dxvk_adapter.cpp +++ b/src/dxvk/dxvk_adapter.cpp @@ -386,6 +386,19 @@ namespace dxvk { m_deviceFeatures.extSwapchainMaintenance1.swapchainMaintenance1 && instance->extensions().extSurfaceMaintenance1; + // Enable present id and present wait together, if possible + enabledFeatures.khrPresentId.presentId = + m_deviceFeatures.khrPresentId.presentId; + enabledFeatures.khrPresentWait.presentWait = + m_deviceFeatures.khrPresentId.presentId && + m_deviceFeatures.khrPresentWait.presentWait; + + // Unless we're on an Nvidia driver where these extensions are known to be broken + if (matchesDriver(VK_DRIVER_ID_NVIDIA_PROPRIETARY, 0, VK_MAKE_VERSION(535, 0, 0))) { + enabledFeatures.khrPresentId.presentId = VK_FALSE; + enabledFeatures.khrPresentWait.presentWait = VK_FALSE; + } + // Create pNext chain for additional device features initFeatureChain(enabledFeatures, devExtensions, instance->extensions()); @@ -561,6 +574,14 @@ namespace dxvk { enabledFeatures.extVertexAttributeDivisor = *reinterpret_cast(f); break; + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_ID_FEATURES_KHR: + enabledFeatures.khrPresentId = *reinterpret_cast(f); + break; + + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_WAIT_FEATURES_KHR: + enabledFeatures.khrPresentWait = *reinterpret_cast(f); + break; + default: // Ignore any unknown feature structs break; @@ -852,6 +873,16 @@ namespace dxvk { if (m_deviceExtensions.supports(VK_KHR_EXTERNAL_SEMAPHORE_WIN32_EXTENSION_NAME)) m_deviceFeatures.khrExternalSemaphoreWin32 = VK_TRUE; + if (m_deviceExtensions.supports(VK_KHR_PRESENT_ID_EXTENSION_NAME)) { + m_deviceFeatures.khrPresentId.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_ID_FEATURES_KHR; + m_deviceFeatures.khrPresentId.pNext = std::exchange(m_deviceFeatures.core.pNext, &m_deviceFeatures.khrPresentId); + } + + if (m_deviceExtensions.supports(VK_KHR_PRESENT_WAIT_EXTENSION_NAME)) { + m_deviceFeatures.khrPresentWait.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_WAIT_FEATURES_KHR; + m_deviceFeatures.khrPresentWait.pNext = std::exchange(m_deviceFeatures.core.pNext, &m_deviceFeatures.khrPresentWait); + } + if (m_deviceExtensions.supports(VK_NVX_BINARY_IMPORT_EXTENSION_NAME)) m_deviceFeatures.nvxBinaryImport = VK_TRUE; @@ -913,6 +944,8 @@ namespace dxvk { &devExtensions.khrExternalMemoryWin32, &devExtensions.khrExternalSemaphoreWin32, &devExtensions.khrPipelineLibrary, + &devExtensions.khrPresentId, + &devExtensions.khrPresentWait, &devExtensions.khrSwapchain, &devExtensions.nvxBinaryImport, &devExtensions.nvxImageViewHandle, @@ -1036,6 +1069,16 @@ namespace dxvk { if (devExtensions.nvxBinaryImport) enabledFeatures.nvxBinaryImport = VK_TRUE; + if (devExtensions.khrPresentId) { + enabledFeatures.khrPresentId.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_ID_FEATURES_KHR; + enabledFeatures.khrPresentId.pNext = std::exchange(enabledFeatures.core.pNext, &enabledFeatures.khrPresentId); + } + + if (devExtensions.khrPresentWait) { + enabledFeatures.khrPresentWait.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PRESENT_WAIT_FEATURES_KHR; + enabledFeatures.khrPresentWait.pNext = std::exchange(enabledFeatures.core.pNext, &enabledFeatures.khrPresentWait); + } + if (devExtensions.nvxImageViewHandle) enabledFeatures.nvxImageViewHandle = VK_TRUE; } @@ -1165,6 +1208,10 @@ namespace dxvk { "\n extension supported : ", features.khrExternalMemoryWin32 ? "1" : "0", "\n", VK_KHR_EXTERNAL_SEMAPHORE_WIN32_EXTENSION_NAME, "\n extension supported : ", features.khrExternalSemaphoreWin32 ? "1" : "0", + "\n", VK_KHR_PRESENT_ID_EXTENSION_NAME, + "\n presentId : ", features.khrPresentId.presentId ? "1" : "0", + "\n", VK_KHR_PRESENT_WAIT_EXTENSION_NAME, + "\n presentWait : ", features.khrPresentWait.presentWait ? "1" : "0", "\n", VK_NVX_BINARY_IMPORT_EXTENSION_NAME, "\n extension supported : ", features.nvxBinaryImport ? "1" : "0", "\n", VK_NVX_IMAGE_VIEW_HANDLE_EXTENSION_NAME, diff --git a/src/dxvk/dxvk_device_info.h b/src/dxvk/dxvk_device_info.h index 273a86ff..49762d1d 100644 --- a/src/dxvk/dxvk_device_info.h +++ b/src/dxvk/dxvk_device_info.h @@ -62,6 +62,8 @@ namespace dxvk { VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT extVertexAttributeDivisor; VkBool32 khrExternalMemoryWin32; VkBool32 khrExternalSemaphoreWin32; + VkPhysicalDevicePresentIdFeaturesKHR khrPresentId; + VkPhysicalDevicePresentWaitFeaturesKHR khrPresentWait; VkBool32 nvxBinaryImport; VkBool32 nvxImageViewHandle; }; diff --git a/src/dxvk/dxvk_extensions.h b/src/dxvk/dxvk_extensions.h index 68e6b91e..3e63135b 100644 --- a/src/dxvk/dxvk_extensions.h +++ b/src/dxvk/dxvk_extensions.h @@ -319,6 +319,8 @@ namespace dxvk { DxvkExt khrExternalMemoryWin32 = { VK_KHR_EXTERNAL_MEMORY_WIN32_EXTENSION_NAME, DxvkExtMode::Optional }; DxvkExt khrExternalSemaphoreWin32 = { VK_KHR_EXTERNAL_SEMAPHORE_WIN32_EXTENSION_NAME, DxvkExtMode::Optional }; DxvkExt khrPipelineLibrary = { VK_KHR_PIPELINE_LIBRARY_EXTENSION_NAME, DxvkExtMode::Optional }; + DxvkExt khrPresentId = { VK_KHR_PRESENT_ID_EXTENSION_NAME, DxvkExtMode::Optional }; + DxvkExt khrPresentWait = { VK_KHR_PRESENT_WAIT_EXTENSION_NAME, DxvkExtMode::Optional }; DxvkExt khrSwapchain = { VK_KHR_SWAPCHAIN_EXTENSION_NAME, DxvkExtMode::Required }; DxvkExt nvxBinaryImport = { VK_NVX_BINARY_IMPORT_EXTENSION_NAME, DxvkExtMode::Disabled }; DxvkExt nvxImageViewHandle = { VK_NVX_IMAGE_VIEW_HANDLE_EXTENSION_NAME, DxvkExtMode::Disabled }; diff --git a/src/vulkan/vulkan_loader.h b/src/vulkan/vulkan_loader.h index 5a484ad4..06c3dbf3 100644 --- a/src/vulkan/vulkan_loader.h +++ b/src/vulkan/vulkan_loader.h @@ -431,6 +431,10 @@ namespace dxvk::vk { VULKAN_FN(vkGetSemaphoreWin32HandleKHR); VULKAN_FN(vkImportSemaphoreWin32HandleKHR); #endif + + #ifdef VK_KHR_PRESENT_WAIT_EXTENSION_NAME + VULKAN_FN(vkWaitForPresentKHR); + #endif }; }