rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-02-21 22:54:16 +01:00
Code Issues Projects Releases Wiki Activity

[dxvk] Enable VK_NV_raw_access_chains if available

Browse Source
This commit is contained in:
Philip Rebohle 2024-03-02 16:45:48 +01:00
parent 77c7396ee1
commit c677ba9b3e
3 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/dxvk/dxvk_adapter.cpp
View File

@ -415,6 +415,10 @@ namespace dxvk {
enabledFeatures.khrPresentWait.presentWait = VK_FALSE; enabledFeatures.khrPresentWait.presentWait = VK_FALSE;
} }
// Enable raw access chains for shader backends
enabledFeatures.nvRawAccessChains.shaderRawAccessChains =
m_deviceFeatures.nvRawAccessChains.shaderRawAccessChains;
// Create pNext chain for additional device features // Create pNext chain for additional device features
initFeatureChain(enabledFeatures, devExtensions, instance->extensions()); initFeatureChain(enabledFeatures, devExtensions, instance->extensions());
@ -606,6 +610,10 @@ namespace dxvk {
enabledFeatures.khrPresentWait = *reinterpret_cast<const VkPhysicalDevicePresentWaitFeaturesKHR*>(f); enabledFeatures.khrPresentWait = *reinterpret_cast<const VkPhysicalDevicePresentWaitFeaturesKHR*>(f);
break; break;
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAW_ACCESS_CHAINS_FEATURES_NV:
enabledFeatures.nvRawAccessChains = *reinterpret_cast<const VkPhysicalDeviceRawAccessChainsFeaturesNV*>(f);
break;
default: default:
// Ignore any unknown feature structs // Ignore any unknown feature structs
break; break;
@ -927,6 +935,11 @@ namespace dxvk {
m_deviceFeatures.khrPresentWait.pNext = std::exchange(m_deviceFeatures.core.pNext, &m_deviceFeatures.khrPresentWait); m_deviceFeatures.khrPresentWait.pNext = std::exchange(m_deviceFeatures.core.pNext, &m_deviceFeatures.khrPresentWait);
} }
if (m_deviceExtensions.supports(VK_NV_RAW_ACCESS_CHAINS_EXTENSION_NAME)) {
m_deviceFeatures.nvRawAccessChains.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAW_ACCESS_CHAINS_FEATURES_NV;
m_deviceFeatures.nvRawAccessChains.pNext = std::exchange(m_deviceFeatures.core.pNext, &m_deviceFeatures.nvRawAccessChains);
}
if (m_deviceExtensions.supports(VK_NVX_BINARY_IMPORT_EXTENSION_NAME)) if (m_deviceExtensions.supports(VK_NVX_BINARY_IMPORT_EXTENSION_NAME))
m_deviceFeatures.nvxBinaryImport = VK_TRUE; m_deviceFeatures.nvxBinaryImport = VK_TRUE;
@ -994,6 +1007,7 @@ namespace dxvk {
&devExtensions.khrPresentWait, &devExtensions.khrPresentWait,
&devExtensions.khrSwapchain, &devExtensions.khrSwapchain,
&devExtensions.khrWin32KeyedMutex, &devExtensions.khrWin32KeyedMutex,
&devExtensions.nvRawAccessChains,
&devExtensions.nvxBinaryImport, &devExtensions.nvxBinaryImport,
&devExtensions.nvxImageViewHandle, &devExtensions.nvxImageViewHandle,
}}; }};
@ -1133,6 +1147,11 @@ namespace dxvk {
enabledFeatures.khrPresentWait.pNext = std::exchange(enabledFeatures.core.pNext, &enabledFeatures.khrPresentWait); enabledFeatures.khrPresentWait.pNext = std::exchange(enabledFeatures.core.pNext, &enabledFeatures.khrPresentWait);
} }
if (devExtensions.nvRawAccessChains) {
enabledFeatures.nvRawAccessChains.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAW_ACCESS_CHAINS_FEATURES_NV;
enabledFeatures.nvRawAccessChains.pNext = std::exchange(enabledFeatures.core.pNext, &enabledFeatures.nvRawAccessChains);
}
if (devExtensions.nvxBinaryImport) if (devExtensions.nvxBinaryImport)
enabledFeatures.nvxBinaryImport = VK_TRUE; enabledFeatures.nvxBinaryImport = VK_TRUE;
@ -1279,6 +1298,8 @@ namespace dxvk {
"\n presentId : ", features.khrPresentId.presentId ? "1" : "0", "\n presentId : ", features.khrPresentId.presentId ? "1" : "0",
"\n", VK_KHR_PRESENT_WAIT_EXTENSION_NAME, "\n", VK_KHR_PRESENT_WAIT_EXTENSION_NAME,
"\n presentWait : ", features.khrPresentWait.presentWait ? "1" : "0", "\n presentWait : ", features.khrPresentWait.presentWait ? "1" : "0",
"\n", VK_NV_RAW_ACCESS_CHAINS_EXTENSION_NAME,
"\n shaderRawAccessChains : ", features.nvRawAccessChains.shaderRawAccessChains ? "1" : "0",
"\n", VK_NVX_BINARY_IMPORT_EXTENSION_NAME, "\n", VK_NVX_BINARY_IMPORT_EXTENSION_NAME,
"\n extension supported : ", features.nvxBinaryImport ? "1" : "0", "\n extension supported : ", features.nvxBinaryImport ? "1" : "0",
"\n", VK_NVX_IMAGE_VIEW_HANDLE_EXTENSION_NAME, "\n", VK_NVX_IMAGE_VIEW_HANDLE_EXTENSION_NAME,

1
src/dxvk/dxvk_device_info.h
View File

@ -68,6 +68,7 @@ namespace dxvk {
VkPhysicalDeviceMaintenance5FeaturesKHR khrMaintenance5; VkPhysicalDeviceMaintenance5FeaturesKHR khrMaintenance5;
VkPhysicalDevicePresentIdFeaturesKHR khrPresentId; VkPhysicalDevicePresentIdFeaturesKHR khrPresentId;
VkPhysicalDevicePresentWaitFeaturesKHR khrPresentWait; VkPhysicalDevicePresentWaitFeaturesKHR khrPresentWait;
VkPhysicalDeviceRawAccessChainsFeaturesNV nvRawAccessChains;
VkBool32 nvxBinaryImport; VkBool32 nvxBinaryImport;
VkBool32 nvxImageViewHandle; VkBool32 nvxImageViewHandle;
VkBool32 khrWin32KeyedMutex; VkBool32 khrWin32KeyedMutex;

1
src/dxvk/dxvk_extensions.h
View File

@ -325,6 +325,7 @@ namespace dxvk {
DxvkExt khrPresentWait = { VK_KHR_PRESENT_WAIT_EXTENSION_NAME, DxvkExtMode::Optional }; DxvkExt khrPresentWait = { VK_KHR_PRESENT_WAIT_EXTENSION_NAME, DxvkExtMode::Optional };
DxvkExt khrSwapchain = { VK_KHR_SWAPCHAIN_EXTENSION_NAME, DxvkExtMode::Required }; DxvkExt khrSwapchain = { VK_KHR_SWAPCHAIN_EXTENSION_NAME, DxvkExtMode::Required };
DxvkExt khrWin32KeyedMutex = { VK_KHR_WIN32_KEYED_MUTEX_EXTENSION_NAME, DxvkExtMode::Optional }; DxvkExt khrWin32KeyedMutex = { VK_KHR_WIN32_KEYED_MUTEX_EXTENSION_NAME, DxvkExtMode::Optional };
DxvkExt nvRawAccessChains = { VK_NV_RAW_ACCESS_CHAINS_EXTENSION_NAME, DxvkExtMode::Optional };
DxvkExt nvxBinaryImport = { VK_NVX_BINARY_IMPORT_EXTENSION_NAME, DxvkExtMode::Disabled }; DxvkExt nvxBinaryImport = { VK_NVX_BINARY_IMPORT_EXTENSION_NAME, DxvkExtMode::Disabled };
DxvkExt nvxImageViewHandle = { VK_NVX_IMAGE_VIEW_HANDLE_EXTENSION_NAME, DxvkExtMode::Disabled }; DxvkExt nvxImageViewHandle = { VK_NVX_IMAGE_VIEW_HANDLE_EXTENSION_NAME, DxvkExtMode::Disabled };
}; };