From 6f3d71f790462d7882213f537b6756b25a85e9f5 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 18 Sep 2025 13:11:47 -0400 Subject: [PATCH] zink: flag gfx pipeline_changed if switching from a shader object draw this otherwise might fail to do some updates cc: mesa-stable Part-of: --- src/gallium/drivers/zink/zink_draw.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/zink/zink_draw.cpp b/src/gallium/drivers/zink/zink_draw.cpp index 69fda1fd42d..444cc7cf6bc 100644 --- a/src/gallium/drivers/zink/zink_draw.cpp +++ b/src/gallium/drivers/zink/zink_draw.cpp @@ -272,8 +272,8 @@ update_gfx_pipeline(struct zink_context *ctx, struct zink_batch_state *bs, enum pipeline = zink_get_gfx_pipeline(ctx, ctx->curr_program, &ctx->gfx_pipeline_state, mode); } if (pipeline) { - pipeline_changed = prev_pipeline != pipeline; - if (BATCH_CHANGED || pipeline_changed || ctx->shobj_draw) + pipeline_changed = prev_pipeline != pipeline || ctx->shobj_draw; + if (BATCH_CHANGED || pipeline_changed) VKCTX(CmdBindPipeline)(bs->cmdbuf, VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline); ctx->shobj_draw = false; } else {