fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 21:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

zink: do bindless init when binding a bindless shader, not on create

Browse source 
this avoids doing bindless init in multi-context scenarios where one
context is used solely for shader compilation

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37139>
This commit is contained in:
Mike Blumenkrantz 2025-09-02 10:51:31 -04:00 • committed by Marge Bot
parent e21438192a
commit 1e07f58c62
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/gallium/drivers/zink/zink_program.c
View file

@ -1532,6 +1532,7 @@ create_compute_program(struct zink_context *ctx, nir_shader *nir)
if (!comp)
return NULL;
simple_mtx_init(&comp->cache_lock, mtx_plain);
comp->uses_bindless = nir->info.uses_bindless;
comp->scratch_size = nir->scratch_size;
comp->nir = nir;
comp->num_inlinable_uniforms = nir->info.num_inlinable_uniforms;
@ -1820,6 +1821,8 @@ bind_gfx_stage(struct zink_context *ctx, mesa_shader_stage stage, struct zink_sh
if (shader) {
ctx->shader_stages |= BITFIELD_BIT(stage);
ctx->gfx_hash ^= ctx->gfx_stages[stage]->hash;
if (shader->info.uses_bindless)
zink_descriptors_init_bindless(ctx);
} else {
ctx->gfx_pipeline_state.modules[stage] = VK_NULL_HANDLE;
if (ctx->curr_program)
@ -2074,9 +2077,6 @@ zink_create_cs_state(struct pipe_context *pctx,
else
nir = (struct nir_shader *)shader->prog;
if (nir->info.uses_bindless)
zink_descriptors_init_bindless(zink_context(pctx));
return create_compute_program(zink_context(pctx), nir);
}
@ -2101,6 +2101,8 @@ zink_bind_cs_state(struct pipe_context *pctx,
if (comp && comp != ctx->curr_compute) {
if (ctx->compute_pipeline_state.key.base.nonseamless_cube_mask)
ctx->compute_dirty = true;
if (comp->uses_bindless)
zink_descriptors_init_bindless(ctx);
}
ctx->curr_compute = comp;
zink_select_launch_grid(ctx);
@ -2317,8 +2319,6 @@ zink_create_gfx_shader_state(struct pipe_context *pctx, const struct pipe_shader
if (nir->info.stage == MESA_SHADER_FRAGMENT && nir->info.fs.uses_fbfetch_output)
zink_descriptor_util_init_fbfetch(zink_context(pctx));
if (nir->info.uses_bindless)
zink_descriptors_init_bindless(zink_context(pctx));
struct zink_shader *zs = zink_shader_create(zink_screen(pctx->screen), nir);
if (zink_debug & ZINK_DEBUG_NOBGC)

1
src/gallium/drivers/zink/zink_types.h
View file

@ -1137,6 +1137,7 @@ struct zink_compute_program {
bool use_local_size;
bool has_variable_shared_mem;
bool uses_bindless;
unsigned scratch_size;