From e0c58688c53eef90f4fd594e47e6e351427a41b6 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 3 Apr 2023 14:18:18 -0400 Subject: [PATCH] zink: delete redundant conditional this is checked literally 2 lines above Part-of: --- src/gallium/drivers/zink/zink_program.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/drivers/zink/zink_program.c b/src/gallium/drivers/zink/zink_program.c index 2a0690d..053f656 100644 --- a/src/gallium/drivers/zink/zink_program.c +++ b/src/gallium/drivers/zink/zink_program.c @@ -751,7 +751,7 @@ zink_gfx_program_update_optimal(struct zink_context *ctx) ctx->gfx_pipeline_state.final_hash ^= ctx->curr_program->last_variant_hash; if (ctx->curr_program->is_separable) { struct zink_gfx_program *prog = ctx->curr_program; - if (prog->is_separable && !ZINK_SHADER_KEY_OPTIMAL_IS_DEFAULT(ctx->gfx_pipeline_state.optimal_key)) { + if (!ZINK_SHADER_KEY_OPTIMAL_IS_DEFAULT(ctx->gfx_pipeline_state.optimal_key)) { util_queue_fence_wait(&prog->base.cache_fence); /* shader variants can't be handled by separable programs: sync and compile */ struct hash_table *ht = &ctx->program_cache[zink_program_cache_stages(ctx->shader_stages)]; -- 2.7.4