zink: use screen indexing for bindless descriptor set in template bind

Fixes: 8636717270 ("zink: add a "compact" descriptor mode")

Reviewed-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21169>
(cherry picked from commit faaf6f95cc)
This commit is contained in:
Mike Blumenkrantz 2023-02-07 14:50:16 -05:00 committed by Dylan Baker
parent a4b64b6c9c
commit 59ccc2966d
2 changed files with 2 additions and 2 deletions

View file

@ -490,7 +490,7 @@
"description": "zink: use screen indexing for bindless descriptor set in template bind",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 3,
"main_sha": null,
"because_sha": "8636717270f1ecd7d6a99f165f99b201c20dbf80"
},

View file

@ -1191,7 +1191,7 @@ zink_descriptors_update(struct zink_context *ctx, bool is_compute)
/* bindless descriptors are context-based and get updated elsewhere */
if (pg->dd.bindless && unlikely(!ctx->dd.bindless_bound)) {
VKCTX(CmdBindDescriptorSets)(ctx->batch.state->cmdbuf, is_compute ? VK_PIPELINE_BIND_POINT_COMPUTE : VK_PIPELINE_BIND_POINT_GRAPHICS,
pg->layout, ZINK_DESCRIPTOR_BINDLESS, 1, &ctx->dd.bindless_set,
pg->layout, screen->desc_set_id[ZINK_DESCRIPTOR_BINDLESS], 1, &ctx->dd.bindless_set,
0, NULL);
ctx->dd.bindless_bound = true;
}