From 68e93cce5ee013839d64e3f81642f71eaf6b1f27 Mon Sep 17 00:00:00 2001 From: Valentine Burley Date: Tue, 12 Mar 2024 10:42:21 +0100 Subject: [PATCH] nvk: Expose VK_EXT_surface/swapchain_maintenance1 Passes dEQP-VK.wsi.*.maintenance1.*. Signed-off-by: Valentine Burley Part-of: --- src/nouveau/vulkan/nvk_instance.c | 1 + src/nouveau/vulkan/nvk_physical_device.c | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/nouveau/vulkan/nvk_instance.c b/src/nouveau/vulkan/nvk_instance.c index 83ee64f1120..7a35200fcd5 100644 --- a/src/nouveau/vulkan/nvk_instance.c +++ b/src/nouveau/vulkan/nvk_instance.c @@ -28,6 +28,7 @@ static const struct vk_instance_extension_table instance_extensions = { .KHR_get_surface_capabilities2 = true, .KHR_surface = true, .KHR_surface_protected_capabilities = true, + .EXT_surface_maintenance1 = true, #endif #ifdef VK_USE_PLATFORM_WAYLAND_KHR .KHR_wayland_surface = true, diff --git a/src/nouveau/vulkan/nvk_physical_device.c b/src/nouveau/vulkan/nvk_physical_device.c index 9420fbcd782..309004d4bf5 100644 --- a/src/nouveau/vulkan/nvk_physical_device.c +++ b/src/nouveau/vulkan/nvk_physical_device.c @@ -119,7 +119,6 @@ nvk_get_device_extensions(const struct nvk_instance *instance, .KHR_multiview = true, .KHR_pipeline_executable_properties = true, .KHR_pipeline_library = true, - #ifdef NVK_USE_WSI_PLATFORM /* Hide these behind dri configs for now since we cannot implement it * reliably on all surfaces yet. There is no surface capability query @@ -221,6 +220,9 @@ nvk_get_device_extensions(const struct nvk_instance *instance, .EXT_shader_subgroup_vote = true, .EXT_shader_viewport_index_layer = info->cls_eng3d >= MAXWELL_B, .EXT_subgroup_size_control = true, +#ifdef NVK_USE_WSI_PLATFORM + .EXT_swapchain_maintenance1 = true, +#endif .EXT_texel_buffer_alignment = true, .EXT_tooling_info = true, .EXT_transform_feedback = true, @@ -506,6 +508,11 @@ nvk_get_device_features(const struct nv_device_info *info, /* VK_EXT_image_sliced_view_of_3d */ .imageSlicedViewOf3D = true, +#ifdef NVK_USE_WSI_PLATFORM + /* VK_EXT_swapchain_maintenance1 */ + .swapchainMaintenance1 = true, +#endif + /* VK_EXT_image_view_min_lod */ .minLod = true,