From 1b584ada4b72d0e3e112c937d7b1811bd151fe17 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 12 Apr 2024 11:41:32 -0400 Subject: [PATCH] zink: copy shader name when copying shader info this needs a separate allocation cc: mesa-stable Part-of: (cherry picked from commit 4b2fe347b12872d45f91721a879c901b68482ceb) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_compiler.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index fa2b00edd78..831aa8468e3 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -374,7 +374,7 @@ "description": "zink: copy shader name when copying shader info", "nominated": true, "nomination_type": 0, - "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 e5e029c6cb5..3510bf7abae 100644 --- a/src/gallium/drivers/zink/zink_compiler.c +++ b/src/gallium/drivers/zink/zink_compiler.c @@ -5659,6 +5659,7 @@ zink_shader_create(struct zink_screen *screen, struct nir_shader *nir) } zink_shader_serialize_blob(nir, &ret->blob); memcpy(&ret->info, &nir->info, sizeof(nir->info)); + ret->info.name = ralloc_strdup(ret, nir->info.name); ret->can_inline = true;