From 62e7b2091e8b4cbc34da3a0246e62655787ebcc7 Mon Sep 17 00:00:00 2001 From: Icenowy Zheng Date: Thu, 30 Apr 2026 01:02:13 +0800 Subject: [PATCH] pvr: increase maxPerStageResources for new maxPerStageDescriptorStorageBuffers When maxPerStageResources is less than 128, it must be at least the sum of maxPerStageDescriptorUniformBuffers, maxPerStageDescriptorStorageBuffers, maxPerStageDescriptorSampledImages, maxPerStageDescriptorStorageImages, maxPerStageDescriptorInputAttachments and maxColorAttachments. As maxPerStageDescriptorStorageBuffers is previously increased, the value of maxPerStageResources should be increased too. This fixes regression on two limit validation tests in the Vulkan CTS -- dEQP-VK.info.device_properties and dEQP-VK.api.info. vulkan1p2_limits_validation.general . Fixes: 35f57a27396c ("pvr: increase value of maxPerStageDescriptorStorageBuffers") Signed-off-by: Icenowy Zheng Reviewed-by: Luigi Santivetti Part-of: (cherry picked from commit 1027059baa2554afa8fa3ca4aa222861f9863a04) --- .pick_status.json | 2 +- src/imagination/vulkan/pvr_physical_device.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index fd05907fa0e..cd23cef4d7f 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2954,7 +2954,7 @@ "description": "pvr: increase maxPerStageResources for new maxPerStageDescriptorStorageBuffers", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "35f57a27396c116fc5e9984ac1254d26b83ad2c4", "notes": null diff --git a/src/imagination/vulkan/pvr_physical_device.c b/src/imagination/vulkan/pvr_physical_device.c index 4349190a390..f0192175cfc 100644 --- a/src/imagination/vulkan/pvr_physical_device.c +++ b/src/imagination/vulkan/pvr_physical_device.c @@ -584,7 +584,7 @@ static bool pvr_physical_device_get_properties( .maxPerStageDescriptorSampledImages = 16, .maxPerStageDescriptorStorageImages = 4, .maxPerStageDescriptorInputAttachments = 4, - .maxPerStageResources = 44, + .maxPerStageResources = 48, .maxDescriptorSetSamplers = 3U * 16U, .maxDescriptorSetUniformBuffers = 3U * 12U, .maxDescriptorSetUniformBuffersDynamic = 8U,