From dc1f5880e7511fb133c0c7e5730cc17dde279f51 Mon Sep 17 00:00:00 2001 From: Mary Guillemard Date: Thu, 9 Apr 2026 12:01:15 +0200 Subject: [PATCH] nvk: Adjust maxFragmentCombinedOutputResources to match max descriptors limit This was set to the lowest allowed value by spec but it should really be matching the max descriptors limit. Cc: mesa-stable Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/15249 for NVK Signed-off-by: Mary Guillemard Reviewed-by: Mel Henning (cherry picked from commit 13f98d8658e041b6761047db0ccafb585cfbd823) Part-of: --- .pick_status.json | 2 +- src/nouveau/vulkan/nvk_physical_device.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index f0b80aceb52..e36144e6e71 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -684,7 +684,7 @@ "description": "nvk: Adjust maxFragmentCombinedOutputResources to match max descriptors limit", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/nouveau/vulkan/nvk_physical_device.c b/src/nouveau/vulkan/nvk_physical_device.c index 2e63e169611..2a1f7a12fe4 100644 --- a/src/nouveau/vulkan/nvk_physical_device.c +++ b/src/nouveau/vulkan/nvk_physical_device.c @@ -835,7 +835,7 @@ nvk_get_device_properties(const struct nvk_instance *instance, .maxFragmentInputComponents = 128, .maxFragmentOutputAttachments = NVK_MAX_RTS, .maxFragmentDualSrcAttachments = 1, - .maxFragmentCombinedOutputResources = 16, + .maxFragmentCombinedOutputResources = NVK_MAX_RTS + NVK_MAX_DESCRIPTORS, /* Nvidia limits this to 48kB for consistency reasons, we could lift the * limit if we wanted to. */