From dae144aeac6e43bd3e6af0f3f2726ed85ff39de7 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 22 Aug 2023 12:42:03 -0400 Subject: [PATCH] zink: use the "set" optimal key for prog last_variant_hash for consistency this is the key that has been set during program update for reuse everywhere else, and everything else in the driver uses it Part-of: --- src/gallium/drivers/zink/zink_program.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/zink/zink_program.c b/src/gallium/drivers/zink/zink_program.c index ef4b56b67e1..44abd6cbae0 100644 --- a/src/gallium/drivers/zink/zink_program.c +++ b/src/gallium/drivers/zink/zink_program.c @@ -469,7 +469,7 @@ generate_gfx_program_modules_optimal(struct zink_context *ctx, struct zink_scree } state->modules_changed = true; - prog->last_variant_hash = state->shader_keys_optimal.key.val; + prog->last_variant_hash = state->optimal_key; } static uint32_t @@ -693,7 +693,7 @@ update_gfx_program_optimal(struct zink_context *ctx, struct zink_gfx_program *pr bool changed = update_gfx_shader_module_optimal(ctx, prog, MESA_SHADER_TESS_CTRL); ctx->gfx_pipeline_state.modules_changed |= changed; } - prog->last_variant_hash = ctx->gfx_pipeline_state.shader_keys_optimal.key.val; + prog->last_variant_hash = ctx->gfx_pipeline_state.optimal_key; } static struct zink_gfx_program *