From df4f84f806c7a502fdea761e78ed7d8784427699 Mon Sep 17 00:00:00 2001 From: Qiang Yu Date: Wed, 7 Jun 2023 14:47:12 +0800 Subject: [PATCH] radeonsi: fix crash when AMD_DEBUG=cs,initnir MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Marek Olšák Signed-off-by: Qiang Yu Part-of: --- src/gallium/drivers/radeonsi/si_compute.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_compute.c b/src/gallium/drivers/radeonsi/si_compute.c index 9dc5b778fa8..da5903304c7 100644 --- a/src/gallium/drivers/radeonsi/si_compute.c +++ b/src/gallium/drivers/radeonsi/si_compute.c @@ -227,9 +227,6 @@ static void *si_create_compute_state(struct pipe_context *ctx, const struct pipe program->ir_type = cso->ir_type; program->input_size = cso->req_input_mem; - if (si_can_dump_shader(sscreen, sel->stage, SI_DUMP_INIT_NIR)) - nir_print_shader(sel->nir, stderr); - if (cso->ir_type != PIPE_SHADER_IR_NATIVE) { if (cso->ir_type == PIPE_SHADER_IR_TGSI) { program->ir_type = PIPE_SHADER_IR_NIR; @@ -239,6 +236,9 @@ static void *si_create_compute_state(struct pipe_context *ctx, const struct pipe sel->nir = (struct nir_shader *)cso->prog; } + if (si_can_dump_shader(sscreen, sel->stage, SI_DUMP_INIT_NIR)) + nir_print_shader(sel->nir, stderr); + sel->compiler_ctx_state.debug = sctx->debug; sel->compiler_ctx_state.is_debug_context = sctx->is_debug; p_atomic_inc(&sscreen->num_shaders_created);