From d9094cf0cd9b5d906f9396940872ffc50c7016c5 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 8 Sep 2025 15:33:47 -0400 Subject: [PATCH] zink: set current compute prog after comparing against current compute prog not sure how this was never caught before now? cc: mesa-stable Part-of: (cherry picked from commit e21438192a7d3ddff99af5f6fd94e682b7a32d0c) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_program.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 5d1d9689ac4..98075514a6f 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -6794,7 +6794,7 @@ "description": "zink: set current compute prog after comparing against current compute prog", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/gallium/drivers/zink/zink_program.c b/src/gallium/drivers/zink/zink_program.c index dd41e963e15..7debb335124 100644 --- a/src/gallium/drivers/zink/zink_program.c +++ b/src/gallium/drivers/zink/zink_program.c @@ -2102,11 +2102,11 @@ zink_bind_cs_state(struct pipe_context *pctx, ctx->compute_pipeline_state.module_hash = 0; } ctx->compute_pipeline_state.dirty = true; - ctx->curr_compute = comp; if (comp && comp != ctx->curr_compute) { if (ctx->compute_pipeline_state.key.base.nonseamless_cube_mask) ctx->compute_dirty = true; } + ctx->curr_compute = comp; zink_select_launch_grid(ctx); }