AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zink: also replace hash_entry::key when replacing separable program

Browse Source 
this otherwise still points to the separable program's shader array
and will access freed memory

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21246>
This commit is contained in:
Mike Blumenkrantz
2023-02-12 16:58:19 -05:00
committed by Marge Bot
parent b5029a90df
commit b73fe8d52e
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/zink/zink_program.c
+2
View File
@@ -699,6 +699,7 @@ zink_gfx_program_update_optimal(struct zink_context *ctx)
if (util_queue_fence_is_signalled(&prog->base.cache_fence)) {
struct zink_gfx_program *real = prog->full_prog;
entry->data = real;
entry->key = real->shaders;
real->base.removed = false;
prog->full_prog = NULL;
prog->base.removed = true;
@@ -737,6 +738,7 @@ zink_gfx_program_update_optimal(struct zink_context *ctx)
struct hash_entry *entry = _mesa_hash_table_search_pre_hashed(ht, hash, ctx->gfx_stages);
struct zink_gfx_program *real = prog->full_prog;
entry->data = real;
entry->key = real->shaders;
real->base.removed = false;
prog->full_prog = NULL;
prog->base.removed = true;