From e730b1b62bb96838c93129ac38217b3e6d677291 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 19 Feb 2024 10:23:20 -0500 Subject: [PATCH] zink: delete maxDescriptorBufferBindings checks only one descriptor buffer is used now Fixes: 13c6ad0038a ("zink: use a single descriptor buffer for all non-bindless types") Part-of: (cherry picked from commit b8b51d96b0146028ecb5c58703707fe994540119) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_screen.c | 17 ----------------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 4ed7eefb8ff..98922f33f66 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2534,7 +2534,7 @@ "description": "zink: delete maxDescriptorBufferBindings checks", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "13c6ad0038aa42f1c908ca1adecde9bebf9f2509", "notes": null diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c index 1f06a606b66..dacad5cfa82 100644 --- a/src/gallium/drivers/zink/zink_screen.c +++ b/src/gallium/drivers/zink/zink_screen.c @@ -3465,23 +3465,6 @@ zink_internal_create_screen(const struct pipe_screen_config *config, int64_t dev mesa_logw("zink: bug detected: inputAttachmentDescriptorSize(%u) > %u", (unsigned)screen->info.db_props.inputAttachmentDescriptorSize, ZINK_FBFETCH_DESCRIPTOR_SIZE); can_db = false; } - if (screen->compact_descriptors) { - if (screen->info.db_props.maxDescriptorBufferBindings < 3) { - if (zink_descriptor_mode == ZINK_DESCRIPTOR_MODE_DB) { - mesa_loge("Cannot use db descriptor mode with compact descriptors with maxDescriptorBufferBindings < 3"); - goto fail; - } - can_db = false; - } - } else { - if (screen->info.db_props.maxDescriptorBufferBindings < 5) { - if (zink_descriptor_mode == ZINK_DESCRIPTOR_MODE_DB) { - mesa_loge("Cannot use db descriptor mode with maxDescriptorBufferBindings < 5"); - goto fail; - } - can_db = false; - } - } } if (zink_descriptor_mode == ZINK_DESCRIPTOR_MODE_AUTO) { /* descriptor buffer is not performant with virt yet */