Module: Mesa Branch: main Commit: f70b1732da7152e7618b4ca03c76e6e6c8ea95b5 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f70b1732da7152e7618b4ca03c76e6e6c8ea95b5
Author: Mike Blumenkrantz <[email protected]> Date: Fri Feb 10 10:41:50 2023 -0500 zink: assert that the found program matches the expected one in shader_free avoid bugs Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21246> --- src/gallium/drivers/zink/zink_compiler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/drivers/zink/zink_compiler.c b/src/gallium/drivers/zink/zink_compiler.c index 15db3e85dac..8625b832ed1 100644 --- a/src/gallium/drivers/zink/zink_compiler.c +++ b/src/gallium/drivers/zink/zink_compiler.c @@ -4496,7 +4496,7 @@ zink_shader_free(struct zink_screen *screen, struct zink_shader *shader) struct hash_table *ht = &prog->ctx->program_cache[idx]; simple_mtx_lock(&prog->ctx->program_lock[idx]); struct hash_entry *he = _mesa_hash_table_search(ht, prog->shaders); - assert(he); + assert(he && he->data == prog); _mesa_hash_table_remove(ht, he); prog->base.removed = true; simple_mtx_unlock(&prog->ctx->program_lock[idx]);
