From 59ccc2966d16c23d16ea9e436d086f9faecfd3fd Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 7 Feb 2023 14:50:16 -0500 Subject: [PATCH] zink: use screen indexing for bindless descriptor set in template bind Fixes: 8636717270f ("zink: add a "compact" descriptor mode") Reviewed-by: Emma Anholt Part-of: (cherry picked from commit faaf6f95cc478da6ea4f8416bdae7080d9fca77a) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_descriptors.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 326ed3f339a..9f4b3443988 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -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" }, diff --git a/src/gallium/drivers/zink/zink_descriptors.c b/src/gallium/drivers/zink/zink_descriptors.c index dfa6e8568d4..6a702d0c7e6 100644 --- a/src/gallium/drivers/zink/zink_descriptors.c +++ b/src/gallium/drivers/zink/zink_descriptors.c @@ -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; }