From 753d253df77e25279512c896aae212bdba3fc063 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 2 Jul 2024 12:26:47 -0400 Subject: [PATCH] st/pbo: fix MESA_COMPUTE_PBO=spec crash on shutdown the nir here has already been freed by the driver Fixes: b8c82b50f7e ("mesa/st: add MESA_COMPUTE_PBO env var") Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/mesa/state_tracker/st_pbo_compute.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/mesa/state_tracker/st_pbo_compute.c b/src/mesa/state_tracker/st_pbo_compute.c index b114a546d6a..6c148f85291 100644 --- a/src/mesa/state_tracker/st_pbo_compute.c +++ b/src/mesa/state_tracker/st_pbo_compute.c @@ -931,6 +931,7 @@ download_texture_compute(struct st_context *st, .ir.nir = spec->nir, }; cs = spec->cs = st_create_nir_shader(st, &state); + spec->nir = NULL; } cb.buffer_size = 2 * sizeof(uint32_t); } else if (!st->force_compute_based_texture_transfer && screen->driver_thread_add_job) { @@ -986,6 +987,7 @@ download_texture_compute(struct st_context *st, .ir.nir = spec->nir, }; cs = spec->cs = st_create_nir_shader(st, &state); + spec->nir = NULL; cb.buffer_size = 2 * sizeof(uint32_t); } else { nir_shader *nir = create_conversion_shader(st, view_target, num_components);