From 7b1f40a3db825a472c1c264adea8fc4ad32b0c7e Mon Sep 17 00:00:00 2001 From: Connor Abbott Date: Thu, 22 Sep 2022 15:07:21 +0200 Subject: [PATCH] tu: Fix maxPerStageDescriptorUpdateAfterBindInputAttachments We need this to be the same as maxPerStageDescriptorInputAttachments. Fixes: d9fcf5de55a ("turnip: Enable nonuniform descriptor indexing") Part-of: (cherry picked from commit f483419c23782f0634845c031b4f783c80ccdadd) --- .pick_status.json | 2 +- src/freedreno/vulkan/tu_device.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 519546f9502..1dedd0e0a47 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1399,7 +1399,7 @@ "description": "tu: Fix maxPerStageDescriptorUpdateAfterBindInputAttachments", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "d9fcf5de55a7104037823e62284ace8a206c8898" }, diff --git a/src/freedreno/vulkan/tu_device.c b/src/freedreno/vulkan/tu_device.c index 672881464c7..4b25d559090 100644 --- a/src/freedreno/vulkan/tu_device.c +++ b/src/freedreno/vulkan/tu_device.c @@ -1016,7 +1016,7 @@ tu_get_physical_device_properties_1_2(struct tu_physical_device *pdevice, p->maxPerStageDescriptorUpdateAfterBindStorageBuffers = max_descriptor_set_size; p->maxPerStageDescriptorUpdateAfterBindSampledImages = max_descriptor_set_size; p->maxPerStageDescriptorUpdateAfterBindStorageImages = max_descriptor_set_size; - p->maxPerStageDescriptorUpdateAfterBindInputAttachments = max_descriptor_set_size; + p->maxPerStageDescriptorUpdateAfterBindInputAttachments = MAX_RTS; p->maxPerStageUpdateAfterBindResources = max_descriptor_set_size; p->maxDescriptorSetUpdateAfterBindSamplers = max_descriptor_set_size; p->maxDescriptorSetUpdateAfterBindUniformBuffers = max_descriptor_set_size; @@ -1025,7 +1025,7 @@ tu_get_physical_device_properties_1_2(struct tu_physical_device *pdevice, p->maxDescriptorSetUpdateAfterBindStorageBuffersDynamic = MAX_DYNAMIC_STORAGE_BUFFERS; p->maxDescriptorSetUpdateAfterBindSampledImages = max_descriptor_set_size; p->maxDescriptorSetUpdateAfterBindStorageImages = max_descriptor_set_size; - p->maxDescriptorSetUpdateAfterBindInputAttachments = max_descriptor_set_size; + p->maxDescriptorSetUpdateAfterBindInputAttachments = MAX_RTS; p->supportedDepthResolveModes = VK_RESOLVE_MODE_SAMPLE_ZERO_BIT; p->supportedStencilResolveModes = VK_RESOLVE_MODE_SAMPLE_ZERO_BIT;