From f4461b66b696ec9983544203d2945c9f5c0c7673 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 30 Apr 2026 13:00:28 -0400 Subject: [PATCH] lavapipe: fix pushconst data updating in a sequence like: * CmdPushConstants * CmdBindPipeline (doesn't use push constants) * CmdDispatch * CmdBindPipeline (uses push constants) * CmdDispatch the previous code would never update pushconsts and the second dispatch would have no valid data cc: mesa-stable Part-of: --- src/gallium/frontends/lavapipe/lvp_execute.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/gallium/frontends/lavapipe/lvp_execute.c b/src/gallium/frontends/lavapipe/lvp_execute.c index 7652a70e8f2..663d0425b72 100644 --- a/src/gallium/frontends/lavapipe/lvp_execute.c +++ b/src/gallium/frontends/lavapipe/lvp_execute.c @@ -364,7 +364,7 @@ update_pcbuf(struct rendering_state *state, mesa_shader_stage pstage, static void emit_compute_state(struct rendering_state *state) { - if (state->pcbuf_dirty[MESA_SHADER_COMPUTE]) + if (state->pcbuf_dirty[MESA_SHADER_COMPUTE] && state->has_pcbuf[MESA_SHADER_COMPUTE]) update_pcbuf(state, MESA_SHADER_COMPUTE, MESA_SHADER_COMPUTE); if (state->constbuf_dirty[MESA_SHADER_COMPUTE]) { @@ -670,9 +670,6 @@ handle_compute_shader(struct rendering_state *state, struct lvp_shader *shader) state->has_pcbuf[MESA_SHADER_COMPUTE] = shader->push_constant_size > 0; - if (!state->has_pcbuf[MESA_SHADER_COMPUTE]) - state->pcbuf_dirty[MESA_SHADER_COMPUTE] = false; - state->dispatch_info.block[0] = shader->pipeline_nir->nir->info.workgroup_size[0]; state->dispatch_info.block[1] = shader->pipeline_nir->nir->info.workgroup_size[1]; state->dispatch_info.block[2] = shader->pipeline_nir->nir->info.workgroup_size[2];