Module: Mesa Branch: main Commit: cc9fa060ee1b232e5e72077232d7b90c92dfc1bd URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cc9fa060ee1b232e5e72077232d7b90c92dfc1bd
Author: Mike Blumenkrantz <[email protected]> Date: Wed Jan 25 11:44:06 2023 -0500 zink: always set RESOURCE usage for descriptor buffers all types of descriptors may use buffer-type descriptors, even samplers cc: mesa-stable Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20912> --- src/gallium/drivers/zink/zink_descriptors.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/zink/zink_descriptors.c b/src/gallium/drivers/zink/zink_descriptors.c index 378bcc13e1e..5cb1023aaf0 100644 --- a/src/gallium/drivers/zink/zink_descriptors.c +++ b/src/gallium/drivers/zink/zink_descriptors.c @@ -1317,7 +1317,9 @@ zink_batch_descriptor_init(struct zink_screen *screen, struct zink_batch_state * for (unsigned i = 0; i < ZINK_DESCRIPTOR_NON_BINDLESS_TYPES; i++) { if (!screen->db_size[i]) continue; - unsigned bind = i == ZINK_DESCRIPTOR_TYPE_SAMPLER_VIEW ? ZINK_BIND_SAMPLER_DESCRIPTOR : ZINK_BIND_RESOURCE_DESCRIPTOR; + unsigned bind = ZINK_BIND_RESOURCE_DESCRIPTOR; + if (i == ZINK_DESCRIPTOR_TYPE_SAMPLER_VIEW) + bind |= ZINK_BIND_SAMPLER_DESCRIPTOR; if (screen->compact_descriptors && i == ZINK_DESCRIPTOR_TYPE_SAMPLER_VIEW) bind |= ZINK_BIND_RESOURCE_DESCRIPTOR; struct pipe_resource *pres = pipe_buffer_create(&screen->base, bind, 0, screen->db_size[i]);
