rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-04-01 09:25:24 +02:00
Code Issues Projects Releases Wiki Activity

[dxvk] Require and always enable maintenance5 feature

Browse Source 
Now that RenderDoc has support, there's not much of a reason not to.
This commit is contained in:
Philip Rebohle 2025-03-23 22:11:09 +01:00
parent a8ad410c83
commit 6a008513f7
3 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
VP_DXVK_requirements.json
View File

@ -73,9 +73,18 @@
} }
} }
}, },
"dxvk_common_optional": { "dxvk_common_required": {
"extensions": { "extensions": {
"VK_KHR_maintenance5": 1, "VK_KHR_maintenance5": 1,
},
"features": {
"VkPhysicalDeviceMaintenance5FeaturesKHR": {
"maintenance5": true
}
}
},
"dxvk_common_optional": {
"extensions": {
"VK_KHR_present_id": 1, "VK_KHR_present_id": 1,
"VK_KHR_present_wait": 1, "VK_KHR_present_wait": 1,
"VK_KHR_swapchain_mutable_format": 1, "VK_KHR_swapchain_mutable_format": 1,
@ -87,9 +96,6 @@
"VkPhysicalDeviceFeatures": { "VkPhysicalDeviceFeatures": {
"wideLines": true "wideLines": true
}, },
"VkPhysicalDeviceMaintenance5FeaturesKHR": {
"maintenance5": true
},
"VkPhysicalDevicePresentIdFeaturesKHR": { "VkPhysicalDevicePresentIdFeaturesKHR": {
"presentId": true "presentId": true
}, },
@ -326,6 +332,7 @@
"vulkan11requirements", "vulkan11requirements",
"vulkan12requirements", "vulkan12requirements",
"vulkan13requirements", "vulkan13requirements",
"dxvk_common_required",
"d3d9_baseline" "d3d9_baseline"
] ]
}, },
@ -339,6 +346,7 @@
"vulkan11requirements", "vulkan11requirements",
"vulkan12requirements", "vulkan12requirements",
"vulkan13requirements", "vulkan13requirements",
"dxvk_common_required",
"dxvk_common_optional", "dxvk_common_optional",
"d3d9_baseline", "d3d9_baseline",
"d3d9_optional" "d3d9_optional"
@ -354,6 +362,7 @@
"vulkan11requirements", "vulkan11requirements",
"vulkan12requirements", "vulkan12requirements",
"vulkan13requirements", "vulkan13requirements",
"dxvk_common_required",
"d3d11_baseline" "d3d11_baseline"
] ]
}, },
@ -367,6 +376,7 @@
"vulkan11requirements", "vulkan11requirements",
"vulkan12requirements", "vulkan12requirements",
"vulkan13requirements", "vulkan13requirements",
"dxvk_common_required",
"d3d11_baseline", "d3d11_baseline",
"d3d11_level11_0" "d3d11_level11_0"
] ]
@ -381,6 +391,7 @@
"vulkan11requirements", "vulkan11requirements",
"vulkan12requirements", "vulkan12requirements",
"vulkan13requirements", "vulkan13requirements",
"dxvk_common_required",
"d3d11_baseline", "d3d11_baseline",
"d3d11_level11_0", "d3d11_level11_0",
"d3d11_level11_1" "d3d11_level11_1"
@ -396,6 +407,7 @@
"vulkan11requirements", "vulkan11requirements",
"vulkan12requirements", "vulkan12requirements",
"vulkan13requirements", "vulkan13requirements",
"dxvk_common_required",
"dxvk_common_optional", "dxvk_common_optional",
"d3d11_baseline", "d3d11_baseline",
"d3d11_baseline_optional", "d3d11_baseline_optional",
@ -414,6 +426,7 @@
"vulkan11requirements", "vulkan11requirements",
"vulkan12requirements", "vulkan12requirements",
"vulkan13requirements", "vulkan13requirements",
"dxvk_common_required",
"dxvk_common_optional", "dxvk_common_optional",
"d3d11_baseline", "d3d11_baseline",
"d3d11_baseline_optional", "d3d11_baseline_optional",
@ -442,6 +455,18 @@
} }
}, },
"history": [ "history": [
{
"revision": 6,
"date": "2025-03-24",
"author": "Philip Rebohle",
"comment": "Add maintenance5 to required extensions"
},
{
"revision": 5,
"date": "2025-03-16",
"author": "Philip Rebohle",
"comment": "Update profile with extensions used in 2.6"
},
{ {
"revision": 4, "revision": 4,
"date": "2022-12-18", "date": "2022-12-18",

5
src/dxvk/dxvk_adapter.cpp
View File

@ -434,9 +434,8 @@ namespace dxvk {
m_deviceFeatures.extSwapchainMaintenance1.swapchainMaintenance1 && m_deviceFeatures.extSwapchainMaintenance1.swapchainMaintenance1 &&
instance->extensions().extSurfaceMaintenance1; instance->extensions().extSurfaceMaintenance1;
// Enable maintenance features if supported // Enable maintenance features if supported. maintenance5 is required.
enabledFeatures.khrMaintenance5.maintenance5 = enabledFeatures.khrMaintenance5.maintenance5 = VK_TRUE;
m_deviceFeatures.khrMaintenance5.maintenance5;
enabledFeatures.khrMaintenance7.maintenance7 = enabledFeatures.khrMaintenance7.maintenance7 =
m_deviceFeatures.khrMaintenance7.maintenance7; m_deviceFeatures.khrMaintenance7.maintenance7;

2
src/dxvk/dxvk_extensions.h
View File

@ -322,7 +322,7 @@ namespace dxvk {
DxvkExt khrExternalMemoryWin32 = { VK_KHR_EXTERNAL_MEMORY_WIN32_EXTENSION_NAME, DxvkExtMode::Optional }; DxvkExt khrExternalMemoryWin32 = { VK_KHR_EXTERNAL_MEMORY_WIN32_EXTENSION_NAME, DxvkExtMode::Optional };
DxvkExt khrExternalSemaphoreWin32 = { VK_KHR_EXTERNAL_SEMAPHORE_WIN32_EXTENSION_NAME, DxvkExtMode::Optional }; DxvkExt khrExternalSemaphoreWin32 = { VK_KHR_EXTERNAL_SEMAPHORE_WIN32_EXTENSION_NAME, DxvkExtMode::Optional };
DxvkExt khrLoadStoreOpNone = { VK_KHR_LOAD_STORE_OP_NONE_EXTENSION_NAME, DxvkExtMode::Optional }; DxvkExt khrLoadStoreOpNone = { VK_KHR_LOAD_STORE_OP_NONE_EXTENSION_NAME, DxvkExtMode::Optional };
DxvkExt khrMaintenance5 = { VK_KHR_MAINTENANCE_5_EXTENSION_NAME, DxvkExtMode::Optional }; DxvkExt khrMaintenance5 = { VK_KHR_MAINTENANCE_5_EXTENSION_NAME, DxvkExtMode::Required };
DxvkExt khrMaintenance7 = { VK_KHR_MAINTENANCE_7_EXTENSION_NAME, DxvkExtMode::Optional }; DxvkExt khrMaintenance7 = { VK_KHR_MAINTENANCE_7_EXTENSION_NAME, DxvkExtMode::Optional };
DxvkExt khrPipelineLibrary = { VK_KHR_PIPELINE_LIBRARY_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 khrPresentId = { VK_KHR_PRESENT_ID_EXTENSION_NAME, DxvkExtMode::Optional };