Module: Mesa Branch: staging/22.3 Commit: 3aa3c2eed9721836a3fcb83ac7096a232127c582 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3aa3c2eed9721836a3fcb83ac7096a232127c582
Author: Mike Blumenkrantz <[email protected]> Date: Wed Jan 25 11:50:55 2023 -0500 zink: disable bindless texture ext with descriptor buffer it's illegal to mix-and-match DB and non-DB descriptor usage, so disable this until I finish the implementation cc: mesa-stable Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20912> (cherry picked from commit 6f7b752fdd2f5f33139dbc105da433ef6f11f112) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_screen.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 5849d148138..e369e6306c7 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -103,7 +103,7 @@ "description": "zink: disable bindless texture ext with descriptor buffer", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c index 452f48dd403..b219536a828 100644 --- a/src/gallium/drivers/zink/zink_screen.c +++ b/src/gallium/drivers/zink/zink_screen.c @@ -765,7 +765,7 @@ zink_get_param(struct pipe_screen *pscreen, enum pipe_cap param) return 1; case PIPE_CAP_BINDLESS_TEXTURE: - return screen->info.have_EXT_descriptor_indexing; + return zink_descriptor_mode != ZINK_DESCRIPTOR_MODE_DB && screen->info.have_EXT_descriptor_indexing; case PIPE_CAP_TEXTURE_BUFFER_OFFSET_ALIGNMENT: return screen->info.props.limits.minTexelBufferOffsetAlignment;
