From 090a111c5dcd2c6764e7b990a55f3bddca771499 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: --- 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 837a1d0c164..9d1abd3be18 100644 --- a/src/gallium/drivers/zink/zink_compiler.c +++ b/src/gallium/drivers/zink/zink_compiler.c @@ -2348,7 +2348,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);