From e0d84e84f76e2cc23bd13c31341c760dec805a4a Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Wed, 2 Nov 2022 10:21:43 +0100 Subject: [PATCH] zink: do not read is_generated unless in tcs shader It's undefined behavior in C to read a union member if another member has been written to more recently. Let's be more careful here! Fixes: a9d2b86c2c8 ("zink: store the spirv_shader to the zink_shader struct for generated tcs") Part-of: (cherry picked from commit 090a111c5dcd2c6764e7b990a55f3bddca771499) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_compiler.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 3c81136a5ca..e7c31fbfb3f 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -148,7 +148,7 @@ "description": "zink: do not read is_generated unless in tcs shader", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "a9d2b86c2c80b94281b6f0cfc1f73adde8e0e294" }, diff --git a/src/gallium/drivers/zink/zink_compiler.c b/src/gallium/drivers/zink/zink_compiler.c index 222c22757c8..b2067830cae 100644 --- a/src/gallium/drivers/zink/zink_compiler.c +++ b/src/gallium/drivers/zink/zink_compiler.c @@ -2183,7 +2183,7 @@ zink_shader_compile(struct zink_screen *screen, struct zink_shader *zs, nir_shad ralloc_free(nir); /* TODO: determine if there's any reason to cache spirv output? */ - if (zs->is_generated) + if (zs->nir->info.stage == MESA_SHADER_TESS_CTRL && zs->is_generated) zs->spirv = spirv; else ralloc_free(spirv);