From d81e54d0b7308a50f5f5ecd073fb6c649a0b37b1 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 22 Jul 2025 13:05:26 -0400 Subject: [PATCH] zink: account for generated tcs when pruning programs this otherwise doesn't remove programs from the ctx cache before deletion caselist: KHR-GL46.shader_image_size.advanced-ms-tes-float KHR-GL46.es_31_compatibility.shader_image_load_store.basic-allTargets-atomicVS KHR-GL46.es_31_compatibility.shader_storage_buffer_object.basic-std140Layout-case4-vs OR: KHR-GL46.shader_atomic_counters.basic-usage-tes KHR-GL46.es_31_compatibility.shader_storage_buffer_object.basic-stdLayout-case1-vs cc: mesa-stable Part-of: (cherry picked from commit f83b36f9561276037a25b216e59b1ba8125d12b6) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_compiler.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 88be2cbe521..4f8699e60ba 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -3564,7 +3564,7 @@ "description": "zink: account for generated tcs when pruning programs", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/gallium/drivers/zink/zink_compiler.c b/src/gallium/drivers/zink/zink_compiler.c index c676be269a0..1d751d51495 100644 --- a/src/gallium/drivers/zink/zink_compiler.c +++ b/src/gallium/drivers/zink/zink_compiler.c @@ -6443,11 +6443,14 @@ gfx_shader_prune(struct zink_screen *screen, struct zink_shader *shader) assert(stage < ZINK_GFX_SHADER_COUNT); util_queue_fence_wait(&prog->base.cache_fence); unsigned stages_present = prog->stages_present; + unsigned stages_remaining = prog->stages_remaining; if (prog->shaders[MESA_SHADER_TESS_CTRL] && - prog->shaders[MESA_SHADER_TESS_CTRL]->non_fs.is_generated) + prog->shaders[MESA_SHADER_TESS_CTRL]->non_fs.is_generated) { stages_present &= ~BITFIELD_BIT(MESA_SHADER_TESS_CTRL); + stages_remaining &= ~BITFIELD_BIT(MESA_SHADER_TESS_CTRL); + } unsigned idx = zink_program_cache_stages(stages_present); - if (!prog->base.removed && prog->stages_present == prog->stages_remaining && + if (!prog->base.removed && stages_present == stages_remaining && (stage == MESA_SHADER_FRAGMENT || !shader->non_fs.is_generated)) { struct hash_table *ht = &prog->base.ctx->program_cache[idx]; simple_mtx_lock(&prog->base.ctx->program_lock[idx]);