From 27d6a98638a5d3914c84ced7b4177bbc5adddedb Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 2 May 2023 12:10:27 -0400 Subject: [PATCH] zink: only unset a generated tcs if the bound tcs is the generated one this could otherwise unbind a non-generated tcs if the tes had at some point generated a tcs cc: mesa-stable 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 0e5fee2ba2c..ffda48b3d37 100644 --- a/src/gallium/drivers/zink/zink_program.c +++ b/src/gallium/drivers/zink/zink_program.c @@ -1874,7 +1874,7 @@ zink_bind_tes_state(struct pipe_context *pctx, if (!!ctx->gfx_stages[MESA_SHADER_TESS_EVAL] != !!cso) { if (!cso) { /* if unsetting a TESS that uses a generated TCS, ensure the TCS is unset */ - if (ctx->gfx_stages[MESA_SHADER_TESS_EVAL]->non_fs.generated_tcs) + if (ctx->gfx_stages[MESA_SHADER_TESS_CTRL] == ctx->gfx_stages[MESA_SHADER_TESS_EVAL]->non_fs.generated_tcs) ctx->gfx_stages[MESA_SHADER_TESS_CTRL] = NULL; } }