fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 11:28:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

zink: delete maxDescriptorBufferBindings checks

Browse source 
only one descriptor buffer is used now

Fixes: 13c6ad0038 ("zink: use a single descriptor buffer for all non-bindless types")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27685>
(cherry picked from commit b8b51d96b0)
This commit is contained in:
Mike Blumenkrantz 2024-02-19 10:23:20 -05:00 • committed by Eric Engestrom
parent b9def8ca05
commit e730b1b62b
2 changed files with 1 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -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

17
src/gallium/drivers/zink/zink_screen.c
View file

@ -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 */