From 8ef098a6008860cf6a10c51adecd4a5d0c5f4aa7 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 9 May 2023 19:17:39 -0400 Subject: [PATCH] zink: compare desc set to detect bindless vars in separate shaders the bindless flag here isn't set, so this check did nothing Fixes: e3b746e3a31 ("zink: use GPL to handle (simple) separate shader objects") Part-of: --- src/gallium/drivers/zink/zink_compiler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/drivers/zink/zink_compiler.c b/src/gallium/drivers/zink/zink_compiler.c index 2e7f16cccc6..fdc296ad618 100644 --- a/src/gallium/drivers/zink/zink_compiler.c +++ b/src/gallium/drivers/zink/zink_compiler.c @@ -3760,7 +3760,7 @@ zink_shader_compile_separate(struct zink_screen *screen, struct zink_shader *zs) unsigned offsets[4]; zink_descriptor_shader_get_binding_offsets(zs, offsets); nir_foreach_variable_with_modes(var, nir, nir_var_mem_ubo | nir_var_mem_ssbo | nir_var_uniform | nir_var_image) { - if (var->data.bindless) + if (var->data.descriptor_set == screen->desc_set_id[ZINK_DESCRIPTOR_BINDLESS]) continue; var->data.descriptor_set = set; switch (var->data.mode) {