From 4442d61b16f7fb844f0fca2595f09cac86140a02 Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Thu, 29 Aug 2024 09:48:50 -0500 Subject: [PATCH] nvk: Advertise VK_KHR_maintenance7 Part-of: --- docs/features.txt | 2 +- docs/relnotes/new_features.txt | 1 + src/nouveau/vulkan/nvk_physical_device.c | 14 ++++++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/docs/features.txt b/docs/features.txt index 8eebb35d4ae..0b32ab8e133 100644 --- a/docs/features.txt +++ b/docs/features.txt @@ -528,7 +528,7 @@ Khronos extensions that are not part of any Vulkan version: VK_KHR_load_store_op_none DONE (anv, nvk, radv, tu, v3dv) VK_KHR_maintenance5 DONE (anv, lvp, nvk, radv, tu, v3dv, vn) VK_KHR_maintenance6 DONE (anv, lvp, nvk, radv, tu) - VK_KHR_maintenance7 DONE (anv, lvp, radv) + VK_KHR_maintenance7 DONE (anv, lvp, nvk, radv) VK_KHR_performance_query DONE (anv, radv/gfx10.3+, tu, v3dv) VK_KHR_pipeline_executable_properties DONE (anv, nvk, panvk, hasvk, radv, tu, v3dv) VK_KHR_pipeline_library DONE (anv, lvp, nvk, panvk, radv, tu, vn) diff --git a/docs/relnotes/new_features.txt b/docs/relnotes/new_features.txt index 0fe808986b5..c63308d5277 100644 --- a/docs/relnotes/new_features.txt +++ b/docs/relnotes/new_features.txt @@ -4,3 +4,4 @@ VK_EXT_post_depth_coverage on nvk VK_KHR_video_maintenance1 on radv VK_EXT_legacy_vertex_attributes on nvk GL_KHR_shader_subgroup on radeonsi +VK_KHR_maintenance7 on nvk diff --git a/src/nouveau/vulkan/nvk_physical_device.c b/src/nouveau/vulkan/nvk_physical_device.c index 3d4e7f44434..9e2c2200dc6 100644 --- a/src/nouveau/vulkan/nvk_physical_device.c +++ b/src/nouveau/vulkan/nvk_physical_device.c @@ -120,6 +120,7 @@ nvk_get_device_extensions(const struct nvk_instance *instance, .KHR_maintenance4 = true, .KHR_maintenance5 = true, .KHR_maintenance6 = true, + .KHR_maintenance7 = true, .KHR_map_memory2 = true, .KHR_multiview = true, .KHR_pipeline_executable_properties = true, @@ -420,6 +421,9 @@ nvk_get_device_features(const struct nv_device_info *info, /* VK_KHR_maintenance6 */ .maintenance6 = true, + /* VK_KHR_maintenance7 */ + .maintenance7 = true, + /* VK_KHR_pipeline_executable_properties */ .pipelineExecutableInfo = true, @@ -960,6 +964,16 @@ nvk_get_device_properties(const struct nvk_instance *instance, .maxCombinedImageSamplerDescriptorCount = 3, .fragmentShadingRateClampCombinerInputs = false, /* TODO */ + /* VK_KHR_maintenance7 */ + .robustFragmentShadingRateAttachmentAccess = false, + .separateDepthStencilAttachmentAccess = false, + .maxDescriptorSetTotalUniformBuffersDynamic = NVK_MAX_DYNAMIC_BUFFERS / 2, + .maxDescriptorSetTotalStorageBuffersDynamic = NVK_MAX_DYNAMIC_BUFFERS / 2, + .maxDescriptorSetTotalBuffersDynamic = NVK_MAX_DYNAMIC_BUFFERS, + .maxDescriptorSetUpdateAfterBindTotalUniformBuffersDynamic = NVK_MAX_DYNAMIC_BUFFERS / 2, + .maxDescriptorSetUpdateAfterBindTotalStorageBuffersDynamic = NVK_MAX_DYNAMIC_BUFFERS / 2, + .maxDescriptorSetUpdateAfterBindTotalBuffersDynamic = NVK_MAX_DYNAMIC_BUFFERS, + /* VK_EXT_legacy_vertex_attributes */ .nativeUnalignedPerformance = true,