From 10eb12968bb2c7279f28f30ca040f33a796426d0 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 15 Feb 2024 14:16:08 -0500 Subject: [PATCH] zink: clamp zink_gfx_lib_cache::stages_present for generated tcs this otherwise does not reflect reality Fixes: d786f52f1ff ("zink: prevent crash when freeing") Reviewed-by: Dave Airlie Part-of: (cherry picked from commit 36e7350e0b86080bfcb3b6db481c89a97691dacb) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_program.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 45c4a9207ea..1d9e50f6501 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3214,7 +3214,7 @@ "description": "zink: clamp zink_gfx_lib_cache::stages_present for generated tcs", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "d786f52f1ff10fba42e87530933a2a4c68de49a8", "notes": null diff --git a/src/gallium/drivers/zink/zink_program.c b/src/gallium/drivers/zink/zink_program.c index 0832772c038..5d7bd54825f 100644 --- a/src/gallium/drivers/zink/zink_program.c +++ b/src/gallium/drivers/zink/zink_program.c @@ -1006,6 +1006,8 @@ create_lib_cache(struct zink_gfx_program *prog, bool generated_tcs) { struct zink_gfx_lib_cache *libs = CALLOC_STRUCT(zink_gfx_lib_cache); libs->stages_present = prog->stages_present; + if (generated_tcs) + libs->stages_present &= ~BITFIELD_BIT(MESA_SHADER_TESS_CTRL); simple_mtx_init(&libs->lock, mtx_plain); if (generated_tcs) _mesa_set_init(&libs->libs, NULL, hash_pipeline_lib_generated_tcs, equals_pipeline_lib_generated_tcs);