fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 04:38:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

zink: account for generated tcs when pruning programs

Browse source 
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: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36294>
(cherry picked from commit f83b36f956)
This commit is contained in:
Mike Blumenkrantz 2025-07-22 13:05:26 -04:00 • committed by Eric Engestrom
parent a74b51159a
commit d81e54d0b7
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -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

7
src/gallium/drivers/zink/zink_compiler.c
View file

@ -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]);