From f759e3b01a7852c39323d7fceea61122bd7db609 Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Fri, 12 Jul 2024 14:53:58 -0500 Subject: [PATCH] nvk: Don't advertise sparse residency on Maxwell A Fixes: 48803ac53db8 ("nvk: enable sparse residency features") Part-of: (cherry picked from commit d2177f47649bb39d8afd84eca95deabe63c447fb) --- .pick_status.json | 2 +- src/nouveau/vulkan/nvk_physical_device.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 79f64878f88..318e1d9cad4 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -164,7 +164,7 @@ "description": "nvk: Don't advertise sparse residency on Maxwell A", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "48803ac53db8daf26af70c9d2b68802d29e1128b", "notes": null diff --git a/src/nouveau/vulkan/nvk_physical_device.c b/src/nouveau/vulkan/nvk_physical_device.c index 97fe1ba4150..88b89fbb09d 100644 --- a/src/nouveau/vulkan/nvk_physical_device.c +++ b/src/nouveau/vulkan/nvk_physical_device.c @@ -299,13 +299,13 @@ nvk_get_device_features(const struct nv_device_info *info, .shaderResourceResidency = info->cls_eng3d >= VOLTA_A, .shaderResourceMinLod = info->cls_eng3d >= VOLTA_A, .sparseBinding = true, - .sparseResidency2Samples = info->cls_eng3d >= MAXWELL_A, - .sparseResidency4Samples = info->cls_eng3d >= MAXWELL_A, - .sparseResidency8Samples = info->cls_eng3d >= MAXWELL_A, - .sparseResidencyAliased = info->cls_eng3d >= MAXWELL_A, - .sparseResidencyBuffer = info->cls_eng3d >= MAXWELL_A, - .sparseResidencyImage2D = info->cls_eng3d >= MAXWELL_A, - .sparseResidencyImage3D = info->cls_eng3d >= MAXWELL_A, + .sparseResidency2Samples = info->cls_eng3d >= MAXWELL_B, + .sparseResidency4Samples = info->cls_eng3d >= MAXWELL_B, + .sparseResidency8Samples = info->cls_eng3d >= MAXWELL_B, + .sparseResidencyAliased = info->cls_eng3d >= MAXWELL_B, + .sparseResidencyBuffer = info->cls_eng3d >= MAXWELL_B, + .sparseResidencyImage2D = info->cls_eng3d >= MAXWELL_B, + .sparseResidencyImage3D = info->cls_eng3d >= MAXWELL_B, .variableMultisampleRate = true, .inheritedQueries = true,